Reland: Remove reference counting from media::VideoDecoder and friends.

In addition:
  * VideoRenderer is now passed a list of decoders via constructor instead of Initialize()
  * WebMediaPlayerImpl's FilterCollection is now built in one shot instead of incrementally

BUG=173313

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

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

5 files changed, 95 insertions, 181 deletions

diff --git a/webkit/media/filter_helpers.cc b/webkit/media/filter_helpers.cc
deleted file mode 100644
index c803f69..0000000
--- a/webkit/media/filter_helpers.cc
+++ /dev/null
@@ -1,81 +0,0 @@
-// 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/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/Platform/chromium/public/WebURL.h"
-
-namespace webkit_media {
-
-void AddDefaultAudioDecoders(
-    const scoped_refptr<base::MessageLoopProxy>& message_loop,
-    ScopedVector<media::AudioDecoder>* audio_decoders) {
-  audio_decoders->push_back(new media::FFmpegAudioDecoder(message_loop));
-
-  const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
-  if (cmd_line->HasSwitch(switches::kEnableOpusPlayback)) {
-    audio_decoders->push_back(new media::OpusAudioDecoder(message_loop));
-  }
-}
-
-// Constructs and adds the default video decoders to |filter_collection|.
-//
-// Note that decoders in the |filter_collection| are initialized in order.
-static void AddDefaultDecodersToCollection(
-    const scoped_refptr<base::MessageLoopProxy>& message_loop,
-    media::FilterCollection* filter_collection) {
-
-  scoped_refptr<media::FFmpegVideoDecoder> ffmpeg_video_decoder =
-      new media::FFmpegVideoDecoder(message_loop);
-  filter_collection->GetVideoDecoders()->push_back(ffmpeg_video_decoder);
-
-  // TODO(phajdan.jr): Remove ifdefs when libvpx with vp9 support is released
-  // (http://crbug.com/174287) .
-#if !defined(MEDIA_DISABLE_LIBVPX)
-  const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
-  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);
-  }
-#endif  // !defined(MEDIA_DISABLE_LIBVPX)
-}
-
-void BuildMediaSourceCollection(
-    const scoped_refptr<media::ChunkDemuxer>& demuxer,
-    const scoped_refptr<base::MessageLoopProxy>& message_loop,
-    media::FilterCollection* filter_collection) {
-  DCHECK(demuxer);
-  filter_collection->SetDemuxer(demuxer);
-
-  // Remove GPUVideoDecoder until it supports codec config changes.
-  // TODO(acolwell): Remove this once http://crbug.com/151045 is fixed.
-  DCHECK_LE(filter_collection->GetVideoDecoders()->size(), 1u);
-  filter_collection->GetVideoDecoders()->clear();
-
-  AddDefaultDecodersToCollection(message_loop, filter_collection);
-}
-
-void BuildDefaultCollection(
-    const scoped_refptr<media::DataSource>& data_source,
-    const scoped_refptr<base::MessageLoopProxy>& message_loop,
-    media::FilterCollection* filter_collection,
-    const media::FFmpegNeedKeyCB& need_key_cb) {
-  filter_collection->SetDemuxer(new media::FFmpegDemuxer(
-      message_loop, data_source, need_key_cb));
-
-  AddDefaultDecodersToCollection(message_loop, filter_collection);
-}
-
-}  // webkit_media
diff --git a/webkit/media/filter_helpers.h b/webkit/media/filter_helpers.h
deleted file mode 100644
index 29a3e38..0000000
--- a/webkit/media/filter_helpers.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// 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.
-
-#ifndef WEBKIT_MEDIA_FILTER_HELPERS_H_
-#define WEBKIT_MEDIA_FILTER_HELPERS_H_
-
-#include "base/basictypes.h"
-#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_vector.h"
-// TODO(fgalligan): Remove the dependency on FFmpeg.
-#include "media/filters/ffmpeg_demuxer.h"
-
-namespace base {
-class MessageLoopProxy;
-}
-
-namespace media {
-class AudioDecoder;
-class ChunkDemuxer;
-class DataSource;
-class FilterCollection;
-}
-
-namespace webkit_media {
-
-// Creates and adds the default set of audio decoders to |audio_decoders|.
-void AddDefaultAudioDecoders(
-    const scoped_refptr<base::MessageLoopProxy>& message_loop,
-    ScopedVector<media::AudioDecoder>* audio_decoders);
-
-// Builds the required filters for handling media source URLs, adds them to
-// |filter_collection|.
-void BuildMediaSourceCollection(
-    const scoped_refptr<media::ChunkDemuxer>& demuxer,
-    const scoped_refptr<base::MessageLoopProxy>& message_loop,
-    media::FilterCollection* filter_collection);
-
-// Builds the required filters for handling regular URLs and adds them to
-// |filter_collection| and fills |video_decoder| returning true if successful.
-void BuildDefaultCollection(
-    const scoped_refptr<media::DataSource>& data_source,
-    const scoped_refptr<base::MessageLoopProxy>& message_loop,
-    media::FilterCollection* filter_collection,
-    const media::FFmpegNeedKeyCB& need_key_cb);
-
-}  // webkit_media
-
-#endif  // WEBKIT_MEDIA_FILTER_HELPERS_H_
diff --git a/webkit/media/webkit_media.gypi b/webkit/media/webkit_media.gypi
index 19e6e23..2d57dfb 100644
--- a/webkit/media/webkit_media.gypi
+++ b/webkit/media/webkit_media.gypi
@@ -74,8 +74,6 @@
         'crypto/ppapi_decryptor.h',
         'crypto/proxy_decryptor.cc',
         'crypto/proxy_decryptor.h',
-        'filter_helpers.cc',
-        'filter_helpers.h',
         'media_stream_audio_renderer.cc',
         'media_stream_audio_renderer.h',
         'media_stream_client.h',
diff --git a/webkit/media/webmediaplayer_impl.cc b/webkit/media/webmediaplayer_impl.cc
index 4c47acd..ce2cbc7 100644
--- a/webkit/media/webmediaplayer_impl.cc
+++ b/webkit/media/webmediaplayer_impl.cc
@@ -11,6 +11,7 @@
 
 #include "base/bind.h"
 #include "base/callback.h"
+#include "base/command_line.h"
 #include "base/debug/crash_logging.h"
 #include "base/message_loop_proxy.h"
 #include "base/metrics/histogram.h"
@@ -23,11 +24,17 @@
 #include "media/base/filter_collection.h"
 #include "media/base/limits.h"
 #include "media/base/media_log.h"
+#include "media/base/media_switches.h"
 #include "media/base/pipeline.h"
 #include "media/base/video_frame.h"
 #include "media/filters/audio_renderer_impl.h"
 #include "media/filters/chunk_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/video_renderer_base.h"
+#include "media/filters/vpx_video_decoder.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h"
@@ -38,7 +45,6 @@
 #include "v8/include/v8.h"
 #include "webkit/compositor_bindings/web_layer_impl.h"
 #include "webkit/media/buffered_data_source.h"
-#include "webkit/media/filter_helpers.h"
 #include "webkit/media/webaudiosourceprovider_impl.h"
 #include "webkit/media/webmediaplayer_delegate.h"
 #include "webkit/media/webmediaplayer_params.h"
@@ -132,7 +138,6 @@ WebMediaPlayerImpl::WebMediaPlayerImpl(
       network_state_(WebMediaPlayer::NetworkStateEmpty),
       ready_state_(WebMediaPlayer::ReadyStateHaveNothing),
       main_loop_(base::MessageLoopProxy::current()),
-      filter_collection_(new media::FilterCollection()),
       media_thread_("MediaPipeline"),
       paused_(true),
       seeking_(false),
@@ -144,6 +149,7 @@ WebMediaPlayerImpl::WebMediaPlayerImpl(
       media_log_(params.media_log()),
       accelerated_compositing_reported_(false),
       incremented_externally_allocated_memory_(false),
+      gpu_factories_(params.gpu_factories()),
       is_local_source_(false),
       supports_save_(true),
       starting_(false),
@@ -170,7 +176,6 @@ WebMediaPlayerImpl::WebMediaPlayerImpl(
   // Also we want to be notified of |main_loop_| destruction.
   MessageLoop::current()->AddDestructionObserver(this);
 
-  media::SetDecryptorReadyCB set_decryptor_ready_cb;
   if (WebKit::WebRuntimeFeatures::isEncryptedMediaEnabled()) {
     decryptor_.reset(new ProxyDecryptor(
         client,
@@ -179,44 +184,12 @@ WebMediaPlayerImpl::WebMediaPlayerImpl(
         BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnKeyError),
         BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnKeyMessage),
         BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnNeedKey)));
-    set_decryptor_ready_cb = base::Bind(&ProxyDecryptor::SetDecryptorReadyCB,
-                                        base::Unretained(decryptor_.get()));
   }
 
-  // Create the GPU video decoder if factories were provided.
-  if (params.gpu_factories()) {
-    filter_collection_->GetVideoDecoders()->push_back(
-        new media::GpuVideoDecoder(
-            media_thread_.message_loop_proxy(),
-            params.gpu_factories()));
-    gpu_factories_ = params.gpu_factories();
-  }
-
-  // Create default video renderer.
-  scoped_ptr<media::VideoRenderer> video_renderer(
-      new media::VideoRendererBase(
-          media_thread_.message_loop_proxy(),
-          set_decryptor_ready_cb,
-          base::Bind(&WebMediaPlayerImpl::FrameReady, base::Unretained(this)),
-          BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::SetOpaque),
-          true));
-  filter_collection_->SetVideoRenderer(video_renderer.Pass());
-
-  // Create default audio renderer using the null sink if no sink was provided.
+  // Use the null sink if no sink was provided.
   audio_source_provider_ = new WebAudioSourceProviderImpl(
       params.audio_renderer_sink() ? params.audio_renderer_sink() :
       new media::NullAudioSink(media_thread_.message_loop_proxy()));
-
-  ScopedVector<media::AudioDecoder> audio_decoders;
-  AddDefaultAudioDecoders(media_thread_.message_loop_proxy(), &audio_decoders);
-
-  scoped_ptr<media::AudioRenderer> audio_renderer(
-      new media::AudioRendererImpl(
-        media_thread_.message_loop_proxy(),
-        audio_source_provider_,
-        audio_decoders.Pass(),
-        set_decryptor_ready_cb));
-  filter_collection_->SetAudioRenderer(audio_renderer.Pass());
 }
 
 WebMediaPlayerImpl::~WebMediaPlayerImpl() {
@@ -288,12 +261,6 @@ void WebMediaPlayerImpl::load(const WebKit::WebURL& url, CORSMode cors_mode) {
           AsWeakPtr(), gurl));
 
   is_local_source_ = !gurl.SchemeIs("http") && !gurl.SchemeIs("https");
-
-  BuildDefaultCollection(
-      data_source_,
-      media_thread_.message_loop_proxy(),
-      filter_collection_.get(),
-      BIND_TO_RENDER_LOOP_2(&WebMediaPlayerImpl::OnNeedKey, "", ""));
 }
 
 void WebMediaPlayerImpl::load(const WebKit::WebURL& url,
@@ -309,9 +276,6 @@ void WebMediaPlayerImpl::load(const WebKit::WebURL& url,
       BIND_TO_RENDER_LOOP_2(&WebMediaPlayerImpl::OnNeedKey, "", ""),
       base::Bind(&LogMediaSourceError, media_log_));
 
-  BuildMediaSourceCollection(chunk_demuxer_,
-                             media_thread_.message_loop_proxy(),
-                             filter_collection_.get());
   supports_save_ = false;
   StartPipeline();
 }
@@ -1175,7 +1139,7 @@ void WebMediaPlayerImpl::NotifyDownloading(bool is_downloading) {
 void WebMediaPlayerImpl::StartPipeline() {
   starting_ = true;
   pipeline_->Start(
-      filter_collection_.Pass(),
+      BuildFilterCollection(),
       BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnPipelineEnded),
       BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnPipelineError),
       BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnPipelineSeek),
@@ -1286,4 +1250,82 @@ void WebMediaPlayerImpl::FrameReady(
       &WebMediaPlayerImpl::Repaint, AsWeakPtr()));
 }
 
+scoped_ptr<media::FilterCollection>
+WebMediaPlayerImpl::BuildFilterCollection() {
+  const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
+
+  scoped_ptr<media::FilterCollection> filter_collection(
+      new media::FilterCollection());
+
+  // Figure out which demuxer to use.
+  if (data_source_) {
+    DCHECK(!chunk_demuxer_);
+    filter_collection->SetDemuxer(new media::FFmpegDemuxer(
+        media_thread_.message_loop_proxy(), data_source_,
+        BIND_TO_RENDER_LOOP_2(&WebMediaPlayerImpl::OnNeedKey, "", "")));
+  } else {
+    DCHECK(chunk_demuxer_);
+    filter_collection->SetDemuxer(chunk_demuxer_);
+
+    // Disable GpuVideoDecoder creation until it supports codec config changes.
+    // TODO(acolwell): Remove this once http://crbug.com/151045 is fixed.
+    gpu_factories_ = NULL;
+  }
+
+  // Figure out if EME is enabled.
+  media::SetDecryptorReadyCB set_decryptor_ready_cb;
+  if (decryptor_) {
+    set_decryptor_ready_cb = base::Bind(&ProxyDecryptor::SetDecryptorReadyCB,
+                                        base::Unretained(decryptor_.get()));
+  }
+
+  // Create our audio decoders and renderer.
+  ScopedVector<media::AudioDecoder> audio_decoders;
+  audio_decoders.push_back(new media::FFmpegAudioDecoder(
+      media_thread_.message_loop_proxy()));
+  if (cmd_line->HasSwitch(switches::kEnableOpusPlayback)) {
+    audio_decoders.push_back(new media::OpusAudioDecoder(
+        media_thread_.message_loop_proxy()));
+  }
+
+  scoped_ptr<media::AudioRenderer> audio_renderer(
+      new media::AudioRendererImpl(media_thread_.message_loop_proxy(),
+                                   audio_source_provider_,
+                                   audio_decoders.Pass(),
+                                   set_decryptor_ready_cb));
+  filter_collection->SetAudioRenderer(audio_renderer.Pass());
+
+  // Create our video decoders and renderer.
+  ScopedVector<media::VideoDecoder> video_decoders;
+
+  if (gpu_factories_) {
+    video_decoders.push_back(new media::GpuVideoDecoder(
+        media_thread_.message_loop_proxy(), gpu_factories_));
+  }
+
+  video_decoders.push_back(new media::FFmpegVideoDecoder(
+      media_thread_.message_loop_proxy()));
+
+  // TODO(phajdan.jr): Remove ifdefs when libvpx with vp9 support is released
+  // (http://crbug.com/174287) .
+#if !defined(MEDIA_DISABLE_LIBVPX)
+  if (cmd_line->HasSwitch(switches::kEnableVp9Playback)) {
+    video_decoders.push_back(new media::VpxVideoDecoder(
+        media_thread_.message_loop_proxy()));
+  }
+#endif  // !defined(MEDIA_DISABLE_LIBVPX)
+
+  scoped_ptr<media::VideoRenderer> video_renderer(
+      new media::VideoRendererBase(
+          media_thread_.message_loop_proxy(),
+          video_decoders.Pass(),
+          set_decryptor_ready_cb,
+          base::Bind(&WebMediaPlayerImpl::FrameReady, base::Unretained(this)),
+          BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::SetOpaque),
+          true));
+  filter_collection->SetVideoRenderer(video_renderer.Pass());
+
+  return filter_collection.Pass();
+}
+
 }  // namespace webkit_media
diff --git a/webkit/media/webmediaplayer_impl.h b/webkit/media/webmediaplayer_impl.h
index f733e6f..46f9985 100644
--- a/webkit/media/webmediaplayer_impl.h
+++ b/webkit/media/webmediaplayer_impl.h
@@ -272,6 +272,10 @@ class WebMediaPlayerImpl
   // painted.
   void FrameReady(const scoped_refptr<media::VideoFrame>& frame);
 
+  // Builds a FilterCollection based on the current configuration of
+  // WebMediaPlayerImpl.
+  scoped_ptr<media::FilterCollection> BuildFilterCollection();
+
   WebKit::WebFrame* frame_;
 
   // TODO(hclam): get rid of these members and read from the pipeline directly.
@@ -285,7 +289,6 @@ class WebMediaPlayerImpl
   // for DCHECKs so methods calls won't execute in the wrong thread.
   const scoped_refptr<base::MessageLoopProxy> main_loop_;
 
-  scoped_ptr<media::FilterCollection> filter_collection_;
   scoped_refptr<media::Pipeline> pipeline_;
   base::Thread media_thread_;
 
@@ -329,6 +332,9 @@ class WebMediaPlayerImpl
 
   bool incremented_externally_allocated_memory_;
 
+  // Factories for supporting GpuVideoDecoder. May be null.
+  scoped_refptr<media::GpuVideoDecoder::Factories> gpu_factories_;
+
   // Routes audio playback to either AudioRendererSink or WebAudio.
   scoped_refptr<WebAudioSourceProviderImpl> audio_source_provider_;
 
@@ -368,8 +374,6 @@ class WebMediaPlayerImpl
   // not NULL while the compositor is actively using this webmediaplayer.
   cc::VideoFrameProvider::Client* video_frame_provider_client_;
 
-  scoped_refptr<media::GpuVideoDecoder::Factories> gpu_factories_;
-
   DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl);
 };