Chromium Code Reviews| 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 1740b405d17c36069271113b534453b05f8f51f1..fd057e338256ab510f9e0e31c226d3be8fe4f3da 100644 |
| --- a/media/audio/virtual_audio_output_stream.cc |
| +++ b/media/audio/virtual_audio_output_stream.cc |
| @@ -74,17 +74,15 @@ void VirtualAudioOutputStream::GetVolume(double* volume) { |
| } |
| double VirtualAudioOutputStream::ProvideInput(AudioBus* audio_bus, |
| - base::TimeDelta buffer_delay) { |
| + uint32_t frames_delayed) { |
| // Note: This method may be invoked on any one thread, depending on the |
| // platform. |
| DCHECK(callback_); |
| - DCHECK_GE(buffer_delay, base::TimeDelta()); |
| - const int64_t upstream_delay_in_bytes = params_.GetBytesPerSecond() * |
| - buffer_delay / |
| - base::TimeDelta::FromSeconds(1); |
| - const int frames = callback_->OnMoreData( |
| - audio_bus, static_cast<uint32_t>(upstream_delay_in_bytes), 0); |
| + const uint32_t upstream_delay_in_bytes = |
| + std::round(params_.GetBytesPerFrame() * frames_delayed); |
|
miu
2016/05/25 21:41:06
Doesn't seem that std::round() is required since t
chcunningham
2016/05/25 22:10:43
Done.
|
| + const int frames = |
| + callback_->OnMoreData(audio_bus, upstream_delay_in_bytes, 0); |
|
miu
2016/05/25 21:41:06
I can't wait for OnMoreData() to take |frames_dela
chcunningham
2016/05/25 22:10:43
Woot, me neither.
|
| if (frames < audio_bus->frames()) |
| audio_bus->ZeroFramesPartial(frames, audio_bus->frames() - frames); |