Refactor VideoRendererImpl to use VideoFrameScheduler.

content/renderer/media/webmediaplayer_impl.cc

 // 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.
 
 #include "content/renderer/media/webmediaplayer_impl.h"
 
 #include <algorithm>
 #include <limits>
 #include <string>
 #include <vector>
@@ skipping 39 matching lines @@
 #include "media/base/text_renderer.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/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"
 #include "third_party/WebKit/public/platform/WebMediaSource.h"
 #include "third_party/WebKit/public/platform/WebRect.h"
 #include "third_party/WebKit/public/platform/WebSize.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
@@ skipping 154 matching lines @@
 
   gpu_factories_ = NULL;
 
   // Make sure to kill the pipeline so there's no more media threads running.
   // Note: stopping the pipeline might block for a long time.
   base::WaitableEvent waiter(false, false);
   pipeline_.Stop(
       base::Bind(&base::WaitableEvent::Signal, base::Unretained(&waiter)));
   waiter.Wait();
 
+  scheduler_runner_->DeleteSoon(FROM_HERE, scheduler_);
+
   // Let V8 know we are not using extra resources anymore.
   if (incremented_externally_allocated_memory_) {
     v8::Isolate::GetCurrent()->AdjustAmountOfExternalAllocatedMemory(
         -kPlayerExtraMemory);
     incremented_externally_allocated_memory_ = false;
   }
 }
 
 namespace {
 
@@ skipping 953 matching lines @@
     video_decoders.push_back(
         new media::GpuVideoDecoder(gpu_factories_, media_log_));
   }
 
 #if !defined(MEDIA_DISABLE_LIBVPX)
   video_decoders.push_back(new media::VpxVideoDecoder(media_loop_));
 #endif  // !defined(MEDIA_DISABLE_LIBVPX)
 
   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_runner_ =
+      RenderThreadImpl::current()->compositor_message_loop_proxy()
+          ? RenderThreadImpl::current()->compositor_message_loop_proxy()
+          : base::MessageLoopProxy::current();
+  scheduler_ = new media::VideoFrameSchedulerImpl(
+      scheduler_runner_,
+      base::Bind(&WebMediaPlayerImpl::FrameReady, base::Unretained(this)));
+
+  scoped_ptr<media::VideoRenderer> video_renderer(new media::VideoRendererImpl(
+      media_loop_,
+      scoped_ptr<media::VideoFrameScheduler>(
+          new media::VideoFrameSchedulerProxy(
+              media_loop_, scheduler_runner_, scheduler_)),
+      video_decoders.Pass(),
+      set_decryptor_ready_cb));
   filter_collection->SetVideoRenderer(video_renderer.Pass());
 
   if (cmd_line->HasSwitch(switches::kEnableInbandTextTracks)) {
     scoped_ptr<media::TextRenderer> text_renderer(
         new media::TextRenderer(
             media_loop_,
             BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnAddTextTrack)));
 
     filter_collection->SetTextRenderer(text_renderer.Pass());
   }
@@ skipping 115 matching lines @@
 
   if (web_cdm_) {
     decryptor_ready_cb.Run(web_cdm_->GetDecryptor());
     return;
   }
 
   decryptor_ready_cb_ = decryptor_ready_cb;
 }
 
 }  // namespace content