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

Unified Diff: webkit/media/filter_helpers.cc

Issue 11468018: Add libvpx wrapper to media to support VP9 video decoding. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add work around for lack of VP9 in ffmpeg. Created 8 years 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
« media/filters/vpx_video_decoder.cc ('K') | « 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 382d36bb47d013847ebb89a325678cecabe642c8..4c6d32d3125a93d548425ab462d5934016f6deea 100644
--- a/webkit/media/filter_helpers.cc
+++ b/webkit/media/filter_helpers.cc
@@ -16,6 +16,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/WebKit/chromium/public/platform/WebURL.h"
#include "webkit/media/crypto/proxy_decryptor.h"
#include "webkit/media/media_stream_client.h"
@@ -70,6 +71,12 @@ static void AddDefaultDecodersToCollection(
scoped_refptr<media::FFmpegVideoDecoder> ffmpeg_video_decoder =
new media::FFmpegVideoDecoder(message_loop, proxy_decryptor);
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(
« media/filters/vpx_video_decoder.cc ('K') | « media/media.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698