Move VideoDecoder initialization into VideoRendererBase.

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 "media/base/filter_collection.h"
 #include "media/base/message_loop_factory.h"
 #include "media/filters/chunk_demuxer.h"
@@ skipping 15 matching lines @@
       base::Bind(&media::MessageLoopFactory::GetMessageLoop,
                  base::Unretained(message_loop_factory),
                  "AudioDecoderThread")));
 
   scoped_refptr<media::FFmpegVideoDecoder> ffmpeg_video_decoder =
       new media::FFmpegVideoDecoder(
           base::Bind(&media::MessageLoopFactory::GetMessageLoop,
                      base::Unretained(message_loop_factory),
                      "VideoDecoderThread"),
           decryptor);
-  filter_collection->AddVideoDecoder(ffmpeg_video_decoder);
+  filter_collection->GetVideoDecoders().push_back(ffmpeg_video_decoder);
 }
 
 bool BuildMediaStreamCollection(const WebKit::WebURL& url,
                                 MediaStreamClient* client,
                                 media::MessageLoopFactory* message_loop_factory,
                                 media::FilterCollection* filter_collection) {
   if (!client)
     return false;
 
   scoped_refptr<media::VideoDecoder> video_decoder = client->GetVideoDecoder(
       url, message_loop_factory);
   if (!video_decoder)
     return false;
 
-  // Remove any "traditional" decoders (e.g. GpuVideoDecoder) from the
-  // collection.
-  // NOTE: http://crbug.com/110800 is about replacing this ad-hockery with

[Ami GONE FROM CHROMIUM, 2012/08/09 20:30:18]

This comment should live on.

[acolwell GONE FROM CHROMIUM, 2012/08/09 22:23:32]

Done.

-  // something more designed.
-  scoped_refptr<media::VideoDecoder> old_videodecoder;
-  do {
-    filter_collection->SelectVideoDecoder(&old_videodecoder);
-  } while (old_videodecoder);
-
-  filter_collection->AddVideoDecoder(video_decoder);
+  // Remove all other decoders and just use the MediaStream one.
+  filter_collection->GetVideoDecoders().clear();
+  filter_collection->GetVideoDecoders().push_back(video_decoder);
 
   filter_collection->SetDemuxer(new media::DummyDemuxer(true, false));
 
   return true;
 }
 
 bool BuildMediaSourceCollection(
     const WebKit::WebURL& url,
     const WebKit::WebURL& media_source_url,
     media::ChunkDemuxerClient* client,
@@ skipping 17 matching lines @@
     media::Decryptor* decryptor) {
   filter_collection->SetDemuxer(new media::FFmpegDemuxer(
       message_loop_factory->GetMessageLoop("PipelineThread"),
       data_source));
 
   AddDefaultDecodersToCollection(message_loop_factory, filter_collection,
                                  decryptor);
 }
 
 }  // webkit_media