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

Unified Diff: webkit/media/filter_helpers.cc

Issue 12045060: Add wrapper class to media for support of VP9 video, and add a command line flag to enable the supp… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add EoS DCHECK in VpxVideoDecoder::Decode(). Created 7 years, 11 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/filter_helpers.cc
diff --git a/webkit/media/filter_helpers.cc b/webkit/media/filter_helpers.cc
index 55e7e2393e2f9767d63480b74670cedb01f5aaed..57034129cf66b9f364fecc8f998ede5a21ec7301 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(
« 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