media/video/capture/mac/video_capture_device_mac.mm - Issue 518073002: Mac VideoCapture: Support for Blackmagic DeckLink device & capabilities enumeration, using SDK.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 518073002: Mac VideoCapture: Support for Blackmagic DeckLink device & capabilities enumeration, using SDK. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase. Change enumeration: instead of 1 dev x N format --> N devs x 1 format each. 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

« media/video/capture/mac/video_capture_device_decklink_mac.mm ('K') | « media/video/capture/mac/video_capture_device_factory_mac.mm ('k') | media/video/capture/video_capture_device.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/video/capture/mac/video_capture_device_mac.mm

diff --git a/media/video/capture/mac/video_capture_device_mac.mm b/media/video/capture/mac/video_capture_device_mac.mm

index 882c1522944b67331d48676b0291e37a2f17dcb5..190f53d6a380a01f4c7bbc6be9af5860f2532d51 100644

--- a/media/video/capture/mac/video_capture_device_mac.mm

+++ b/media/video/capture/mac/video_capture_device_mac.mm

@@ -331,6 +331,8 @@ const std::string VideoCaptureDevice::Name::GetModel() const {

// Skip the AVFoundation's not USB nor built-in devices.

if (capture_api_type() == AVFOUNDATION && transport_type() != USB_OR_BUILT_IN)

return "";

+ if (capture_api_type() == DECKLINK)

+ return "";

// Both PID and VID are 4 characters.

if (unique_id_.size() < 2 * kVidPidSize)

return "";