Refactor VideoRendererImpl to use VideoFrameScheduler.

content/renderer/media/webmediaplayer_impl.cc

Index: content/renderer/media/webmediaplayer_impl.cc
diff --git a/content/renderer/media/webmediaplayer_impl.cc b/content/renderer/media/webmediaplayer_impl.cc
index ea68fc7348126590c586d2cc31718fbf749f7223..f05c612f27d62c8856c33115cce325862842a253 100644
--- a/content/renderer/media/webmediaplayer_impl.cc
+++ b/content/renderer/media/webmediaplayer_impl.cc
@@ -57,6 +57,8 @@
 #include "media/filters/gpu_video_accelerator_factories.h"
 #include "media/filters/gpu_video_decoder.h"
 #include "media/filters/opus_audio_decoder.h"
+#include "media/filters/video_frame_scheduler_impl.h"
+#include "media/filters/video_frame_scheduler_proxy.h"
 #include "media/filters/video_renderer_impl.h"
 #include "media/filters/vpx_video_decoder.h"
 #include "third_party/WebKit/public/platform/WebContentDecryptionModule.h"
@@ -171,12 +173,16 @@ WebMediaPlayerImpl::WebMediaPlayerImpl(
       supports_save_(true),
       starting_(false),
       chunk_demuxer_(NULL),
-      compositor_(  // Threaded compositing isn't enabled universally yet.
-          (RenderThreadImpl::current()->compositor_message_loop_proxy()
-               ? RenderThreadImpl::current()->compositor_message_loop_proxy()
-               : base::MessageLoopProxy::current()),
+      // Threaded compositing isn't enabled universally yet.
+      compositor_runner_(
+          RenderThreadImpl::current()->compositor_message_loop_proxy()
+              ? RenderThreadImpl::current()->compositor_message_loop_proxy()
+              : base::MessageLoopProxy::current()),
+      compositor_(
+          compositor_runner_,
           BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnNaturalSizeChanged),
           BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnOpacityChanged)),
+      scheduler_(NULL),
       text_track_index_(0),
       web_cdm_(NULL) {
   media_log_->AddEvent(
@@ -232,6 +238,9 @@ WebMediaPlayerImpl::~WebMediaPlayerImpl() {
       base::Bind(&base::WaitableEvent::Signal, base::Unretained(&waiter)));
   waiter.Wait();
 
+  if (scheduler_)
+    compositor_runner_->DeleteSoon(FROM_HERE, scheduler_);
+
   // Let V8 know we are not using extra resources anymore.
   if (incremented_externally_allocated_memory_) {
     v8::Isolate::GetCurrent()->AdjustAmountOfExternalAllocatedMemory(
@@ -1205,13 +1214,16 @@ void WebMediaPlayerImpl::StartPipeline() {
 
   video_decoders.push_back(new media::FFmpegVideoDecoder(media_loop_));
 
-  scoped_ptr<media::VideoRenderer> video_renderer(
-      new media::VideoRendererImpl(
-          media_loop_,
-          video_decoders.Pass(),
-          set_decryptor_ready_cb,
-          base::Bind(&WebMediaPlayerImpl::FrameReady, base::Unretained(this)),
-          true));
+  scheduler_ = new media::VideoFrameSchedulerImpl(
+      compositor_runner_, BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::FrameReady));
+
+  scoped_ptr<media::VideoRenderer> video_renderer(new media::VideoRendererImpl(
+      media_loop_,
+      scoped_ptr<media::VideoFrameScheduler>(
+          new media::VideoFrameSchedulerProxy(
+              media_loop_, compositor_runner_, scheduler_)),

[acolwell GONE FROM CHROMIUM, 2014/04/24 16:43:59]

Any reason we can't simply have the proxy own the scheduler_ instead of this
class?

[scherkus (not reviewing), 2014/04/25 02:04:47]

nope! done

+      video_decoders.Pass(),
+      set_decryptor_ready_cb));
   filter_collection->SetVideoRenderer(video_renderer.Pass());
 
   if (cmd_line->HasSwitch(switches::kEnableInbandTextTracks)) {