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

Unified Diff: media/media.gyp

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: scoped_refptr cannot be negated in logical operations, use .get() first. 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/BUILD.gn ('k') | media/video/capture/mac/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/media.gyp
diff --git a/media/media.gyp b/media/media.gyp
index 5f4bca905661a936d1d15caa6ac9c311d8bb260d..59dd35678d44848e0068f590a5e0f46a497e9fa7 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -504,6 +504,8 @@
'video/capture/mac/platform_video_capturing_mac.h',
'video/capture/mac/video_capture_device_avfoundation_mac.h',
'video/capture/mac/video_capture_device_avfoundation_mac.mm',
+ 'video/capture/mac/video_capture_device_decklink_mac.h',
+ 'video/capture/mac/video_capture_device_decklink_mac.mm',
'video/capture/mac/video_capture_device_factory_mac.h',
'video/capture/mac/video_capture_device_factory_mac.mm',
'video/capture/mac/video_capture_device_mac.h',
@@ -873,6 +875,9 @@
],
}],
['OS=="mac"', {
+ 'dependencies': [
+ '../third_party/decklink/decklink.gyp:decklink',
+ ],
'link_settings': {
'libraries': [
'$(SDKROOT)/System/Library/Frameworks/AudioToolbox.framework',
« no previous file with comments | « media/BUILD.gn ('k') | media/video/capture/mac/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698