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

Unified Diff: media/audio/audio_manager_base.cc

Issue 12261027: Don't switch to fake audio output until stream open fails. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix unittests. Created 7 years, 10 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 | « no previous file | media/audio/audio_output_proxy_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/audio_manager_base.cc
diff --git a/media/audio/audio_manager_base.cc b/media/audio/audio_manager_base.cc
index b4538775108012e6121f72bf0c474a066970535b..95935a66a4f2ef4326558f186b5ab28da0dfdb48 100644
--- a/media/audio/audio_manager_base.cc
+++ b/media/audio/audio_manager_base.cc
@@ -104,12 +104,6 @@ AudioOutputStream* AudioManagerBase::MakeAudioOutputStream(
return NULL;
}
- // If there are no audio output devices we should use a FakeAudioOutputStream
- // to ensure video playback continues to work.
- bool audio_output_disabled =
- params.format() == AudioParameters::AUDIO_FAKE ||
- !HasAudioOutputDevices();
scherkus (not reviewing) 2013/02/15 18:43:37 FYI this appeared to be the only production code u
DaleCurtis 2013/02/15 18:51:39 Yeah, that's why I was looking at this originally.
-
AudioOutputStream* stream = NULL;
if (virtual_audio_input_stream_) {
#if defined(OS_IOS)
@@ -122,7 +116,7 @@ AudioOutputStream* AudioManagerBase::MakeAudioOutputStream(
base::Bind(&AudioManagerBase::ReleaseVirtualOutputStream,
base::Unretained(this)));
#endif
- } else if (audio_output_disabled) {
+ } else if (params.format() == AudioParameters::AUDIO_FAKE) {
stream = FakeAudioOutputStream::MakeFakeStream(this, params);
} else if (params.format() == AudioParameters::AUDIO_PCM_LINEAR) {
stream = MakeLinearOutputStream(params);
« no previous file with comments | « no previous file | media/audio/audio_output_proxy_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698