Index: media/base/audio_renderer_mixer_input.cc |
diff --git a/media/base/audio_renderer_mixer_input.cc b/media/base/audio_renderer_mixer_input.cc |
index d0d38d3b8eef902f69b9a342cdaffcbe0109235b..87537e832502795948ecf059230afa881942bf99 100644 |
--- a/media/base/audio_renderer_mixer_input.cc |
+++ b/media/base/audio_renderer_mixer_input.cc |
@@ -4,6 +4,8 @@ |
#include "media/base/audio_renderer_mixer_input.h" |
+#include <cmath> |
+ |
#include "base/bind.h" |
#include "base/callback_helpers.h" |
#include "media/base/audio_renderer_mixer.h" |
@@ -165,8 +167,12 @@ OutputDeviceStatus AudioRendererMixerInput::GetDeviceStatus() { |
double AudioRendererMixerInput::ProvideInput(AudioBus* audio_bus, |
base::TimeDelta buffer_delay) { |
- int frames_filled = callback_->Render( |
- audio_bus, static_cast<int>(buffer_delay.InMillisecondsF() + 0.5), 0); |
+ // TODO(chcunningham): Delete this conversion and change ProvideInput to more |
+ // precisely describe delay as a count of frames delayed instead of TimeDelta. |
+ uint32_t frames_delayed = std::round(buffer_delay.InMicroseconds() / |
Henrik Grunell
2016/02/12 17:47:01
Any reason to prefer std::round over + 0.5?
chcunningham
2016/02/17 01:56:52
:) Dale asked the same. C-programmer style is not
Henrik Grunell
2016/02/17 08:13:47
Fine with me. :) I assume std::round is efficient
|
+ params_.GetMicrosecondsPerFrame()); |
+ |
+ int frames_filled = callback_->Render(audio_bus, frames_delayed, 0); |
// AudioConverter expects unfilled frames to be zeroed. |
if (frames_filled < audio_bus->frames()) { |