Index: media/audio/audio_output_controller.cc |
=================================================================== |
--- media/audio/audio_output_controller.cc (revision 155437) |
+++ media/audio/audio_output_controller.cc (working copy) |
@@ -283,10 +283,16 @@ |
handler_->OnError(this, code); |
} |
-int AudioOutputController::OnMoreData(AudioBus* audio_bus, |
+int AudioOutputController::OnMoreData(AudioBus* dest, |
AudioBuffersState buffers_state) { |
- TRACE_EVENT0("audio", "AudioOutputController::OnMoreData"); |
+ return OnMoreIOData(NULL, dest, buffers_state); |
+} |
+int AudioOutputController::OnMoreIOData(AudioBus* source, |
+ AudioBus* dest, |
+ AudioBuffersState buffers_state) { |
+ TRACE_EVENT0("audio", "AudioOutputController::OnMoreIOData"); |
+ |
{ |
// Check state and do nothing if we are not playing. |
// We are on the hardware audio thread, so lock is needed. |
@@ -295,7 +301,8 @@ |
return 0; |
} |
} |
- int frames = sync_reader_->Read(audio_bus); |
+ |
+ int frames = sync_reader_->Read(source, dest); |
sync_reader_->UpdatePendingBytes( |
buffers_state.total_bytes() + frames * params_.GetBytesPerFrame()); |
return frames; |