Interpolate media time for mojo rendering pipeline.

media/mojo/clients/mojo_renderer.cc

Index: media/mojo/clients/mojo_renderer.cc
diff --git a/media/mojo/clients/mojo_renderer.cc b/media/mojo/clients/mojo_renderer.cc
index aea977fa43c37dc9566ce06485204591de5596ff..04d236cbb98381a4cde8be2a603e8ccbebbe0727 100644
--- a/media/mojo/clients/mojo_renderer.cc
+++ b/media/mojo/clients/mojo_renderer.cc
@@ -28,7 +28,8 @@ MojoRenderer::MojoRenderer(
       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__;
 }
 
@@ -167,34 +168,46 @@ void MojoRenderer::Flush(const base::Closure& 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();
   }
 
   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());
 
@@ -203,8 +216,7 @@ void MojoRenderer::SetVolume(float volume) {
 
 base::TimeDelta MojoRenderer::GetMediaTime() {
   base::AutoLock auto_lock(lock_);
-  DVLOG(3) << __FUNCTION__ << ": " << time_.InMilliseconds() << " ms";
-  return time_;
+  return media_time_interpolator_.GetInterpolatedTime();
 }
 
 bool MojoRenderer::HasAudio() {
@@ -234,12 +246,14 @@ bool MojoRenderer::HasVideo() {
 }
 
 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) {