Pass delay and timestamp to AudioSourceCallback::OnMoreData.

chromecast/media/audio/cast_audio_output_stream.cc

 // Copyright 2015 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_output_stream.h"
 
+#include <algorithm>
+#include <string>
+
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "chromecast/base/metrics/cast_metrics_helper.h"
 #include "chromecast/base/task_runner_impl.h"
 #include "chromecast/media/audio/cast_audio_manager.h"
 #include "chromecast/media/cma/base/decoder_buffer_adapter.h"
 #include "chromecast/public/media/decoder_config.h"
 #include "chromecast/public/media/media_pipeline_backend.h"
 #include "chromecast/public/media/media_pipeline_device_params.h"
 #include "media/base/decoder_buffer.h"
@@ skipping 243 matching lines @@
 
 void CastAudioOutputStream::PushBuffer() {
   DCHECK(audio_manager_->GetTaskRunner()->BelongsToCurrentThread());
   DCHECK(push_in_progress_);
 
   if (!source_callback_) {
     push_in_progress_ = false;
     return;
   }
 
-  const base::TimeTicks now = base::TimeTicks::Now();
-  base::TimeDelta queue_delay =
-      std::max(base::TimeDelta(), next_push_time_ - now);
-  uint32_t bytes_delay = queue_delay.InMicroseconds() *
-                         audio_params_.GetBytesPerSecond() / 1000000;
   int frame_count =
-      source_callback_->OnMoreData(audio_bus_.get(), bytes_delay, 0);
+      source_callback_->OnMoreData(next_push_time_, 0, audio_bus_.get());
   VLOG(3) << "frames_filled=" << frame_count << " with latency=" << bytes_delay;
 
   DCHECK_EQ(frame_count, audio_bus_->frames());
   DCHECK_EQ(static_cast<int>(decoder_buffer_->data_size()),
             frame_count * audio_params_.GetBytesPerFrame());
   audio_bus_->ToInterleaved(frame_count, audio_params_.bits_per_sample() / 8,
                             decoder_buffer_->writable_data());
   decoder_buffer_->set_timestamp(timestamp_helper_.GetTimestamp());
   timestamp_helper_.AddFrames(frame_count);
 
@@ skipping 26 matching lines @@
 
   audio_manager_->GetTaskRunner()->PostDelayedTask(
       FROM_HERE, base::Bind(&CastAudioOutputStream::PushBuffer,
                             weak_factory_.GetWeakPtr()),
       delay);
   push_in_progress_ = true;
 }
 
 }  // namespace media
 }  // namespace chromecast