Pass delay and timestamp to AudioSourceCallback::OnMoreData.

media/audio/audio_output_stream_sink.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/audio/audio_output_stream_sink.h"
 
+#include <algorithm>
 #include <cmath>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/location.h"
 #include "media/audio/audio_manager.h"
+#include "media/base/audio_timestamp_helper.h"
 
 namespace media {
 
 AudioOutputStreamSink::AudioOutputStreamSink()
     : initialized_(false),
       started_(false),
       render_callback_(NULL),
       active_render_callback_(NULL),
       audio_task_runner_(AudioManager::Get()->GetTaskRunner()),
       stream_(NULL) {}
@@ skipping 52 matching lines @@
 
 OutputDeviceInfo AudioOutputStreamSink::GetOutputDeviceInfo() {
   return OutputDeviceInfo();
 }
 
 bool AudioOutputStreamSink::CurrentThreadIsRenderingThread() {
   NOTIMPLEMENTED();
   return false;
 }
 
-int AudioOutputStreamSink::OnMoreData(AudioBus* dest,
-                                      uint32_t total_bytes_delay,
-                                      uint32_t frames_skipped) {
+int AudioOutputStreamSink::OnMoreData(base::TimeDelta delay,
+                                      base::TimeTicks /* delay_timestamp */,
+                                      int prior_frames_skipped,
+                                      AudioBus* dest) {
   // Note: Runs on the audio thread created by the OS.
   base::AutoLock al(callback_lock_);
   if (!active_render_callback_)
     return 0;
 
-  uint32_t frames_delayed = std::round(static_cast<double>(total_bytes_delay) /
-                                       active_params_.GetBytesPerFrame());
+  uint32_t frames_delayed =
+      AudioTimestampHelper::TimeToFrames(delay, active_params_.sample_rate());
 
-  return active_render_callback_->Render(dest, frames_delayed, frames_skipped);
+  return active_render_callback_->Render(dest, frames_delayed,
+                                         prior_frames_skipped);
 }
 
 void AudioOutputStreamSink::OnError(AudioOutputStream* stream) {
   // Note: Runs on the audio thread created by the OS.
   base::AutoLock al(callback_lock_);
   if (active_render_callback_)
     active_render_callback_->OnRenderError();
 }
 
 void AudioOutputStreamSink::DoStart(const AudioParameters& params) {
@@ skipping 40 matching lines @@
 void AudioOutputStreamSink::DoSetVolume(double volume) {
   DCHECK(audio_task_runner_->BelongsToCurrentThread());
   stream_->SetVolume(volume);
 }
 
 void AudioOutputStreamSink::ClearCallback() {
   base::AutoLock al(callback_lock_);
   active_render_callback_ = NULL;
 }
 
-}  // namepace media
+}  // namespace media