Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(48)

Unified Diff: chromecast/media/audio/cast_audio_output_stream.cc

Issue 2101303004: Pass delay and timestamp to AudioSourceCallback::OnMoreData. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Fix Mac CQ errors. Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chromecast/media/audio/cast_audio_output_stream.cc
diff --git a/chromecast/media/audio/cast_audio_output_stream.cc b/chromecast/media/audio/cast_audio_output_stream.cc
index 215827fd9e1583e6317c19f8978dbedb06cf073f..21f3cc9a95f79063cda37cb6cec895a7a8fd822a 100644
--- a/chromecast/media/audio/cast_audio_output_stream.cc
+++ b/chromecast/media/audio/cast_audio_output_stream.cc
@@ -4,6 +4,9 @@
#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"
@@ -270,11 +273,9 @@ void CastAudioOutputStream::PushBuffer() {
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);
- VLOG(3) << "frames_filled=" << frame_count << " with latency=" << bytes_delay;
+ source_callback_->OnMoreData(queue_delay, now, 0, audio_bus_.get());
+ VLOG(3) << "frames_filled=" << frame_count << " with latency=" << queue_delay;
DCHECK_EQ(frame_count, audio_bus_->frames());
DCHECK_EQ(static_cast<int>(decoder_buffer_->data_size()),

Powered by Google App Engine
This is Rietveld 408576698