From ad553a27316e23ad63031e7075da53766817b9e6 Mon Sep 17 00:00:00 2001 From: "pbos@webrtc.org" Date: Thu, 23 Oct 2014 08:24:02 +0000 Subject: [PATCH] Let video_loopback use internal VCM capturers. R=stefan@webrtc.org BUG= Review URL: https://webrtc-codereview.appspot.com/27819004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@7503 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/modules/modules.gyp | 1 + webrtc/test/webrtc_test_common.gyp | 2 +- webrtc/webrtc_tests.gypi | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/webrtc/modules/modules.gyp b/webrtc/modules/modules.gyp index 9650e66d04..082b8871f1 100644 --- a/webrtc/modules/modules.gyp +++ b/webrtc/modules/modules.gyp @@ -95,6 +95,7 @@ '<(DEPTH)/testing/gtest.gyp:gtest', '<(DEPTH)/third_party/gflags/gflags.gyp:gflags', '<(webrtc_root)/common_audio/common_audio.gyp:common_audio', + '<(webrtc_root)/modules/modules.gyp:video_capture_module_impl', '<(webrtc_root)/modules/video_coding/codecs/vp8/vp8.gyp:webrtc_vp8', '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', '<(webrtc_root)/test/test.gyp:test_support_main', diff --git a/webrtc/test/webrtc_test_common.gyp b/webrtc/test/webrtc_test_common.gyp index 477ec0fc1a..1f153ae391 100644 --- a/webrtc/test/webrtc_test_common.gyp +++ b/webrtc/test/webrtc_test_common.gyp @@ -60,7 +60,6 @@ '<(DEPTH)/third_party/gflags/gflags.gyp:gflags', '<(webrtc_root)/base/base.gyp:rtc_base', '<(webrtc_root)/modules/modules.gyp:media_file', - '<(webrtc_root)/modules/modules.gyp:video_capture_module_impl', '<(webrtc_root)/modules/modules.gyp:video_render_module_impl', '<(webrtc_root)/test/test.gyp:frame_generator', '<(webrtc_root)/test/test.gyp:test_support', @@ -153,6 +152,7 @@ 'webrtc_test_common', '<(DEPTH)/testing/gtest.gyp:gtest', '<(DEPTH)/testing/gmock.gyp:gmock', + '<(webrtc_root)/modules/modules.gyp:video_capture_module_impl', '<(webrtc_root)/test/test.gyp:test_support_main', ], 'sources': [ diff --git a/webrtc/webrtc_tests.gypi b/webrtc/webrtc_tests.gypi index cfd5a4b2cb..aca0a6946f 100644 --- a/webrtc/webrtc_tests.gypi +++ b/webrtc/webrtc_tests.gypi @@ -52,6 +52,7 @@ '<(DEPTH)/third_party/gflags/gflags.gyp:gflags', 'test/webrtc_test_common.gyp:webrtc_test_common', 'test/webrtc_test_common.gyp:webrtc_test_renderer', + '<(webrtc_root)/modules/modules.gyp:video_capture_module_internal_impl', '<(webrtc_root)/modules/modules.gyp:video_render_module_impl', '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:field_trial_default', 'webrtc', @@ -78,6 +79,7 @@ '<(DEPTH)/third_party/gflags/gflags.gyp:gflags', 'test/webrtc_test_common.gyp:webrtc_test_common', 'test/webrtc_test_common.gyp:webrtc_test_renderer', + '<(webrtc_root)/modules/modules.gyp:video_capture_module_impl', '<(webrtc_root)/modules/modules.gyp:video_render_module_impl', '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:field_trial_default', 'webrtc', @@ -97,6 +99,7 @@ 'dependencies': [ '<(DEPTH)/testing/gtest.gyp:gtest', '<(webrtc_root)/modules/modules.gyp:rtp_rtcp', + '<(webrtc_root)/modules/modules.gyp:video_capture_module_impl', '<(webrtc_root)/modules/modules.gyp:video_render_module_impl', 'test/metrics.gyp:metrics', 'test/webrtc_test_common.gyp:webrtc_test_common', @@ -125,6 +128,7 @@ '<(DEPTH)/testing/gtest.gyp:gtest', 'modules/modules.gyp:neteq_test_support', # Needed by neteq_performance_unittest. 'modules/modules.gyp:rtp_rtcp', + '<(webrtc_root)/modules/modules.gyp:video_capture_module_impl', 'test/webrtc_test_common.gyp:webrtc_test_common', 'test/test.gyp:test_main', 'webrtc',