Pass delay and timestamp to AudioSourceCallback::OnMoreData.

chromecast/media/audio/cast_audio_mixer.cc

 // Copyright 2016 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 "chromecast/media/audio/cast_audio_mixer.h"
 
+#include "base/logging.h"
 #include "chromecast/media/audio/cast_audio_manager.h"
 #include "chromecast/media/audio/cast_audio_output_stream.h"
+#include "media/base/audio_timestamp_helper.h"
 #include "media/base/channel_layout.h"
 
 namespace {
 const int kBitsPerSample = 16;
 const int kFramesPerBuffer = 1024;
 const int kSampleRate = 48000;
 }  // namespace
 
 namespace chromecast {
 namespace media {
@@ skipping 114 matching lines @@
     DCHECK(audio_manager_->GetTaskRunner()->BelongsToCurrentThread());
 
     *volume = volume_;
   }
 
   // ::media::AudioConverter::InputCallback implementation
   double ProvideInput(::media::AudioBus* audio_bus,
                       uint32_t frames_delayed) override {
     DCHECK(source_callback_);
 
-    uint32_t bytes_delay = frames_delayed * input_params_.GetBytesPerFrame();
-    source_callback_->OnMoreData(audio_bus, bytes_delay, 0);
+    const base::TimeDelta delay = ::media::AudioTimestampHelper::FramesToTime(
+        frames_delayed, input_params_.sample_rate());
+    source_callback_->OnMoreData(delay, base::TimeTicks::Now(), 0, audio_bus);
     return volume_;
   }
 
   CastAudioManager* const audio_manager_;
   CastAudioMixer* const audio_mixer_;
 
   std::unique_ptr<ResamplerProxy> proxy_;
   AudioSourceCallback* source_callback_;
   const ::media::AudioParameters input_params_;
   const ::media::AudioParameters output_params_;
@@ skipping 83 matching lines @@
 void CastAudioMixer::RemoveInput(
     ::media::AudioConverter::InputCallback* input_callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   mixer_->RemoveInput(input_callback);
   // Stop |output_stream_| if there are no inputs and the stream is running.
   if (mixer_->empty() && output_stream_)
     output_stream_->Stop();
 }
 
-int CastAudioMixer::OnMoreData(::media::AudioBus* dest,
-                               uint32_t total_bytes_delay,
-                               uint32_t frames_skipped) {
+int CastAudioMixer::OnMoreData(base::TimeDelta delay,
+                               base::TimeTicks /* delay_timestamp */,
+                               int /* prior_frames_skipped */,
+                               ::media::AudioBus* dest) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
-  uint32_t frames_delayed =
-      total_bytes_delay / output_params_.GetBytesPerFrame();
+  uint32_t frames_delayed = ::media::AudioTimestampHelper::TimeToFrames(
+      delay, output_params_.sample_rate());
   mixer_->ConvertWithDelay(frames_delayed, dest);
   return dest->frames();
 }
 
 void CastAudioMixer::OnError(::media::AudioOutputStream* stream) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(output_stream_ == stream);
 
   // TODO(ameyak): Add rate limiting. If errors are seen to occur
   //               above some arbitrary value in a specified amount
@@ skipping 10 matching lines @@
     // Assume error state
     output_stream_->Close();
     output_stream_ = nullptr;
     error_ = true;
     for (auto it = proxy_streams_.begin(); it != proxy_streams_.end(); it++)
       (*it)->OnError();
   }
 }
 
 }  // namespace media
-}  // namespace chromecast
+}  // namespace chromecast