diff options
author | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-08 04:52:15 +0000 |
---|---|---|
committer | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-08 04:52:15 +0000 |
commit | 71e43a27d4c6018a9502753566d228cbf2dc2ca5 (patch) | |
tree | 656e03e34018265e322da21c9487dec3ad41eb56 /media/media.gyp | |
parent | 463d474661abf3f3ed431eb73457efa7a6946201 (diff) | |
download | chromium_src-71e43a27d4c6018a9502753566d228cbf2dc2ca5.zip chromium_src-71e43a27d4c6018a9502753566d228cbf2dc2ca5.tar.gz chromium_src-71e43a27d4c6018a9502753566d228cbf2dc2ca5.tar.bz2 |
Move MFT H264 video decoder implementation and connect it to GpuVideoDecoder
Remove media/mf folder and move the video decode engine to media/video.
There are some temporary changes in MftH264DecodeEngine to work with
GpuVideoDecoder correctly.
Removed tests will be added later. Example program will likely be removed
permanently due to maintence problem.
This patch depends WebKit and ANGLE changes to be able to present video frames
onto screen and still have lot of bugs, those problems will be address later.
BUG=53714
TEST=Tree is green. This patch doesn't work yet.
Review URL: http://codereview.chromium.org/3432030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61918 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"', { |