Index: media/audio/audio_output_controller.cc |
diff --git a/media/audio/audio_output_controller.cc b/media/audio/audio_output_controller.cc |
index 9b8f52387d8e7a4f638d73c7d1127ae2a2f394e2..3010ef289f6b89216532c4512c6b912d70386086 100644 |
--- a/media/audio/audio_output_controller.cc |
+++ b/media/audio/audio_output_controller.cc |
@@ -173,7 +173,7 @@ void AudioOutputController::DoPlay() { |
return; |
// Ask for first packet. |
- sync_reader_->UpdatePendingBytes(0, 0); |
+ sync_reader_->UpdatePendingBytes(0, 0, AudioTimestamp()); |
state_ = kPlaying; |
@@ -226,7 +226,8 @@ void AudioOutputController::DoPause() { |
// Let the renderer know we've stopped. Necessary to let PPAPI clients know |
// audio has been shutdown. TODO(dalecurtis): This stinks. PPAPI should have |
// a better way to know when it should exit PPB_Audio_Shared::Run(). |
- sync_reader_->UpdatePendingBytes(std::numeric_limits<uint32_t>::max(), 0); |
+ sync_reader_->UpdatePendingBytes(std::numeric_limits<uint32_t>::max(), 0, |
+ AudioTimestamp()); |
handler_->OnPaused(); |
} |
@@ -294,7 +295,8 @@ void AudioOutputController::DoReportError() { |
int AudioOutputController::OnMoreData(AudioBus* dest, |
uint32_t total_bytes_delay, |
- uint32_t frames_skipped) { |
+ uint32_t frames_skipped, |
+ const AudioTimestamp& output_timestamp) { |
TRACE_EVENT0("audio", "AudioOutputController::OnMoreData"); |
// Indicate that we haven't wedged (at least not indefinitely, WedgeCheck() |
@@ -308,7 +310,8 @@ int AudioOutputController::OnMoreData(AudioBus* dest, |
const int frames = dest->frames(); |
sync_reader_->UpdatePendingBytes( |
- total_bytes_delay + frames * params_.GetBytesPerFrame(), frames_skipped); |
+ total_bytes_delay + frames * params_.GetBytesPerFrame(), frames_skipped, |
+ output_timestamp); |
bool need_to_duplicate = false; |
{ |