diff options
| author | tomfinegan@chromium.org <tomfinegan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-22 02:00:26 +0000 |
|---|---|---|
| committer | tomfinegan@chromium.org <tomfinegan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-22 02:00:26 +0000 |
| commit | e17c547493001b9195e1209b9444d2aee676c826 (patch) | |
| tree | 63cb2af3787464e60b62f00a83e2ec9dabd0ed0b /media/media.gyp | |
| parent | 668719e2ddde41c16cecb3774decfc0b5799e753 (diff) | |
| download | chromium_src-e17c547493001b9195e1209b9444d2aee676c826.zip chromium_src-e17c547493001b9195e1209b9444d2aee676c826.tar.gz chromium_src-e17c547493001b9195e1209b9444d2aee676c826.tar.bz2 | |
Add wrapper class to media for support of VP9 video, and add a command line flag to enable the support.
This initial version of the wrapper provides support for decoding VP9 video in WebM container files, and is disabled by default.
New flag added: --enable-vp9-playback
TBR=brettw,scherkus,xhwang
BUG=166094
TEST=VP9 video in WebM containers plays back in <video> elements when --enable-vp9-playback is specified on the command line.
Review URL: https://codereview.chromium.org/11644078
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174488 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/media.gyp')
| -rw-r--r-- | media/media.gyp | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/media/media.gyp b/media/media.gyp index 6d20998..6879847 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -13,8 +13,11 @@ ['OS == "android" or OS == "ios"', { # Android and iOS don't use ffmpeg. 'use_ffmpeg%': 0, + # Android and iOS don't use libvpx. + 'use_libvpx%': 0, }, { # 'OS != "android" and OS != "ios"' 'use_ffmpeg%': 1, + 'use_libvpx%': 1, }], ], }, @@ -314,6 +317,8 @@ 'filters/video_frame_generator.h', 'filters/video_renderer_base.cc', 'filters/video_renderer_base.h', + 'filters/vpx_video_decoder.cc', + 'filters/vpx_video_decoder.h', 'video/capture/fake_video_capture_device.cc', 'video/capture/fake_video_capture_device.h', 'video/capture/linux/video_capture_device_linux.cc', @@ -414,6 +419,17 @@ 'webm/webm_stream_parser.h', ], }], + ['use_libvpx == 1', { + 'dependencies': [ + '<(DEPTH)/third_party/libvpx/libvpx.gyp:libvpx', + ], + }, { # use_libvpx == 0 + # Exclude the sources that depend on libvpx. + 'sources!': [ + 'filters/vpx_video_decoder.cc', + 'filters/vpx_video_decoder.h', + ], + }], ['OS == "ios"', { 'includes': [ # For shared_memory_support_sources variable. |