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

Unified Diff: media/media.gyp

Issue 7229013: This is the VideoCaptureDevice implementation for windows. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Created 9 years, 6 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
===================================================================
--- media/media.gyp (revision 90022)
+++ media/media.gyp (working copy)
@@ -181,6 +181,16 @@
'video/capture/linux/video_capture_device_linux.h',
'video/capture/video_capture.h',
'video/capture/video_capture_device.h',
+ 'video/capture/win/filter_base_win.cc',
+ 'video/capture/win/filter_base_win.h',
+ 'video/capture/win/pin_base_win.cc',
+ 'video/capture/win/pin_base_win.h',
+ 'video/capture/win/sink_filter_win.cc',
+ 'video/capture/win/sink_filter_win.h',
+ 'video/capture/win/sink_input_pin_win.cc',
+ 'video/capture/win/sink_input_pin_win.h',
+ 'video/capture/win/video_capture_device_win.cc',
+ 'video/capture/win/video_capture_device_win.h',
'video/capture/video_capture_device_dummy.cc',
'video/capture/video_capture_device_dummy.h',
'video/capture/video_capture_types.h',
@@ -244,6 +254,17 @@
],
},
}],
+ ['OS=="win"', {
+ 'sources!': [
+ 'video/capture/video_capture_device_dummy.cc',
tommi (sloooow) - chröme 2011/06/23 14:05:56 can we instead not include the dummy implementatio
Per K 2011/06/27 11:47:50 Isn't it better this way? This way we will be able
tommi (sloooow) - chröme 2011/06/27 13:20:37 sounds good.
+ 'video/capture/video_capture_device_dummy.h',
+ ],
+ 'link_settings': {
+ 'libraries': [
+ 'strmiids.lib'
tommi (sloooow) - chröme 2011/06/23 14:05:56 Since this is not working, it's OK with me to use
Per K 2011/06/27 11:47:50 Done.
+ ],
+ },
+ }],
],
},
{
@@ -423,6 +444,7 @@
'filters/video_renderer_base_unittest.cc',
'omx/mock_omx.cc',
'omx/mock_omx.h',
+ 'video/capture/video_capture_device_unittest.cc',
'video/ffmpeg_video_decode_engine_unittest.cc',
],
'conditions': [

Powered by Google App Engine
This is Rietveld 408576698