diff options
| author | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-08 07:30:18 +0000 |
|---|---|---|
| committer | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-08 07:30:18 +0000 |
| commit | b6e4b4f99f9b1833d6b1d11ae03da42158549670 (patch) | |
| tree | a9f67c65ec2bd94a8165b9b40b369bc2178dc5aa /media/media.gyp | |
| parent | 9ba0d9f42d948e925dee89b9f1f4b6d061ab2dc1 (diff) | |
| download | chromium_src-b6e4b4f99f9b1833d6b1d11ae03da42158549670.zip chromium_src-b6e4b4f99f9b1833d6b1d11ae03da42158549670.tar.gz chromium_src-b6e4b4f99f9b1833d6b1d11ae03da42158549670.tar.bz2 | |
Resubmit - move MFT h264 code to media/video and connect to gpu video decoder.
TBR=scherkus
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/3591020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61925 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/media.gyp')
| -rw-r--r-- | media/media.gyp | 76 |
1 files changed, 6 insertions, 70 deletions
diff --git a/media/media.gyp b/media/media.gyp index ee8acbc..49679b1 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -150,6 +150,12 @@ ], }, 'conditions': [ + ['OS=="win"', { + 'sources': [ + 'video/mft_h264_decode_engine.cc', + 'video/mft_h264_decode_engine.h', + ], + }], ['OS=="linux" or OS=="freebsd"', { 'link_settings': { 'libraries': [ @@ -446,76 +452,6 @@ }, }, }, - { - '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"', { |