diff options
| author | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-04 10:50:28 +0000 |
|---|---|---|
| committer | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-04 10:50:28 +0000 |
| commit | 348c18bc2b9bdd6887e49f26df551b792d4e7a57 (patch) | |
| tree | 9189e37024ab6225aec8c9a43cb92a4140725587 /media/media.gyp | |
| parent | d20b2bc5176090837b4cad0e6344eb43ae7075e7 (diff) | |
| download | chromium_src-348c18bc2b9bdd6887e49f26df551b792d4e7a57.zip chromium_src-348c18bc2b9bdd6887e49f26df551b792d4e7a57.tar.gz chromium_src-348c18bc2b9bdd6887e49f26df551b792d4e7a57.tar.bz2 | |
Revert 170912 - need more delayloads.
> Video capture implementation using the Media Foundation API.
> This replaces the DirectShow based implementation for Vista,Win7 and Win8.
> DirectShow isn't supported in metro mode so once we've landed this,
> we can revert the workaround we have in place for Win8.
>
> The CapabilityList class is mostly moved code from the DS implementation.
> The difference is that I'm not using a std::map<> since that wasn't
> really necessary and instead adding one member (via inheritance) to
> the capability struct on Windows that holds the stream id that is needed.
>
> BUG=140545
> TEST=All video capture tests in media_unittests now test this new implementation (except on XP).
>
> Review URL: https://codereview.chromium.org/11419200
TBR=tommi@chromium.org
Review URL: https://codereview.chromium.org/11418307
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170925 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/media.gyp')
| -rw-r--r-- | media/media.gyp | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/media/media.gyp b/media/media.gyp index 595af78..ef7591b 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -314,8 +314,6 @@ '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', @@ -325,8 +323,6 @@ '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', @@ -560,23 +556,6 @@ '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': [ |