Remove WebMediaPlayerProxy::video_decoder_ & FFmpegVideoDecoder::set_decryptor.

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"
 #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 "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h"
 #include "webkit/media/media_stream_client.h"
 
 namespace webkit_media {
 
 // Constructs and adds the default audio/video decoders to |filter_collection|.
 static void AddDefaultDecodersToCollection(
     media::MessageLoopFactory* message_loop_factory,
     media::FilterCollection* filter_collection,
-    media::Decryptor* decryptor,
-    scoped_refptr<media::FFmpegVideoDecoder>* ffmpeg_video_decoder) {
+    media::Decryptor* decryptor) {
   filter_collection->AddAudioDecoder(new media::FFmpegAudioDecoder(
       base::Bind(&media::MessageLoopFactory::GetMessageLoop,
                  base::Unretained(message_loop_factory),
                  "AudioDecoderThread")));
-  *ffmpeg_video_decoder = new media::FFmpegVideoDecoder(
-      base::Bind(&media::MessageLoopFactory::GetMessageLoop,
-                 base::Unretained(message_loop_factory),
-                 "VideoDecoderThread"));
-  (*ffmpeg_video_decoder)->set_decryptor(decryptor);
-  filter_collection->AddVideoDecoder(*ffmpeg_video_decoder);
+
+  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);
 }
 
 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(
@@ skipping 16 matching lines @@
 
   return true;
 }
 
 bool BuildMediaSourceCollection(
     const WebKit::WebURL& url,
     const WebKit::WebURL& media_source_url,
     media::ChunkDemuxerClient* client,
     media::MessageLoopFactory* message_loop_factory,
     media::FilterCollection* filter_collection,
-    media::Decryptor* decryptor,
-    scoped_refptr<media::FFmpegVideoDecoder>* video_decoder) {
+    media::Decryptor* decryptor) {
   if (media_source_url.isEmpty() || url != media_source_url)
     return false;
 
   filter_collection->SetDemuxer(new media::ChunkDemuxer(client));
 
   AddDefaultDecodersToCollection(message_loop_factory, filter_collection,
-                                 decryptor, video_decoder);
+                                 decryptor);
   return true;
 }
 
 void BuildDefaultCollection(
     const scoped_refptr<media::DataSource>& data_source,
     media::MessageLoopFactory* message_loop_factory,
     media::FilterCollection* filter_collection,
-    media::Decryptor* decryptor,
-    scoped_refptr<media::FFmpegVideoDecoder>* video_decoder) {
+    media::Decryptor* decryptor) {
   filter_collection->SetDemuxer(new media::FFmpegDemuxer(
       message_loop_factory->GetMessageLoop("PipelineThread"),
       data_source));
 
   AddDefaultDecodersToCollection(message_loop_factory, filter_collection,
-                                 decryptor, video_decoder);
+                                 decryptor);
 }
 
 }  // webkit_media