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

Unified Diff: media/media.gyp

Issue 11419200: Video capture implementation using the Media Foundation API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add denominator check Created 8 years, 1 month 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 76e09b78d4ac948342f96851a95366f9a11b3308..bb461a984c974ce3e52d9e4cc2e4c063340eb05f 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -310,6 +310,8 @@
'video/capture/video_capture_proxy.cc',
'video/capture/video_capture_proxy.h',
'video/capture/video_capture_types.h',
+ 'video/capture/win/capability_list_win.cc',
+ 'video/capture/win/capability_list_win.h',
'video/capture/win/filter_base_win.cc',
'video/capture/win/filter_base_win.h',
'video/capture/win/pin_base_win.cc',
@@ -319,6 +321,8 @@
'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_mf_win.cc',
+ 'video/capture/win/video_capture_device_mf_win.h',
'video/capture/win/video_capture_device_win.cc',
'video/capture/win/video_capture_device_win.h',
'video/picture.cc',
@@ -552,6 +556,23 @@
'video/capture/video_capture_device_dummy.cc',
'video/capture/video_capture_device_dummy.h',
],
+ 'link_settings': {
+ 'libraries': [
+ '-lmf.lib',
+ '-lmfplat.lib',
+ '-lmfreadwrite.lib',
+ '-lmfuuid.lib',
+ ],
+ },
+ 'msvs_settings': {
+ 'VCLinkerTool': {
+ 'DelayLoadDLLs': [
+ 'mf.dll',
+ 'mfplat.dll',
+ 'mfreadwrite.dll',
+ ],
+ },
+ },
}],
['proprietary_codecs==1 or branding=="Chrome"', {
'sources': [

Powered by Google App Engine
This is Rietveld 408576698