Move passing of WebRTC rendering frames from main thread to compositor thread

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 <memory>
 #include <string>
 
@@ skipping 29 matching lines @@
 namespace gpu {
 namespace gles2 {
 class GLES2Interface;
 }
 }
 
 namespace content {
 class MediaStreamAudioRenderer;
 class MediaStreamRendererFactory;
 class MediaStreamVideoRenderer;
+class RenderFrameObserver;

[perkj_chrome, 2016/11/14 15:19:55]

This class does not seem to be used in this header file..

[emircan, 2016/11/14 22:43:32]

Leftover from rebase. Removed.

 class WebMediaPlayerMSCompositor;
 
 // WebMediaPlayerMS delegates calls from WebCore::MediaPlayerPrivate to
 // Chrome's media player when "src" is from media stream.
 //
 // All calls to WebMediaPlayerMS methods must be from the main thread of
 // Renderer process.
 //
 // WebMediaPlayerMS works with multiple objects, the most important ones are:
 //
@@ skipping 93 matching lines @@
   bool copyVideoTextureToPlatformTexture(gpu::gles2::GLES2Interface* gl,
                                          unsigned int texture,
                                          unsigned int internal_format,
                                          unsigned int type,
                                          bool premultiply_alpha,
                                          bool flip_y) override;
 
  private:
   friend class WebMediaPlayerMSTest;
 
-  // The callback for MediaStreamVideoRenderer to signal a new frame is
-  // available.
-  void OnFrameAvailable(const scoped_refptr<media::VideoFrame>& frame);
+  // Inner class used for transfering frames on compositor thread to
+  // |compositor_|.
+  class FrameDelivererOnCompositor;
+
+  void OnFirstFrameReceived(media::VideoRotation video_rotation,
+                            bool is_opaque);
+  void OnOpacityChanged(bool is_opaque);
+
   // Need repaint due to state change.
   void RepaintInternal();
 
   // The callback for source to report error.
   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);
@@ skipping 10 matching lines @@
 
   blink::WebMediaPlayerClient* const client_;
 
   // WebMediaPlayer notifies the |delegate_| of playback state changes using
   // |delegate_id_|; an id provided after registering with the delegate.  The
   // WebMediaPlayer may also receive directives (play, pause) from the delegate
   // via the WebMediaPlayerDelegate::Observer interface after registration.
   const base::WeakPtr<media::WebMediaPlayerDelegate> delegate_;
   int delegate_id_;
 
+  std::unique_ptr<FrameDelivererOnCompositor> frame_deliverer_;
+
   scoped_refptr<MediaStreamVideoRenderer> video_frame_provider_; // Weak
 
   std::unique_ptr<cc_blink::WebLayerImpl> video_weblayer_;
 
   scoped_refptr<MediaStreamAudioRenderer> audio_renderer_; // Weak
   media::SkCanvasVideoRenderer video_renderer_;
 
-  bool last_frame_opaque_;
   bool paused_;
-  bool render_frame_suspended_;
-  bool received_first_frame_;
   media::VideoRotation video_rotation_;
 
   scoped_refptr<media::MediaLog> media_log_;
 
   std::unique_ptr<MediaStreamRendererFactory> renderer_factory_;
 
   const scoped_refptr<base::SingleThreadTaskRunner> media_task_runner_;
   const scoped_refptr<base::TaskRunner> worker_task_runner_;
   media::GpuVideoAcceleratorFactories* gpu_factories_;
 
@@ skipping 19 matching lines @@
   // True if playback should be started upon the next call to OnShown(). Only
   // used on Android.
   bool should_play_upon_shown_;
 
   DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerMS);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_