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

Unified Diff: media/audio/android/audio_manager_android.cc

Issue 9692038: stopping the audio thread before destroying the AudioManager<Platform> (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased and fixed the speech recognition unittest Created 8 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
Index: media/audio/android/audio_manager_android.cc
diff --git a/media/audio/android/audio_manager_android.cc b/media/audio/android/audio_manager_android.cc
index 9d179346c490e4c5d77048ba7bd6a90f7cd7c75b..81264b51d511602f1b9d12fcd53f39b326ad56cb 100644
--- a/media/audio/android/audio_manager_android.cc
+++ b/media/audio/android/audio_manager_android.cc
@@ -21,7 +21,7 @@ AudioManagerAndroid::AudioManagerAndroid() {
}
AudioManagerAndroid::~AudioManagerAndroid() {
- audio_thread_->Stop();
+ Shutdown();
}
bool AudioManagerAndroid::HasAudioOutputDevices() {
@@ -55,11 +55,11 @@ AudioOutputStream* AudioManagerAndroid::MakeLowLatencyOutputStream(
AudioInputStream* AudioManagerAndroid::MakeLinearInputStream(
const AudioParameters& params, const std::string& device_id) {
DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format);
- return FakeAudioInputStream::MakeFakeStream(params);
+ return FakeAudioInputStream::MakeFakeStream(this, params);
}
AudioInputStream* AudioManagerAndroid::MakeLowLatencyInputStream(
const AudioParameters& params, const std::string& device_id) {
DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format);
- return FakeAudioInputStream::MakeFakeStream(params);
+ return FakeAudioInputStream::MakeFakeStream(this, params);
}

Powered by Google App Engine
This is Rietveld 408576698