diff options
| author | imcheng@chromium.org <imcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-11 16:37:17 +0000 |
|---|---|---|
| committer | imcheng@chromium.org <imcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-11 16:37:17 +0000 |
| commit | b24c81a4c510bec2902b12d4768d6d47aafed9f2 (patch) | |
| tree | a5cc2c420519816c48e045a26d2e97f1600038d3 /media/media.gyp | |
| parent | c02ecb834297e41993b0546fb57156ec2ab2563f (diff) | |
| download | chromium_src-b24c81a4c510bec2902b12d4768d6d47aafed9f2.zip chromium_src-b24c81a4c510bec2902b12d4768d6d47aafed9f2.tar.gz chromium_src-b24c81a4c510bec2902b12d4768d6d47aafed9f2.tar.bz2 | |
Added rendering and unittests for the MF H264 decoder prototype.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/3096010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55734 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/media.gyp')
| -rw-r--r-- | media/media.gyp | 57 |
1 files changed, 54 insertions, 3 deletions
diff --git a/media/media.gyp b/media/media.gyp index 7f9ba7a2..db0eeb0 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -430,11 +430,10 @@ }, { 'target_name': 'mft_h264_decoder', - 'type': 'executable', + 'type': '<(library)', 'dependencies': [ 'media', '../base/base.gyp:base', - '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', ], 'include_dirs': [ '..', @@ -442,9 +441,61 @@ '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/basic_renderer.cc', + 'mf/basic_renderer.h', + 'mf/d3d_util.cc', + 'mf/d3d_util.h', + '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/d3d_util.cc', + 'mf/d3d_util.h', 'mf/file_reader_util.cc', 'mf/file_reader_util.h', - 'mf/main.cc', + 'mf/test/mft_h264_decoder_unittest.cc', + 'mf/test/run_all_unittests.cc', ], 'msvs_settings': { 'VCLinkerTool': { |