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

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

Issue 468833002: Mac QTKit Video Capture: Force BlackMagic cameras to be opened in HD (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tommi@s comments Created 6 years, 4 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 | « no previous file | media/video/capture/mac/video_capture_device_mac.mm » ('j') | 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 af97fd21e03cfeea3b2fdfaa5b5bd52b9ff3b874..f0efe6b760b534880623738f832b8da4934720c7 100644
--- a/media/video/capture/mac/video_capture_device_factory_mac.mm
+++ b/media/video/capture/mac/video_capture_device_factory_mac.mm
@@ -20,10 +20,16 @@ namespace media {
// Some devices are not correctly supported in AVFoundation, f.i. Blackmagic,
// see http://crbug.com/347371. The devices are identified by a characteristic
// trailing substring of uniqueId and by (part of) the vendor's name.
+// Blackmagic cameras are known to crash if VGA is requested , see
+// http://crbug.com/396812; for them HD is the only supported resolution.
const struct NameAndVid {
const char* unique_id_signature;
const char* name;
-} kBlacklistedCameras[] = { { "-01FDA82C8A9C", "Blackmagic" } };
+ const int capture_width;
+ const int capture_height;
+ const float capture_frame_rate;
+} kBlacklistedCameras[] = {
+ { "-01FDA82C8A9C", "Blackmagic", 1280, 720, 60.0f } };
static scoped_ptr<media::VideoCaptureDevice::Names>
EnumerateDevicesUsingQTKit() {
@@ -36,6 +42,13 @@ EnumerateDevicesUsingQTKit() {
VideoCaptureDevice::Name name(
[[[capture_devices valueForKey:key] deviceName] UTF8String],
[key UTF8String], VideoCaptureDevice::Name::QTKIT);
+ for (size_t i = 0; i < arraysize(kBlacklistedCameras); ++i) {
+ if (name.id().find(kBlacklistedCameras[i].name) != std::string::npos) {
vrk (LEFT CHROMIUM) 2014/08/14 02:50:54 Does case sensitivity matter?
mcasas 2014/08/14 07:36:06 ATM I've have always seen "Blackmagic" as part of
+ DVLOG(2) << "Found blacklisted camera: " << name.id();
+ name.set_is_blacklisted(true);
+ break;
+ }
+ }
device_names->push_back(name);
}
return device_names.Pass();
@@ -175,7 +188,21 @@ void VideoCaptureDeviceFactoryMac::GetDeviceSupportedFormats(
[VideoCaptureDeviceAVFoundation getDevice:device
supportedFormats:supported_formats];
} else {
- NOTIMPLEMENTED();
+ // Blacklisted cameras provide their own supported format(s), otherwise no
+ // such information is provided for QTKit.
+ if (device.is_blacklisted()) {
+ for (size_t i = 0; i < arraysize(kBlacklistedCameras); ++i) {
+ if (device.id().find(kBlacklistedCameras[i].name) !=
+ std::string::npos) {
+ supported_formats->push_back(media::VideoCaptureFormat(
+ gfx::Size(kBlacklistedCameras[i].capture_width,
+ kBlacklistedCameras[i].capture_height),
+ kBlacklistedCameras[i].capture_frame_rate,
+ media::PIXEL_FORMAT_UYVY));
+ break;
+ }
+ }
+ }
}
}
« no previous file with comments | « no previous file | media/video/capture/mac/video_capture_device_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698