diff options
| author | tomfinegan@chromium.org <tomfinegan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-19 04:48:11 +0000 |
|---|---|---|
| committer | tomfinegan@chromium.org <tomfinegan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-19 04:48:11 +0000 |
| commit | fc4fc007af0973617fb434629a1fcf22705908fd (patch) | |
| tree | 29211d6b68584ee6d3da9a8fd1d0f6a2ef611e05 /webkit/media | |
| parent | 0c8bd57fac6f7a4bd6f5252d4f0d15a63f0c2107 (diff) | |
| download | chromium_src-fc4fc007af0973617fb434629a1fcf22705908fd.zip chromium_src-fc4fc007af0973617fb434629a1fcf22705908fd.tar.gz chromium_src-fc4fc007af0973617fb434629a1fcf22705908fd.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://chromiumcodereview.appspot.com/12025030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@177842 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/media')
| -rw-r--r-- | webkit/media/filter_helpers.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/webkit/media/filter_helpers.cc b/webkit/media/filter_helpers.cc index 55e7e23..5703412 100644 --- a/webkit/media/filter_helpers.cc +++ b/webkit/media/filter_helpers.cc @@ -14,6 +14,7 @@ #include "media/filters/ffmpeg_demuxer.h" #include "media/filters/ffmpeg_video_decoder.h" #include "media/filters/opus_audio_decoder.h" +#include "media/filters/vpx_video_decoder.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" #include "webkit/media/media_stream_client.h" @@ -43,6 +44,12 @@ static void AddDefaultDecodersToCollection( scoped_refptr<media::FFmpegVideoDecoder> ffmpeg_video_decoder = new media::FFmpegVideoDecoder(message_loop); filter_collection->GetVideoDecoders()->push_back(ffmpeg_video_decoder); + + if (cmd_line->HasSwitch(switches::kEnableVp9Playback)) { + scoped_refptr<media::VpxVideoDecoder> vpx_video_decoder = + new media::VpxVideoDecoder(message_loop); + filter_collection->GetVideoDecoders()->push_back(vpx_video_decoder); + } } bool BuildMediaStreamCollection( |