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

Unified Diff: media/audio/linux/audio_manager_linux.cc

Issue 9255017: Add thread safety to AudioManagerBase to protect access to the audio thread member variable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix style issue Created 8 years, 11 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/linux/alsa_output_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/linux/audio_manager_linux.cc
diff --git a/media/audio/linux/audio_manager_linux.cc b/media/audio/linux/audio_manager_linux.cc
index 6aaf59182d0d934f90098231c956fedb2c750fee..54f1346774d302690511e51a37f68e87e0f1e7fa 100644
--- a/media/audio/linux/audio_manager_linux.cc
+++ b/media/audio/linux/audio_manager_linux.cc
@@ -49,17 +49,9 @@ bool AudioManagerLinux::HasAudioInputDevices() {
AudioOutputStream* AudioManagerLinux::MakeAudioOutputStream(
const AudioParameters& params) {
- // Early return for testing hook. Do this before checking for
- // |initialized_|.
- if (params.format == AudioParameters::AUDIO_MOCK) {
+ // Early return for testing hook.
+ if (params.format == AudioParameters::AUDIO_MOCK)
return FakeAudioOutputStream::MakeFakeStream(params);
- }
-
- if (!initialized()) {
- // We should never get here since this method is called on the audio thread.
- NOTREACHED();
- return NULL;
- }
// Don't allow opening more than |kMaxOutputStreams| streams.
if (active_output_stream_count_ >= kMaxOutputStreams)
@@ -97,9 +89,6 @@ AudioInputStream* AudioManagerLinux::MakeAudioInputStream(
return FakeAudioInputStream::MakeFakeStream(params);
}
- if (!initialized())
- return NULL;
-
std::string device_name = (device_id == AudioManagerBase::kDefaultDeviceId) ?
AlsaPcmInputStream::kAutoSelectDevice : device_id;
if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAlsaInputDevice)) {
« no previous file with comments | « media/audio/linux/alsa_output_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698