From 84c03bafcff1a4e603fe190d2f03ed672bdf82e9 Mon Sep 17 00:00:00 2001 From: nisse Date: Tue, 23 Aug 2016 00:18:57 -0700 Subject: [PATCH] Add rtc_media as a direct dependency of rtc_media_unittests. Without this, the rtc_media_unittests target was only an indirect dependency, and compiled without HAVE_WEBRTC_VIDEO. And some testcases, in particular, all tests defined by webrtcvideocapturer_unittest.cc, are excluded from rtc_media_unittests. BUG= Review-Url: https://codereview.webrtc.org/2250433008 Cr-Commit-Position: refs/heads/master@{#13859} --- webrtc/media/engine/webrtcvideoframefactory.h | 5 +++++ webrtc/media/media.gyp | 1 + 2 files changed, 6 insertions(+) diff --git a/webrtc/media/engine/webrtcvideoframefactory.h b/webrtc/media/engine/webrtcvideoframefactory.h index c1569969fb..39d813ff75 100644 --- a/webrtc/media/engine/webrtcvideoframefactory.h +++ b/webrtc/media/engine/webrtcvideoframefactory.h @@ -20,6 +20,11 @@ struct CapturedFrame; // Creates instances of cricket::WebRtcVideoFrame. class WebRtcVideoFrameFactory : public VideoFrameFactory { public: + // Note: Overriding a method name overrides all overloaded versions. + // Without this using-declaration, we would hide the 5-argument + // method we want to inherit. + using VideoFrameFactory::CreateAliasedFrame; + VideoFrame* CreateAliasedFrame(const CapturedFrame* aliased_frame, int width, int height) const override; diff --git a/webrtc/media/media.gyp b/webrtc/media/media.gyp index 9f0a9649e1..f40421d68f 100644 --- a/webrtc/media/media.gyp +++ b/webrtc/media/media.gyp @@ -254,6 +254,7 @@ '<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils', '<(webrtc_root)/system_wrappers/system_wrappers.gyp:metrics_default', '<(webrtc_root)/test/test.gyp:test_support', + 'rtc_media', 'rtc_unittest_main', ], 'sources': [