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

Unified Diff: media/media.gyp

Issue 8177008: Adding VideoCaptureDevice for Mac. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Unittest changes to run on Mac OS X. Created 9 years, 2 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
Index: media/media.gyp
diff --git a/media/media.gyp b/media/media.gyp
index 1e402ebdd20d79e3d93515b89980ded10b8b165e..68169f7d038ab42f3971c2dce63710a83ce27b63 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -204,6 +204,10 @@
'video/capture/fake_video_capture_device.h',
'video/capture/linux/video_capture_device_linux.cc',
'video/capture/linux/video_capture_device_linux.h',
+ 'video/capture/mac/video_capture_device_mac.h',
+ 'video/capture/mac/video_capture_device_mac.mm',
+ 'video/capture/mac/video_capture_device_mac_qtkit.h',
+ 'video/capture/mac/video_capture_device_mac_qtkit.mm',
'video/capture/video_capture.h',
'video/capture/video_capture_device.h',
'video/capture/video_capture_device_dummy.cc',
@@ -327,7 +331,7 @@
'audio/openbsd/audio_manager_openbsd.h',
],
}],
- ['os_posix == 1 and OS != "mac"', {
+ ['os_posix == 1', {
'sources!': [
'video/capture/video_capture_device_dummy.cc',
'video/capture/video_capture_device_dummy.h',
@@ -339,6 +343,8 @@
'$(SDKROOT)/System/Library/Frameworks/AudioUnit.framework',
'$(SDKROOT)/System/Library/Frameworks/AudioToolbox.framework',
'$(SDKROOT)/System/Library/Frameworks/CoreAudio.framework',
+ '$(SDKROOT)/System/Library/Frameworks/CoreVideo.framework',
+ '$(SDKROOT)/System/Library/Frameworks/QTKit.framework',
],
},
}],
@@ -587,7 +593,9 @@
'filters/ffmpeg_video_decoder_unittest.cc',
'filters/file_data_source_unittest.cc',
'filters/video_renderer_base_unittest.cc',
+ 'video/capture/mac/video_capture_device_unittest_helper_mac.mm',
'video/capture/video_capture_device_unittest.cc',
+ 'video/capture/video_capture_device_unittest_helper.h',
'video/ffmpeg_video_decode_engine_unittest.cc',
'webm/cluster_builder.cc',
'webm/cluster_builder.h',

Powered by Google App Engine
This is Rietveld 408576698