Preliminary change for new rtc rendering algorithm

content/renderer/media/webmediaplayer_ms.h

 // Copyright 2013 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 CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_
 #define CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
@@ skipping 40 matching lines @@
 //
 // blink::WebMediaPlayerClient
 //   WebKit client of this media player object.
 class WebMediaPlayerMS
     : public blink::WebMediaPlayer,
       public cc::VideoFrameProvider,
       public base::SupportsWeakPtr<WebMediaPlayerMS> {
  public:
   // Construct a WebMediaPlayerMS with reference to the client, and
   // a MediaStreamClient which provides VideoFrameProvider.
-  WebMediaPlayerMS(blink::WebFrame* frame,
-                   blink::WebMediaPlayerClient* client,
-                   base::WeakPtr<media::WebMediaPlayerDelegate> delegate,
-                   media::MediaLog* media_log,
-                   scoped_ptr<MediaStreamRendererFactory> factory);
+  WebMediaPlayerMS(
+      blink::WebFrame* frame,
+      blink::WebMediaPlayerClient* client,
+      base::WeakPtr<media::WebMediaPlayerDelegate> delegate,
+      media::MediaLog* media_log,
+      scoped_ptr<MediaStreamRendererFactory> factory,
+      scoped_refptr<base::SingleThreadTaskRunner> compositor_thread);
+
   virtual ~WebMediaPlayerMS();
 
   virtual void load(LoadType load_type,
                     const blink::WebURL& url,
                     CORSMode cors_mode);
 
   // Playback controls.
   virtual void play();
   virtual void pause();
   virtual bool supportsSave() const;
@@ skipping 68 matching lines @@
   void OnSourceError();
 
   // Helpers that set the network/ready state and notifies the client if
   // they've changed.
   void SetNetworkState(blink::WebMediaPlayer::NetworkState state);
   void SetReadyState(blink::WebMediaPlayer::ReadyState state);
 
   // Getter method to |client_|.
   blink::WebMediaPlayerClient* GetClient();
 
+  static void StopVideoFrameProviderAndWakeUpHelper(
+      cc::VideoFrameProvider::Client* client,
+      base::WaitableEvent* event);
+  static void StopVideoFrameProviderHelper(
+      cc::VideoFrameProvider::Client* client);
+  static void StartRenderingHelper(cc::VideoFrameProvider::Client* client);
+  static void StopRenderingHelper(cc::VideoFrameProvider::Client* client);
+
   blink::WebFrame* frame_;
 
   blink::WebMediaPlayer::NetworkState network_state_;
   blink::WebMediaPlayer::ReadyState ready_state_;
 
   blink::WebTimeRanges buffered_;
 
   float volume_;
 
   // Used for DCHECKs to ensure methods calls executed in the correct thread.
@@ skipping 21 matching lines @@
   base::Lock current_frame_lock_;
 
   scoped_ptr<cc_blink::WebLayerImpl> video_weblayer_;
 
   // A pointer back to the compositor to inform it about state changes. This is
   // not NULL while the compositor is actively using this webmediaplayer.
   cc::VideoFrameProvider::Client* video_frame_provider_client_;
 
   bool received_first_frame_;
   base::TimeDelta current_time_;
+  base::TimeTicks last_deadline_max_;
   unsigned total_frame_count_;
   unsigned dropped_frame_count_;
   media::SkCanvasVideoRenderer video_renderer_;
 
   scoped_refptr<MediaStreamAudioRenderer> audio_renderer_;
 
   scoped_refptr<media::MediaLog> media_log_;
 
   scoped_ptr<MediaStreamRendererFactory> renderer_factory_;
 
+  scoped_refptr<base::SingleThreadTaskRunner> compositor_thread_;
+  base::WaitableEvent wait_event_;
+
   DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerMS);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_