| Index: webkit/media/filter_helpers.cc
|
| diff --git a/webkit/media/filter_helpers.cc b/webkit/media/filter_helpers.cc
|
| index 0f60f51a2bdbf128e032f041a75fbe2b371ac0d0..94a76ddcf5d1f1b49adaf5c234150ab854ad3731 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"
|
| @@ -34,11 +35,15 @@ static void AddDefaultDecodersToCollection(
|
| media::FilterCollection* filter_collection,
|
| ProxyDecryptor* proxy_decryptor) {
|
|
|
| - const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
|
| + const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
|
| if (cmd_line->HasSwitch(switches::kEnableVp9OpusPlayback)) {
|
| 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 =
|
|
|