diff options
| author | mcasas@chromium.org <mcasas@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-14 12:20:25 +0000 |
|---|---|---|
| committer | mcasas@chromium.org <mcasas@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-14 12:20:25 +0000 |
| commit | 8a3d2deef500a5e9862b689f6638796b69185b6a (patch) | |
| tree | fef35ec7a3c2ed2b81975840624b0506cdfec96a /media/media.gyp | |
| parent | 59d41dffe8c37b1f051dc31a6f2ab61dabce1313 (diff) | |
| download | chromium_src-8a3d2deef500a5e9862b689f6638796b69185b6a.zip chromium_src-8a3d2deef500a5e9862b689f6638796b69185b6a.tar.gz chromium_src-8a3d2deef500a5e9862b689f6638796b69185b6a.tar.bz2 | |
Reland: Mac Video Capture Device: split VCD into VCD and Factory.
Reland of the mentioned CL, that hit an internal bot due
to a test needing the flag |kUseFakeDeviceForMediaStream|.
Original CL message -----------------------------------------------
Mac Video Capture Device: split VCD into VCD and Factory.
VideoCaptureDeviceMac includes factory and non-factory parts.
This CL splits them into VideoCaptureDeviceMac and
VideoCaptureDeviceFactoryMac. The latter inherits the previous
class' static methods: Create(), GetDeviceNames() and
GetDeviceSupportedFormats().
All video factory code previously in MediaStreamManager is
moved into VideoCaptureFactory. This includes the use
of the flag |kUseFakeDeviceForMediaStream|.
This flag is moved correspondingly into media_switches.cc --
(but note that this flag is still used in MediaStreamManager for
the Fake Audio parts). File media_switches.cc is
included in several test files where the flag is used.
VideoCaptureDeviceTest is splitted as well into:
a) Tests that were exercising only the FakeVCD
(FakeVideoCaptureDeviceTest).
b) All other tests, that use the underlying OS webcam.
This VideoCaptureDeviceTest gets a Factory and uses it
instead of static methods.
A unit test is added to VCDFMac, doing little for the moment
but I'm planning to add support for testing at least the
blacklisting -- req from rsesek@ in another CL.
-------------------------------------------------------------------
TBR= perkj@chromium.org, dalecurtis@chromium.org, jochen@chromium.org
BUG=288562, 323913, 255552
Review URL: https://codereview.chromium.org/278333002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@270391 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/media.gyp')
| -rw-r--r-- | media/media.gyp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/media/media.gyp b/media/media.gyp index c42d270..471072f5 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -52,7 +52,7 @@ 'type': '<(component)', 'dependencies': [ '../base/base.gyp:base', - '../base/base.gyp:base_i18n', + '../base/base.gyp:base_i18n', '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', '../crypto/crypto.gyp:crypto', '../gpu/gpu.gyp:command_buffer_common', @@ -478,6 +478,8 @@ 'video/capture/mac/platform_video_capturing_mac.h', 'video/capture/mac/video_capture_device_avfoundation_mac.h', 'video/capture/mac/video_capture_device_avfoundation_mac.mm', + 'video/capture/mac/video_capture_device_factory_mac.h', + 'video/capture/mac/video_capture_device_factory_mac.mm', 'video/capture/mac/video_capture_device_mac.h', 'video/capture/mac/video_capture_device_mac.mm', 'video/capture/mac/video_capture_device_qtkit_mac.h', @@ -1067,6 +1069,7 @@ 'midi/usb_midi_descriptor_parser_unittest.cc', 'midi/usb_midi_input_stream_unittest.cc', 'midi/usb_midi_output_stream_unittest.cc', + 'video/capture/fake_video_capture_device_unittest.cc', 'video/capture/video_capture_device_unittest.cc', 'formats/common/offset_byte_queue_unittest.cc', 'formats/webm/cluster_builder.cc', @@ -1197,6 +1200,11 @@ ['OS=="win" and target_arch=="x64"', { 'msvs_disabled_warnings': [ 4267, ], }], + ['OS=="mac"', { + 'sources': [ + 'video/capture/mac/video_capture_device_factory_mac_unittest.mm', + ] + }], ], }, { |