Index: media/audio/audio_output_device.cc |
diff --git a/media/audio/audio_output_device.cc b/media/audio/audio_output_device.cc |
index 0dcc76aca062b19bbdfb941088d053c1d1970ad3..30aa7c13979557fad66569a59a3f76b9b5afc746 100644 |
--- a/media/audio/audio_output_device.cc |
+++ b/media/audio/audio_output_device.cc |
@@ -46,7 +46,7 @@ class AudioOutputDevice::AudioThreadCallback |
bool CurrentThreadIsAudioDeviceThread(); |
private: |
- const int bytes_per_frame_; |
+ const int frame_rate_; |
AudioRendererSink::RenderCallback* render_callback_; |
std::unique_ptr<AudioBus> output_bus_; |
uint64_t callback_num_; |
@@ -431,7 +431,7 @@ AudioOutputDevice::AudioThreadCallback::AudioThreadCallback( |
int memory_length, |
AudioRendererSink::RenderCallback* render_callback) |
: AudioDeviceThread::Callback(audio_parameters, memory, memory_length, 1), |
- bytes_per_frame_(audio_parameters.GetBytesPerFrame()), |
+ frame_rate_(audio_parameters.sample_rate()), |
render_callback_(render_callback), |
callback_num_(0) {} |
@@ -452,9 +452,6 @@ void AudioOutputDevice::AudioThreadCallback::MapSharedMemory() { |
// Called whenever we receive notifications about pending data. |
void AudioOutputDevice::AudioThreadCallback::Process(uint32_t pending_data) { |
miu
2016/11/21 20:30:53
Did you mean to check |pending_data| here and retu
Mikhail
2016/11/22 12:10:40
That is done at 'AudioDeviceThread::ThreadMain()'
|
- // Convert the number of pending bytes in the render buffer into frames. |
- double frames_delayed = static_cast<double>(pending_data) / bytes_per_frame_; |
- |
callback_num_++; |
TRACE_EVENT1("audio", "AudioOutputDevice::FireRenderCallback", |
"callback_num", callback_num_); |
@@ -472,16 +469,24 @@ void AudioOutputDevice::AudioThreadCallback::Process(uint32_t pending_data) { |
uint32_t frames_skipped = buffer->params.frames_skipped; |
buffer->params.frames_skipped = 0; |
- DVLOG(4) << __func__ << " pending_data:" << pending_data |
- << " frames_delayed(pre-round):" << frames_delayed |
+ base::TimeDelta delay = |
+ base::TimeDelta::FromMicroseconds(buffer->params.delay); |
+ buffer->params.delay = 0; |
+ |
+ base::TimeTicks delay_timestamp = |
+ base::TimeTicks() + |
+ base::TimeDelta::FromMicroseconds(buffer->params.delay_timestamp); |
+ buffer->params.delay_timestamp = 0; |
+ |
+ DVLOG(4) << __func__ << " delay:" << delay << " delay_timestamp:" << delay |
<< " frames_skipped:" << frames_skipped; |
// Update the audio-delay measurement, inform about the number of skipped |
// frames, and ask client to render audio. Since |output_bus_| is wrapping |
// the shared memory the Render() call is writing directly into the shared |
// memory. |
- render_callback_->Render(output_bus_.get(), std::round(frames_delayed), |
- frames_skipped); |
+ render_callback_->Render(delay, delay_timestamp, frames_skipped, |
+ output_bus_.get()); |
} |
bool AudioOutputDevice::AudioThreadCallback:: |