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/base | |
| 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/base')
| -rw-r--r-- | media/base/media_switches.cc | 4 | ||||
| -rw-r--r-- | media/base/media_switches.h | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc index 515c0bc..e7982da 100644 --- a/media/base/media_switches.cc +++ b/media/base/media_switches.cc @@ -40,6 +40,7 @@ const char kAlsaOutputDevice[] = "alsa-output-device"; // for experimentation purposes, in particular library load time issue, the // usage of this library can be enabled by using this flag. const char kEnableAVFoundation[] = "enable-avfoundation"; + // QTKit is the media capture API predecessor to AVFoundation, available up and // until Mac OS X 10.9 (despite being deprecated in this last one). This flag // is used for troubleshooting and testing, and forces QTKit in builds and @@ -85,6 +86,9 @@ const char kWaveOutBuffers[] = "waveout-buffers"; const char kUseCras[] = "use-cras"; #endif +// Use fake device for Media Stream to replace actual camera and microphone. +const char kUseFakeDeviceForMediaStream[] = "use-fake-device-for-media-stream"; + // Use a raw video file as fake video capture device. const char kUseFileForFakeVideoCapture[] = "use-file-for-fake-video-capture"; diff --git a/media/base/media_switches.h b/media/base/media_switches.h index 90a25f4..a225a18 100644 --- a/media/base/media_switches.h +++ b/media/base/media_switches.h @@ -46,6 +46,7 @@ MEDIA_EXPORT extern const char kWaveOutBuffers[]; MEDIA_EXPORT extern const char kUseCras[]; #endif +MEDIA_EXPORT extern const char kUseFakeDeviceForMediaStream[]; MEDIA_EXPORT extern const char kUseFileForFakeVideoCapture[]; } // namespace switches |