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

Unified Diff: media/audio/virtual_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 Windows 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: media/audio/virtual_audio_output_stream.cc
diff --git a/media/audio/virtual_audio_output_stream.cc b/media/audio/virtual_audio_output_stream.cc
index 990e5d5fc90dfd35749330b6f215ae87fb68fdab..bd937c11a7f9b74ebae76677f4a842d6d333d434 100644
--- a/media/audio/virtual_audio_output_stream.cc
+++ b/media/audio/virtual_audio_output_stream.cc
@@ -7,6 +7,7 @@
#include <stdint.h>
#include "base/logging.h"
+#include "base/time/time.h"
#include "media/audio/virtual_audio_input_stream.h"
namespace media {
@@ -79,10 +80,11 @@ double VirtualAudioOutputStream::ProvideInput(AudioBus* audio_bus,
// platform.
DCHECK(callback_);
- const uint32_t upstream_delay_in_bytes =
- params_.GetBytesPerFrame() * frames_delayed;
+ const base::TimeDelta delay = base::TimeDelta::FromMicroseconds(
+ frames_delayed * base::Time::kMicrosecondsPerSecond /
chcunningham 2016/09/23 20:53:30 int division
jameswest 2016/09/29 00:52:24 Moved to utility function.
+ params_.sample_rate());
const int frames =
- callback_->OnMoreData(audio_bus, upstream_delay_in_bytes, 0);
+ callback_->OnMoreData(delay, base::TimeTicks::Now(), 0, audio_bus);
if (frames < audio_bus->frames())
audio_bus->ZeroFramesPartial(frames, audio_bus->frames() - frames);

Powered by Google App Engine
This is Rietveld 408576698