Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(279)

Side by Side Diff: media/video/capture/video_capture_device_factory.cc

Issue 265263004: Mac Video Capture Device: split VCD into VCD and Factory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Reconnected VCDFMac::Create() check for device name; VCDTest::OpenInvalidDevice needs Mac API Type. Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/video/capture/video_capture_device_factory.h" 5 #include "media/video/capture/video_capture_device_factory.h"
6 6
7 #include "base/command_line.h"
8 #include "media/base/media_switches.h"
9 #include "media/video/capture/fake_video_capture_device_factory.h"
10 #include "media/video/capture/file_video_capture_device_factory.h"
11
12 #if defined(OS_MACOSX)
13 #include "media/video/capture/mac/video_capture_device_factory_mac.h"
14 #endif
15
7 namespace media { 16 namespace media {
8 17
18 // static
19 scoped_ptr<VideoCaptureDeviceFactory>
20 VideoCaptureDeviceFactory::CreateFactory() {
21 const CommandLine* command_line = CommandLine::ForCurrentProcess();
22 // Use a Fake or File Video Device Factory if the command line flags are
23 // present, otherwise use the normal, platform-dependent, device factory.
24 if (command_line->HasSwitch(switches::kUseFakeDeviceForMediaStream)) {
25 if (command_line->HasSwitch(switches::kUseFileForFakeVideoCapture)) {
26 return scoped_ptr<VideoCaptureDeviceFactory>(new
27 media::FileVideoCaptureDeviceFactory());
28 } else {
29 return scoped_ptr<VideoCaptureDeviceFactory>(new
30 media::FakeVideoCaptureDeviceFactory());
31 }
32 } else {
33 #if defined(OS_MACOSX)
34 return scoped_ptr<VideoCaptureDeviceFactory>(new
35 VideoCaptureDeviceFactoryMac());
36 #else
37 return scoped_ptr<VideoCaptureDeviceFactory>(new
38 VideoCaptureDeviceFactory());
39 #endif
40 }
41 }
42
9 VideoCaptureDeviceFactory::VideoCaptureDeviceFactory() { 43 VideoCaptureDeviceFactory::VideoCaptureDeviceFactory() {
10 thread_checker_.DetachFromThread(); 44 thread_checker_.DetachFromThread();
11 }; 45 }
46
47 VideoCaptureDeviceFactory::~VideoCaptureDeviceFactory() {}
12 48
13 scoped_ptr<VideoCaptureDevice> VideoCaptureDeviceFactory::Create( 49 scoped_ptr<VideoCaptureDevice> VideoCaptureDeviceFactory::Create(
14 const VideoCaptureDevice::Name& device_name) { 50 const VideoCaptureDevice::Name& device_name) {
15 DCHECK(thread_checker_.CalledOnValidThread()); 51 DCHECK(thread_checker_.CalledOnValidThread());
16 return scoped_ptr<VideoCaptureDevice>( 52 return scoped_ptr<VideoCaptureDevice>(
17 VideoCaptureDevice::Create(device_name)); 53 VideoCaptureDevice::Create(device_name));
18 } 54 }
19 55
20 void VideoCaptureDeviceFactory::GetDeviceNames( 56 void VideoCaptureDeviceFactory::GetDeviceNames(
21 VideoCaptureDevice::Names* device_names) { 57 VideoCaptureDevice::Names* device_names) {
22 DCHECK(thread_checker_.CalledOnValidThread()); 58 DCHECK(thread_checker_.CalledOnValidThread());
23 VideoCaptureDevice::GetDeviceNames(device_names); 59 VideoCaptureDevice::GetDeviceNames(device_names);
24 } 60 }
25 61
26 void VideoCaptureDeviceFactory::GetDeviceSupportedFormats( 62 void VideoCaptureDeviceFactory::GetDeviceSupportedFormats(
27 const VideoCaptureDevice::Name& device, 63 const VideoCaptureDevice::Name& device,
28 VideoCaptureFormats* supported_formats) { 64 VideoCaptureFormats* supported_formats) {
29 DCHECK(thread_checker_.CalledOnValidThread()); 65 DCHECK(thread_checker_.CalledOnValidThread());
30 VideoCaptureDevice::GetDeviceSupportedFormats(device, supported_formats); 66 VideoCaptureDevice::GetDeviceSupportedFormats(device, supported_formats);
31 } 67 }
32 68
33 } // namespace media 69 } // namespace media
OLDNEW
« no previous file with comments | « media/video/capture/video_capture_device_factory.h ('k') | media/video/capture/video_capture_device_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698