diff options
| author | enal@chromium.org <enal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-01 19:05:06 +0000 |
|---|---|---|
| committer | enal@chromium.org <enal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-01 19:05:06 +0000 |
| commit | ae41f507c0395071b9fbbbda2cad8bf1bf9f3332 (patch) | |
| tree | 5fe6cf6a196303819265f65dbe7be9cb771d081c /media | |
| parent | 48ee8e55c35bae6b089176546b5ff2ef738703f2 (diff) | |
| download | chromium_src-ae41f507c0395071b9fbbbda2cad8bf1bf9f3332.zip chromium_src-ae41f507c0395071b9fbbbda2cad8bf1bf9f3332.tar.gz chromium_src-ae41f507c0395071b9fbbbda2cad8bf1bf9f3332.tar.bz2 | |
Turn on audio mixer by default.
BUG=114701
TEST=Should be no audiable difference, at least without very high load.
TEST=We would open fewer OS audio streams, but that is not noticeable.
Review URL: https://chromiumcodereview.appspot.com/10440115
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140071 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/audio/audio_manager_base.cc | 2 | ||||
| -rw-r--r-- | media/base/media_switches.cc | 4 | ||||
| -rw-r--r-- | media/base/media_switches.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/media/audio/audio_manager_base.cc b/media/audio/audio_manager_base.cc index 404cf90..467b3d6 100644 --- a/media/audio/audio_manager_base.cc +++ b/media/audio/audio_manager_base.cc @@ -143,7 +143,7 @@ AudioOutputStream* AudioManagerBase::MakeAudioOutputStreamProxy( base::TimeDelta close_delay = base::TimeDelta::FromSeconds(kStreamCloseDelaySeconds); const CommandLine* cmd_line = CommandLine::ForCurrentProcess(); - if (cmd_line->HasSwitch(switches::kEnableAudioMixer)) { + if (!cmd_line->HasSwitch(switches::kDisableAudioMixer)) { dispatcher = new AudioOutputMixer(this, params, close_delay); } else { dispatcher = new AudioOutputDispatcherImpl(this, params, close_delay); diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc index 5a2a912..3d50022 100644 --- a/media/base/media_switches.cc +++ b/media/base/media_switches.cc @@ -26,7 +26,7 @@ const char kUsePulseAudio[] = "use-pulseaudio"; // Set number of threads to use for video decoding. const char kVideoThreads[] = "video-threads"; -// Enables browser-side audio mixer. -const char kEnableAudioMixer[] = "enable-audio-mixer"; +// Disables browser-side audio mixer. +const char kDisableAudioMixer[] = "disable-audio-mixer"; } // namespace switches diff --git a/media/base/media_switches.h b/media/base/media_switches.h index 2279299..28c4671 100644 --- a/media/base/media_switches.h +++ b/media/base/media_switches.h @@ -27,7 +27,7 @@ MEDIA_EXPORT extern const char kUsePulseAudio[]; MEDIA_EXPORT extern const char kVideoThreads[]; -MEDIA_EXPORT extern const char kEnableAudioMixer[]; +MEDIA_EXPORT extern const char kDisableAudioMixer[]; } // namespace switches |