Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(884)

Unified Diff: media/audio/audio_output_controller.cc

Issue 290003002: Remove OnMoreIOData() (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: fixed the media unittests on mac. Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/audio/audio_output_controller.h ('k') | media/audio/audio_output_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/audio_output_controller.cc
diff --git a/media/audio/audio_output_controller.cc b/media/audio/audio_output_controller.cc
index 4dafadca4eee39d711cb07aec4ebe0fe20a2413b..146cc3d33459420b069f35b91374114f6eaa2535 100644
--- a/media/audio/audio_output_controller.cc
+++ b/media/audio/audio_output_controller.cc
@@ -295,13 +295,7 @@ void AudioOutputController::DoReportError() {
int AudioOutputController::OnMoreData(AudioBus* dest,
AudioBuffersState buffers_state) {
- return OnMoreIOData(NULL, dest, buffers_state);
-}
-
-int AudioOutputController::OnMoreIOData(AudioBus* source,
- AudioBus* dest,
- AudioBuffersState buffers_state) {
- TRACE_EVENT0("audio", "AudioOutputController::OnMoreIOData");
+ TRACE_EVENT0("audio", "AudioOutputController::OnMoreData");
// Indicate that we haven't wedged (at least not indefinitely, WedgeCheck()
// may have already fired if OnMoreIOData() took an abnormal amount of time).
@@ -310,7 +304,7 @@ int AudioOutputController::OnMoreIOData(AudioBus* source,
if (base::AtomicRefCountIsZero(&on_more_io_data_called_))
base::AtomicRefCountInc(&on_more_io_data_called_);
- sync_reader_->Read(source, dest);
+ sync_reader_->Read(dest);
const int frames = dest->frames();
sync_reader_->UpdatePendingBytes(
« no previous file with comments | « media/audio/audio_output_controller.h ('k') | media/audio/audio_output_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698