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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/audio/android/audio_manager_android.h" 5 #include "media/audio/android/audio_manager_android.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "media/audio/android/audio_track_output_android.h" 8 #include "media/audio/android/audio_track_output_android.h"
9 #include "media/audio/audio_manager.h" 9 #include "media/audio/audio_manager.h"
10 #include "media/audio/fake_audio_input_stream.h" 10 #include "media/audio/fake_audio_input_stream.h"
11 11
12 // Maximum number of output streams that can be open simultaneously. 12 // Maximum number of output streams that can be open simultaneously.
13 static const int kMaxOutputStreams = 10; 13 static const int kMaxOutputStreams = 10;
14 14
15 AudioManager* CreateAudioManager() { 15 AudioManager* CreateAudioManager() {
16 return new AudioManagerAndroid(); 16 return new AudioManagerAndroid();
17 } 17 }
18 18
19 AudioManagerAndroid::AudioManagerAndroid() { 19 AudioManagerAndroid::AudioManagerAndroid() {
20 SetMaxOutputStreamsAllowed(kMaxOutputStreams); 20 SetMaxOutputStreamsAllowed(kMaxOutputStreams);
21 } 21 }
22 22
23 AudioManagerAndroid::~AudioManagerAndroid() { 23 AudioManagerAndroid::~AudioManagerAndroid() {
24 audio_thread_->Stop(); 24 Shutdown();
25 } 25 }
26 26
27 bool AudioManagerAndroid::HasAudioOutputDevices() { 27 bool AudioManagerAndroid::HasAudioOutputDevices() {
28 return true; 28 return true;
29 } 29 }
30 30
31 bool AudioManagerAndroid::HasAudioInputDevices() { 31 bool AudioManagerAndroid::HasAudioInputDevices() {
32 return false; 32 return false;
33 } 33 }
34 34
(...skipping 13 matching lines...) Expand all
48 48
49 AudioOutputStream* AudioManagerAndroid::MakeLowLatencyOutputStream( 49 AudioOutputStream* AudioManagerAndroid::MakeLowLatencyOutputStream(
50 const AudioParameters& params) { 50 const AudioParameters& params) {
51 DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format); 51 DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format);
52 return AudioTrackOutputStream::MakeStream(params); 52 return AudioTrackOutputStream::MakeStream(params);
53 } 53 }
54 54
55 AudioInputStream* AudioManagerAndroid::MakeLinearInputStream( 55 AudioInputStream* AudioManagerAndroid::MakeLinearInputStream(
56 const AudioParameters& params, const std::string& device_id) { 56 const AudioParameters& params, const std::string& device_id) {
57 DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format); 57 DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format);
58 return FakeAudioInputStream::MakeFakeStream(params); 58 return FakeAudioInputStream::MakeFakeStream(this, params);
59 } 59 }
60 60
61 AudioInputStream* AudioManagerAndroid::MakeLowLatencyInputStream( 61 AudioInputStream* AudioManagerAndroid::MakeLowLatencyInputStream(
62 const AudioParameters& params, const std::string& device_id) { 62 const AudioParameters& params, const std::string& device_id) {
63 DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format); 63 DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format);
64 return FakeAudioInputStream::MakeFakeStream(params); 64 return FakeAudioInputStream::MakeFakeStream(this, params);
65 } 65 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698