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

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: Uncomment VP9 stuff in ffmpeg_common. 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
« net/base/mime_util.cc ('K') | « net/base/mime_util.cc ('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 23774c3b0152c71b8ac45f453eb0ac4681149534..ec34ace1705948a51f7b5f01cb10e86de74c0f54 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"
@@ -39,6 +40,10 @@ static void AddDefaultDecodersToCollection(
scoped_refptr<media::OpusAudioDecoder> opus_audio_decoder =
new media::OpusAudioDecoder(message_loop);
filter_collection->GetAudioDecoders()->push_back(opus_audio_decoder);
+
+ scoped_refptr<media::VpxVideoDecoder> vpx_video_decoder =
+ new media::VpxVideoDecoder(message_loop);
+ filter_collection->GetVideoDecoders()->push_back(vpx_video_decoder);
}
scoped_refptr<media::FFmpegAudioDecoder> ffmpeg_audio_decoder =
« net/base/mime_util.cc ('K') | « net/base/mime_util.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698