Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(164)

Unified Diff: webkit/media/webmediaplayer_impl.cc

Issue 13886011: media: Add support for playback of VP8 Alpha video streams (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/media.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/media/webmediaplayer_impl.cc
diff --git a/webkit/media/webmediaplayer_impl.cc b/webkit/media/webmediaplayer_impl.cc
index ce2cbc7c78b80aec988fe38ac667cdf0204f7347..20d367861eef078bd52fcdeecf34327afd054cac 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(),
« no previous file with comments | « media/media.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698