Move VideoDecoder initialization into VideoRendererBase to simplify implementing codec config changes during playback.

BUG=141533
TEST=Existing PipelineTest.*, VideoRendererBaseTest.*

Review URL: https://chromiumcodereview.appspot.com/10836167

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151132 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 7 deletions

diff --git a/webkit/media/filter_helpers.cc b/webkit/media/filter_helpers.cc
index 1b26422..c4c7f7e 100644
--- a/webkit/media/filter_helpers.cc
+++ b/webkit/media/filter_helpers.cc
@@ -33,7 +33,7 @@ static void AddDefaultDecodersToCollection(
                      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,
@@ -48,16 +48,13 @@ bool BuildMediaStreamCollection(const WebKit::WebURL& url,
   if (!video_decoder)
     return false;
 
+  // Remove all other decoders and just use the MediaStream one.
   // Remove any "traditional" decoders (e.g. GpuVideoDecoder) from the
   // collection.
   // NOTE: http://crbug.com/110800 is about replacing this ad-hockery with
   // something more designed.
-  scoped_refptr<media::VideoDecoder> old_videodecoder;
-  do {
-    filter_collection->SelectVideoDecoder(&old_videodecoder);
-  } while (old_videodecoder);
-
-  filter_collection->AddVideoDecoder(video_decoder);
+  filter_collection->GetVideoDecoders()->clear();
+  filter_collection->GetVideoDecoders()->push_back(video_decoder);
 
   filter_collection->SetDemuxer(new media::DummyDemuxer(true, false));