Interpolate media time for mojo rendering pipeline.

media/mojo/clients/mojo_renderer.cc

 // Copyright 2014 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 "media/mojo/clients/mojo_renderer.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 10 matching lines @@
 
 MojoRenderer::MojoRenderer(
     const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
     std::unique_ptr<VideoOverlayFactory> video_overlay_factory,
     VideoRendererSink* video_renderer_sink,
     mojom::RendererPtr remote_renderer)
     : task_runner_(task_runner),
       video_overlay_factory_(std::move(video_overlay_factory)),
       video_renderer_sink_(video_renderer_sink),
       remote_renderer_info_(remote_renderer.PassInterface()),
-      binding_(this) {
+      binding_(this),
+      media_time_interpolator_(&media_clock_) {
   DVLOG(1) << __FUNCTION__;
 }
 
 MojoRenderer::~MojoRenderer() {
   DVLOG(1) << __FUNCTION__;
   DCHECK(task_runner_->BelongsToCurrentThread());
 
   CancelPendingCallbacks();
 }
 
@@ skipping 118 matching lines @@
   DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK(remote_renderer_.is_bound());
   DCHECK(!flush_cb.is_null());
   DCHECK(flush_cb_.is_null());
 
   if (encountered_error_) {
     task_runner_->PostTask(FROM_HERE, flush_cb);
     return;
   }
 
+  {
+    base::AutoLock auto_lock(lock_);
+    if (media_time_interpolator_.interpolating())
+      media_time_interpolator_.StopInterpolating();
+  }
+
   flush_cb_ = flush_cb;
   remote_renderer_->Flush(
       base::Bind(&MojoRenderer::OnFlushed, base::Unretained(this)));
 }
 
 void MojoRenderer::StartPlayingFrom(base::TimeDelta time) {
-  DVLOG(2) << __FUNCTION__;
+  DVLOG(2) << __FUNCTION__ << "(" << time << ")";
   DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK(remote_renderer_.is_bound());
 
   {
     base::AutoLock auto_lock(lock_);
-    time_ = time;
+    media_time_interpolator_.SetBounds(time, time, media_clock_.NowTicks());
+    media_time_interpolator_.StartInterpolating();
+    last_media_time_ = base::TimeDelta();
   }
 
   remote_renderer_->StartPlayingFrom(time);
 }
 
 void MojoRenderer::SetPlaybackRate(double playback_rate) {
-  DVLOG(2) << __FUNCTION__;
+  DVLOG(2) << __FUNCTION__ << "(" << playback_rate << ")";
   DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK(remote_renderer_.is_bound());
 
   remote_renderer_->SetPlaybackRate(playback_rate);
+
+  {
+    base::AutoLock auto_lock(lock_);
+    media_time_interpolator_.SetPlaybackRate(playback_rate);
+  }
 }
 
 void MojoRenderer::SetVolume(float volume) {
-  DVLOG(2) << __FUNCTION__;
+  DVLOG(2) << __FUNCTION__ << "(" << volume << ")";
   DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK(remote_renderer_.is_bound());
 
   remote_renderer_->SetVolume(volume);
 }
 
 base::TimeDelta MojoRenderer::GetMediaTime() {
   base::AutoLock auto_lock(lock_);
-  DVLOG(3) << __FUNCTION__ << ": " << time_.InMilliseconds() << " ms";
-  return time_;
+  base::TimeDelta media_time = media_time_interpolator_.GetInterpolatedTime();
+  if (media_time < last_media_time_) {
+    DVLOG(2) << __func__ << ": actual=" << media_time

[alokp, 2016/09/08 17:37:52]

We have the same logic in AudioRendererImpl. In fact I copied this code from
there. Should we move it to PipelineImpl so that they can be shared?

[DaleCurtis, 2016/09/08 17:45:29]

That seems reasonable to me.

[alokp, 2016/09/08 19:30:50]

Done. Please check PipelineImpl and AudioRendererImpl unittests.

+             << " clamped=" << last_media_time_;
+    return last_media_time_;
+  }
+  DVLOG(3) << __FUNCTION__ << ": " << media_time.InMilliseconds() << " ms";
+  last_media_time_ = media_time;
+  return last_media_time_;
 }
 
 bool MojoRenderer::HasAudio() {
   DVLOG(1) << __FUNCTION__;
   DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK(remote_renderer_.is_bound());
 
   if (demuxer_stream_provider_->GetType() == DemuxerStreamProvider::Type::URL) {
     NOTIMPLEMENTED();
     return false;
   }
 
   return !!demuxer_stream_provider_->GetStream(DemuxerStream::AUDIO);
 }
 
 bool MojoRenderer::HasVideo() {
   DVLOG(1) << __FUNCTION__;
   DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK(remote_renderer_.is_bound());
 
   if (demuxer_stream_provider_->GetType() == DemuxerStreamProvider::Type::URL) {
     NOTIMPLEMENTED();
     return false;
   }
 
   return !!demuxer_stream_provider_->GetStream(DemuxerStream::VIDEO);
 }
 
 void MojoRenderer::OnTimeUpdate(base::TimeDelta time,
-                                base::TimeDelta max_time) {
-  DVLOG(3) << __FUNCTION__ << ": " << time << ", " << max_time;
+                                base::TimeDelta max_time,
+                                base::TimeTicks capture_time) {
+  DVLOG(4) << __FUNCTION__ << "(" << time << ", " << max_time << ", "
+           << capture_time << ")";
   DCHECK(task_runner_->BelongsToCurrentThread());
 
   base::AutoLock auto_lock(lock_);
-  time_ = time;
+  media_time_interpolator_.SetBounds(time, max_time, capture_time);
 }
 
 void MojoRenderer::OnBufferingStateChange(mojom::BufferingState state) {
   DVLOG(2) << __FUNCTION__;
   DCHECK(task_runner_->BelongsToCurrentThread());
   client_->OnBufferingStateChange(static_cast<media::BufferingState>(state));
 }
 
 void MojoRenderer::OnEnded() {
   DVLOG(1) << __FUNCTION__;
@@ skipping 128 matching lines @@
     base::ResetAndReturn(&init_cb_).Run(PIPELINE_ERROR_INITIALIZATION_FAILED);
 
   if (!flush_cb_.is_null())
     base::ResetAndReturn(&flush_cb_).Run();
 
   if (!cdm_attached_cb_.is_null())
     base::ResetAndReturn(&cdm_attached_cb_).Run(false);
 }
 
 }  // namespace media