| 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(
|
|
|