Add libvpx wrapper to media to support VP9 video decoding.

webkit/media/filter_helpers.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/media/filter_helpers.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "media/base/filter_collection.h"
 #include "media/base/media_switches.h"
 #include "media/filters/chunk_demuxer.h"
 #include "media/filters/decrypting_audio_decoder.h"
 #include "media/filters/decrypting_video_decoder.h"
 #include "media/filters/dummy_demuxer.h"
 #include "media/filters/ffmpeg_audio_decoder.h"
 #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"
 
 namespace webkit_media {
 
 // Constructs and adds the default audio/video decoders to |filter_collection|.
 // Note that decoders in the |filter_collection| are ordered. The first
 // audio/video decoder in the |filter_collection| that supports the input
 // audio/video stream will be selected as the audio/video decoder in the media
@@ skipping 34 matching lines @@
     // encrypted. For now FFmpegVideoDecoder can also do decryption
     // (decrypt-only), and we perfer DecryptingVideoDecoder (decrypt-and-decode)
     // to FFmpegVideoDecoder. Fix this order when we move decryption out of
     // FFmpegVideoDecoder.
     filter_collection->GetVideoDecoders()->push_back(decrypting_video_decoder);
   }
 
   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(
     const WebKit::WebURL& url,
     MediaStreamClient* client,
     const scoped_refptr<base::MessageLoopProxy>& message_loop,
     media::FilterCollection* filter_collection) {
   if (!client)
     return false;
 
@@ skipping 36 matching lines @@
     media::FilterCollection* filter_collection,
     ProxyDecryptor* proxy_decryptor) {
   filter_collection->SetDemuxer(new media::FFmpegDemuxer(
       message_loop, data_source));
 
   AddDefaultDecodersToCollection(message_loop, filter_collection,
                                  proxy_decryptor);
 }
 
 }  // webkit_media