diff options
| author | vigneshv@chromium.org <vigneshv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-19 23:43:32 +0000 |
|---|---|---|
| committer | vigneshv@chromium.org <vigneshv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-19 23:43:32 +0000 |
| commit | 6ac955b41814da1eebf56244a147f3fad00f5aa7 (patch) | |
| tree | 9671f7731055aa027d63e56290722d7ec012756f /webkit/media | |
| parent | e69198bfdb89c4658a023c05c4929e9617ac2828 (diff) | |
| download | chromium_src-6ac955b41814da1eebf56244a147f3fad00f5aa7.zip chromium_src-6ac955b41814da1eebf56244a147f3fad00f5aa7.tar.gz chromium_src-6ac955b41814da1eebf56244a147f3fad00f5aa7.tar.bz2 | |
media: Add support for playback of VP8 Alpha video streams
BUG=147355
TEST=VP8 Alpha video streams play
TBR=sky
Review URL: https://chromiumcodereview.appspot.com/13886011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195339 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/media')
| -rw-r--r-- | webkit/media/webmediaplayer_impl.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/webkit/media/webmediaplayer_impl.cc b/webkit/media/webmediaplayer_impl.cc index ce2cbc7..20d3678 100644 --- a/webkit/media/webmediaplayer_impl.cc +++ b/webkit/media/webmediaplayer_impl.cc @@ -1303,18 +1303,19 @@ WebMediaPlayerImpl::BuildFilterCollection() { media_thread_.message_loop_proxy(), gpu_factories_)); } - video_decoders.push_back(new media::FFmpegVideoDecoder( - media_thread_.message_loop_proxy())); - // TODO(phajdan.jr): Remove ifdefs when libvpx with vp9 support is released // (http://crbug.com/174287) . #if !defined(MEDIA_DISABLE_LIBVPX) - if (cmd_line->HasSwitch(switches::kEnableVp9Playback)) { + if (cmd_line->HasSwitch(switches::kEnableVp9Playback) || + cmd_line->HasSwitch(switches::kEnableVp8AlphaPlayback)) { video_decoders.push_back(new media::VpxVideoDecoder( media_thread_.message_loop_proxy())); } #endif // !defined(MEDIA_DISABLE_LIBVPX) + video_decoders.push_back(new media::FFmpegVideoDecoder( + media_thread_.message_loop_proxy())); + scoped_ptr<media::VideoRenderer> video_renderer( new media::VideoRendererBase( media_thread_.message_loop_proxy(), |