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

Unified Diff: media/video/capture/mac/video_capture_device_factory_mac.mm

Issue 535983002: Mac Video Capture: Support for Blackmagic DeckLink SDK video capture. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@crbug408493__1__Enumerate_blackmagic_devices__2__branched_from_master
Patch Set: tommi@s nits Created 6 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/video/capture/mac/video_capture_device_decklink_mac.mm ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/video/capture/mac/video_capture_device_factory_mac.mm
diff --git a/media/video/capture/mac/video_capture_device_factory_mac.mm b/media/video/capture/mac/video_capture_device_factory_mac.mm
index 1fd4ecf4783259fac4b4b33a704b82bf2aad34a3..996f0b356be979dbab7db3bfd2b8a9633be2abb9 100644
--- a/media/video/capture/mac/video_capture_device_factory_mac.mm
+++ b/media/video/capture/mac/video_capture_device_factory_mac.mm
@@ -98,11 +98,16 @@ scoped_ptr<VideoCaptureDevice> VideoCaptureDeviceFactoryMac::Create(
return scoped_ptr<VideoCaptureDevice>();
}
- scoped_ptr<VideoCaptureDeviceMac> capture_device(
- new VideoCaptureDeviceMac(device_name));
- if (!capture_device->Init(device_name.capture_api_type())) {
- LOG(ERROR) << "Could not initialize VideoCaptureDevice.";
- capture_device.reset();
+ scoped_ptr<VideoCaptureDevice> capture_device;
+ if (device_name.capture_api_type() == VideoCaptureDevice::Name::DECKLINK) {
+ capture_device.reset(new VideoCaptureDeviceDeckLinkMac(device_name));
+ } else {
+ VideoCaptureDeviceMac* device = new VideoCaptureDeviceMac(device_name);
+ capture_device.reset(device);
+ if (!device->Init(device_name.capture_api_type())) {
+ LOG(ERROR) << "Could not initialize VideoCaptureDevice.";
+ capture_device.reset();
+ }
}
return scoped_ptr<VideoCaptureDevice>(capture_device.Pass());
}
@@ -177,9 +182,7 @@ void VideoCaptureDeviceFactoryMac::EnumerateDeviceNames(const base::Callback<
callback.Run(device_names.Pass());
} else {
DVLOG(1) << "Enumerating video capture devices using QTKit";
- base::PostTaskAndReplyWithResult(
- ui_task_runner_.get(),
- FROM_HERE,
+ base::PostTaskAndReplyWithResult(ui_task_runner_.get(), FROM_HERE,
base::Bind(&EnumerateDevicesUsingQTKit),
base::Bind(&RunDevicesEnumeratedCallback, callback));
}
« no previous file with comments | « media/video/capture/mac/video_capture_device_decklink_mac.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698