Split video_render_module implementation into default and internal implementation.
Targets must now link with implementation of their choice instead of at "gyp"-time. Targets linking with libjingle_media: - internal implementation when build_with_chromium=0, default otherwise. Targets linking with default render implementation: - video_engine_tests - video_loopback - video_replay - anything dependent on webrtc_test_common Targets linking with internal render implementation: - vie_auto_test - video_render_tests - libwebrtcdemo-jni - video_engine_core_unittests GN changes: - Not many since there is almost no test definitions. Work-around for chromium: - Until chromium has updated libpeerconnection to link with video_capture_impl and video_render_impl, webrtc target automatically depends on it. This should fix the FYI bots and not require a webrtc roll to fix. Re-enable android tests by reverting 7026 (some tests left disabled). TESTED: passes all the bots. If this inadvertently breaks a target please fix the linking rules so the target has the desired implementation linked in. BUG=3770 R=kjellander@webrtc.org, pbos@webrtc.org TBR=mflodman@webrtc.org Review URL: https://webrtc-codereview.appspot.com/19359004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@7217 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
@ -294,11 +294,6 @@ int TestSingleStream(VideoRender* renderModule) {
|
||||
VideoRenderCallback* renderCallback0 = renderModule->AddIncomingRenderStream(streamId0, 0, 0.0f, 0.0f, 1.0f, 1.0f);
|
||||
assert(renderCallback0 != NULL);
|
||||
|
||||
#ifndef WEBRTC_INCLUDE_INTERNAL_VIDEO_RENDER
|
||||
MyRenderCallback externalRender;
|
||||
renderModule->AddExternalRenderCallback(streamId0, &externalRender);
|
||||
#endif
|
||||
|
||||
printf("Start render\n");
|
||||
error = renderModule->StartRender(streamId0);
|
||||
if (error != 0) {
|
||||
@ -577,10 +572,6 @@ int TestExternalRender(VideoRender* renderModule) {
|
||||
}
|
||||
|
||||
void RunVideoRenderTests(void* window, VideoRenderType windowType) {
|
||||
#ifndef WEBRTC_INCLUDE_INTERNAL_VIDEO_RENDER
|
||||
windowType = kRenderExternal;
|
||||
#endif
|
||||
|
||||
int myId = 12345;
|
||||
|
||||
// Create the render module
|
||||
|
||||
Reference in New Issue
Block a user