diff options
| author | tomfinegan@chromium.org <tomfinegan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-16 22:19:15 +0000 |
|---|---|---|
| committer | tomfinegan@chromium.org <tomfinegan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-16 22:19:15 +0000 |
| commit | 4e8d20a5e0c0e29b9f7235f0d01c926316e778e4 (patch) | |
| tree | 43c1b73db1f77aff7b6a53bf3fffe3b0a17e53af /webkit/media | |
| parent | d674f6e23dc4d4e8944df74074e06c1b5c18a7f1 (diff) | |
| download | chromium_src-4e8d20a5e0c0e29b9f7235f0d01c926316e778e4.zip chromium_src-4e8d20a5e0c0e29b9f7235f0d01c926316e778e4.tar.gz chromium_src-4e8d20a5e0c0e29b9f7235f0d01c926316e778e4.tar.bz2 | |
media: Add support for playback for VP8 Alpha video streams.
BUG=147355
TEST=VP8 Alpha video streams play
Review URL: https://codereview.chromium.org/12263013
Patch from Vignesh Venkatasubramanian <vigneshv@chromium.org>.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194465 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/media')
| -rw-r--r-- | webkit/media/filter_helpers.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/webkit/media/filter_helpers.cc b/webkit/media/filter_helpers.cc index c803f69..00cf121 100644 --- a/webkit/media/filter_helpers.cc +++ b/webkit/media/filter_helpers.cc @@ -36,20 +36,21 @@ static void AddDefaultDecodersToCollection( const scoped_refptr<base::MessageLoopProxy>& message_loop, media::FilterCollection* filter_collection) { - scoped_refptr<media::FFmpegVideoDecoder> ffmpeg_video_decoder = - new media::FFmpegVideoDecoder(message_loop); - filter_collection->GetVideoDecoders()->push_back(ffmpeg_video_decoder); - // TODO(phajdan.jr): Remove ifdefs when libvpx with vp9 support is released // (http://crbug.com/174287) . #if !defined(MEDIA_DISABLE_LIBVPX) const CommandLine* cmd_line = CommandLine::ForCurrentProcess(); - if (cmd_line->HasSwitch(switches::kEnableVp9Playback)) { + if (cmd_line->HasSwitch(switches::kEnableVp9Playback) || + cmd_line->HasSwitch(switches::kEnableVp8AlphaPlayback) ) { scoped_refptr<media::VpxVideoDecoder> vpx_video_decoder = new media::VpxVideoDecoder(message_loop); filter_collection->GetVideoDecoders()->push_back(vpx_video_decoder); } #endif // !defined(MEDIA_DISABLE_LIBVPX) + + scoped_refptr<media::FFmpegVideoDecoder> ffmpeg_video_decoder = + new media::FFmpegVideoDecoder(message_loop); + filter_collection->GetVideoDecoders()->push_back(ffmpeg_video_decoder); } void BuildMediaSourceCollection( |