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

Unified Diff: media/audio/audio_output_resampler.cc

Issue 190553004: Revert "Attempt to fix audio wedges by restarting all streams on OSX." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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_resampler.h ('k') | media/audio/mock_audio_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/audio_output_resampler.cc
diff --git a/media/audio/audio_output_resampler.cc b/media/audio/audio_output_resampler.cc
index 376b113f7fef8d9d560fe0e50841226cb668f736..4863351614f43c995d7045b8d026e6721fbfb568 100644
--- a/media/audio/audio_output_resampler.cc
+++ b/media/audio/audio_output_resampler.cc
@@ -298,37 +298,6 @@ void AudioOutputResampler::Shutdown() {
DCHECK(callbacks_.empty());
}
-void AudioOutputResampler::CloseStreamsForWedgeFix() {
- DCHECK(task_runner_->BelongsToCurrentThread());
-
- // Stop and close all active streams. Once all streams across all dispatchers
- // have been closed the AudioManager will call RestartStreamsForWedgeFix().
- for (CallbackMap::iterator it = callbacks_.begin(); it != callbacks_.end();
- ++it) {
- if (it->second->started())
- dispatcher_->StopStream(it->first);
- dispatcher_->CloseStream(it->first);
- }
-
- // Close all idle streams as well.
- dispatcher_->CloseStreamsForWedgeFix();
-}
-
-void AudioOutputResampler::RestartStreamsForWedgeFix() {
- DCHECK(task_runner_->BelongsToCurrentThread());
- // By opening all streams first and then starting them one by one we ensure
- // the dispatcher only opens streams for those which will actually be used.
- for (CallbackMap::iterator it = callbacks_.begin(); it != callbacks_.end();
- ++it) {
- dispatcher_->OpenStream();
- }
- for (CallbackMap::iterator it = callbacks_.begin(); it != callbacks_.end();
- ++it) {
- if (it->second->started())
- dispatcher_->StartStream(it->second, it->first);
- }
-}
-
OnMoreDataConverter::OnMoreDataConverter(const AudioParameters& input_params,
const AudioParameters& output_params)
: io_ratio_(static_cast<double>(input_params.GetBytesPerSecond()) /
« no previous file with comments | « media/audio/audio_output_resampler.h ('k') | media/audio/mock_audio_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698