Vanquish the remnants of media::MessageLoopFactory.

webkit/media/webmediaplayer_impl.h

 // 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.
 
 // Delegate calls from WebCore::MediaPlayerPrivate to Chrome's video player.
 // It contains Pipeline which is the actual media player pipeline, it glues
 // the media player pipeline, data source, audio renderer and renderer.
 // Pipeline would creates multiple threads and access some public methods
 // of this class, so we need to be extra careful about concurrent access of
 // methods and members.
@@ skipping 36 matching lines @@
 
 #ifndef WEBKIT_MEDIA_WEBMEDIAPLAYER_IMPL_H_
 #define WEBKIT_MEDIA_WEBMEDIAPLAYER_IMPL_H_
 
 #include <string>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop.h"
+#include "base/threading/thread.h"
 #include "googleurl/src/gurl.h"
 #include "media/base/audio_renderer_sink.h"
 #include "media/base/decryptor.h"
-#include "media/base/message_loop_factory.h"
 #include "media/base/pipeline.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAudioSourceProvider.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayer.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerClient.h"
 #include "webkit/media/crypto/key_systems.h"
 #include "webkit/media/crypto/proxy_decryptor.h"
 
 class RenderAudioSourceProvider;
 
 namespace WebKit {
-class WebAudioSourceProvider;
 class WebFrame;
 }
 
 namespace media {
-class AudioRendererSink;
 class ChunkDemuxer;
 class MediaLog;
 }
 
 namespace webkit_media {
 
 class MediaStreamClient;
 class WebMediaPlayerDelegate;
+class WebMediaPlayerParams;
 class WebMediaPlayerProxy;
 
 class WebMediaPlayerImpl
     : public WebKit::WebMediaPlayer,
       public MessageLoop::DestructionObserver,
       public base::SupportsWeakPtr<WebMediaPlayerImpl> {
  public:
-  // Construct a WebMediaPlayerImpl with reference to the client, and media
-  // filter collection. By providing the filter collection the implementor can
-  // provide more specific media filters that does resource loading and
-  // rendering.
+  // Constructs a WebMediaPlayer implementation using Chromium's media stack.
   //
-  // WebMediaPlayerImpl comes packaged with the following media filters:
-  //   - URL fetching
-  //   - Demuxing
-  //   - Software audio/video decoding
-  //   - Video rendering
-  //
-  // Clients are expected to add their platform-specific audio rendering media
-  // filter if they wish to hear any sound coming out the speakers, otherwise
-  // audio data is discarded and media plays back based on wall clock time.
-  //
-  // When calling this, the |audio_source_provider| and
-  // |audio_renderer_sink| arguments should be the same object.
-  //
-  // TODO(scherkus): Remove WebAudioSourceProvider parameter once we
-  // refactor RenderAudioSourceProvider to live under webkit/media/
-  // instead of content/renderer/, see http://crbug.com/136442
-
-  WebMediaPlayerImpl(WebKit::WebFrame* frame,
-                     WebKit::WebMediaPlayerClient* client,
-                     base::WeakPtr<WebMediaPlayerDelegate> delegate,
-                     media::FilterCollection* collection,
-                     WebKit::WebAudioSourceProvider* audio_source_provider,
-                     media::AudioRendererSink* audio_renderer_sink,
-                     media::MessageLoopFactory* message_loop_factory,
-                     MediaStreamClient* media_stream_client,
-                     media::MediaLog* media_log);
+  // |delegate| may be null.
+  WebMediaPlayerImpl(
+      WebKit::WebFrame* frame,
+      WebKit::WebMediaPlayerClient* client,
+      base::WeakPtr<WebMediaPlayerDelegate> delegate,
+      const WebMediaPlayerParams& params);
   virtual ~WebMediaPlayerImpl();
 
   virtual void load(const WebKit::WebURL& url, CORSMode cors_mode);
   virtual void cancelLoad();
 
   // Playback controls.
   virtual void play();
   virtual void pause();
   virtual bool supportsFullscreen() const;
   virtual bool supportsSave() const;
@@ skipping 164 matching lines @@
 
   // Keep a list of buffered time ranges.
   WebKit::WebTimeRanges buffered_;
 
   // Message loops for posting tasks between Chrome's main thread. Also used
   // for DCHECKs so methods calls won't execute in the wrong thread.
   MessageLoop* main_loop_;
 
   scoped_ptr<media::FilterCollection> filter_collection_;
   scoped_refptr<media::Pipeline> pipeline_;
+  base::Thread media_thread_;
 
   // The currently selected key system. Empty string means that no key system
   // has been selected.
   WebKit::WebString current_key_system_;
 
-  scoped_ptr<media::MessageLoopFactory> message_loop_factory_;
-
   // Playback state.
   //
   // TODO(scherkus): we have these because Pipeline favours the simplicity of a
   // single "playback rate" over worrying about paused/stopped etc...  It forces
   // all clients to manage the pause+playback rate externally, but is that
   // really a bad thing?
   //
   // TODO(scherkus): since SetPlaybackRate(0) is asynchronous and we don't want
   // to hang the render thread during pause(), we record the time at the same
   // time we pause and then return that value in currentTime().  Otherwise our
@@ skipping 20 matching lines @@
   scoped_refptr<media::MediaLog> media_log_;
 
   // Since accelerated compositing status is only known after the first layout,
   // we delay reporting it to UMA until that time.
   bool accelerated_compositing_reported_;
 
   bool incremented_externally_allocated_memory_;
 
   WebKit::WebAudioSourceProvider* audio_source_provider_;
 
-  scoped_refptr<media::AudioRendererSink> audio_renderer_sink_;
-
   bool is_local_source_;
   bool supports_save_;
 
   // The decryptor that manages decryption keys and decrypts encrypted frames.
   scoped_ptr<ProxyDecryptor> decryptor_;
 
   bool starting_;
 
   scoped_refptr<media::ChunkDemuxer> chunk_demuxer_;
 
   // Temporary for EME v0.1. In the future the init data type should be passed
   // through GenerateKeyRequest() directly from WebKit.
   std::string init_data_type_;
 
   DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl);
 };
 
 }  // namespace webkit_media
 
 #endif  // WEBKIT_MEDIA_WEBMEDIAPLAYER_IMPL_H_