diff options
| author | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-08 05:46:50 +0000 |
|---|---|---|
| committer | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-08 05:46:50 +0000 |
| commit | d741b57d94f8d8ec49cc597588ca2780d38c06d9 (patch) | |
| tree | 039cac25a8f85ca5d4da053fac22469d225a20e8 /media/media.gyp | |
| parent | 1ffca254514b4da587e46d1367b217eca22d5932 (diff) | |
| download | chromium_src-d741b57d94f8d8ec49cc597588ca2780d38c06d9.zip chromium_src-d741b57d94f8d8ec49cc597588ca2780d38c06d9.tar.gz chromium_src-d741b57d94f8d8ec49cc597588ca2780d38c06d9.tar.bz2 | |
Revert "Move MFT H264 video decoder implementation and connect it to GpuVideoDecoder"
This reverts commit 8462483619e253dca3717d51e340ed839a6cab1d.
Revert "Fix build failure."
This reverts commit 8dcd363637ac2e59f9472c0793a0b1fd3c2ad4c7.
TBR=scherkus
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/3601019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61922 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/media.gyp')
| -rw-r--r-- | media/media.gyp | 76 |
1 files changed, 70 insertions, 6 deletions
diff --git a/media/media.gyp b/media/media.gyp index 49679b1..ee8acbc 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -150,12 +150,6 @@ ], }, 'conditions': [ - ['OS=="win"', { - 'sources': [ - 'video/mft_h264_decode_engine.cc', - 'video/mft_h264_decode_engine.h', - ], - }], ['OS=="linux" or OS=="freebsd"', { 'link_settings': { 'libraries': [ @@ -452,6 +446,76 @@ }, }, }, + { + 'target_name': 'mft_h264_decoder', + 'type': '<(library)', + 'dependencies': [ + 'media', + '../base/base.gyp:base', + '../base/base.gyp:test_support_base', + ], + 'include_dirs': [ + '..', + ], + 'sources': [ + 'mf/mft_h264_decoder.cc', + 'mf/mft_h264_decoder.h', + ], + 'msvs_settings': { + 'VCLinkerTool': { + 'SubSystem': '1', # Set /SUBSYSTEM:CONSOLE + }, + }, + }, + { + 'target_name': 'mft_h264_decoder_example', + 'type': 'executable', + 'dependencies': [ + 'media', + 'mft_h264_decoder', + '../base/base.gyp:base', + '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', + ], + 'include_dirs': [ + '..', + ], + 'sources': [ + 'mf/file_reader_util.cc', + 'mf/file_reader_util.h', + 'mf/mft_h264_decoder_example.cc', + ], + 'msvs_settings': { + 'VCLinkerTool': { + 'SubSystem': '1', # Set /SUBSYSTEM:CONSOLE + }, + }, + }, + { + 'target_name': 'mft_h264_decoder_unittests', + 'type': 'executable', + 'dependencies': [ + 'media', + 'mft_h264_decoder', + '../base/base.gyp:base', + '../base/base.gyp:base_i18n', + '../testing/gtest.gyp:gtest', + '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', + ], + 'include_dirs': [ + '..', + ], + 'sources': [ + 'mf/file_reader_util.cc', + 'mf/file_reader_util.h', + 'mf/test/mft_h264_decoder_unittest.cc', + 'mf/test/run_all_unittests.cc', + ], + 'msvs_settings': { + 'VCLinkerTool': { + 'SubSystem': '1', # Set /SUBSYSTEM:CONSOLE + }, + }, + }, ], }], ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { |