Reland: Make more media APIs aware of |delay| and |delay_timestamp|

content/renderer/media/track_audio_renderer.cc

 // Copyright (c) 2012 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/track_audio_renderer.h"
 
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/synchronization/lock.h"
@@ skipping 21 matching lines @@
     base::TimeDelta prior_elapsed_render_time,
     int64_t num_samples_rendered,
     int sample_rate) {
   return prior_elapsed_render_time + base::TimeDelta::FromMicroseconds(
       num_samples_rendered * base::Time::kMicrosecondsPerSecond / sample_rate);
 }
 
 }  // namespace
 
 // media::AudioRendererSink::RenderCallback implementation
-int TrackAudioRenderer::Render(media::AudioBus* audio_bus,
-                               uint32_t frames_delayed,
-                               uint32_t frames_skipped) {
+int TrackAudioRenderer::Render(base::TimeDelta delay,
+                               base::TimeTicks delay_timestamp,
+                               int prior_frames_skipped,
+                               media::AudioBus* audio_bus) {
   TRACE_EVENT0("audio", "TrackAudioRenderer::Render");
   base::AutoLock auto_lock(thread_lock_);
 
   if (!audio_shifter_) {
     audio_bus->Zero();
     return 0;
   }
 
-  // Source sample rate equals to output one, see MaybeStartSink(), so using it.
-  uint32_t audio_delay_milliseconds = static_cast<double>(frames_delayed) *
-                                      base::Time::kMillisecondsPerSecond /
-                                      source_params_.sample_rate();
 
   // TODO(miu): Plumbing is needed to determine the actual playout timestamp
   // of the audio, instead of just snapshotting TimeTicks::Now(), for proper
   // audio/video sync.  http://crbug.com/335335
-  const base::TimeTicks playout_time =
-      base::TimeTicks::Now() +
-      base::TimeDelta::FromMilliseconds(audio_delay_milliseconds);
+  const base::TimeTicks playout_time = base::TimeTicks::Now() + delay;
   DVLOG(2) << "Pulling audio out of shifter to be played "
-           << audio_delay_milliseconds << " ms from now.";
+           << delay.InMilliseconds() << " ms from now.";
   audio_shifter_->Pull(audio_bus, playout_time);
   num_samples_rendered_ += audio_bus->frames();
   return audio_bus->frames();
 }
 
 void TrackAudioRenderer::OnRenderError() {
   NOTIMPLEMENTED();
 }
 
 // content::MediaStreamAudioSink implementation
@@ skipping 310 matching lines @@
   if (source_params_.IsValid()) {
     prior_elapsed_render_time_ =
         ComputeTotalElapsedRenderTime(prior_elapsed_render_time_,
                                       num_samples_rendered_,
                                       source_params_.sample_rate());
     num_samples_rendered_ = 0;
   }
 }
 
 }  // namespace content