Index: media/audio/audio_output_controller.cc |
diff --git a/media/audio/audio_output_controller.cc b/media/audio/audio_output_controller.cc |
index d780687d1b8415aee8f6223be8497905a80b8800..f09249619b4afb140685435a705f094fb166ae39 100644 |
--- a/media/audio/audio_output_controller.cc |
+++ b/media/audio/audio_output_controller.cc |
@@ -164,7 +164,7 @@ |
return; |
// Ask for first packet. |
- sync_reader_->UpdatePendingBytes(0, 0); |
+ sync_reader_->UpdatePendingBytes(0); |
state_ = kPlaying; |
@@ -217,7 +217,7 @@ |
// 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()); |
handler_->OnPaused(); |
} |
@@ -284,8 +284,7 @@ |
} |
int AudioOutputController::OnMoreData(AudioBus* dest, |
- uint32_t total_bytes_delay, |
- uint32_t frames_skipped) { |
+ uint32_t total_bytes_delay) { |
TRACE_EVENT0("audio", "AudioOutputController::OnMoreData"); |
// Indicate that we haven't wedged (at least not indefinitely, WedgeCheck() |
@@ -298,8 +297,8 @@ |
sync_reader_->Read(dest); |
const int frames = dest->frames(); |
- sync_reader_->UpdatePendingBytes( |
- total_bytes_delay + frames * params_.GetBytesPerFrame(), frames_skipped); |
+ sync_reader_->UpdatePendingBytes(base::saturated_cast<uint32_t>( |
+ total_bytes_delay + frames * params_.GetBytesPerFrame())); |
if (will_monitor_audio_levels()) |
power_monitor_.Scan(*dest, frames); |