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

Side by Side Diff: media/audio/android/audio_manager_android.cc

Issue 78033003: Adding device enumeration to Android device manager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: nits Created 7 years 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/android/build_info.h"
8 #include "base/android/jni_array.h"
9 #include "base/android/jni_string.h"
10 #include "base/android/scoped_java_ref.h"
7 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/strings/string_number_conversions.h"
8 #include "jni/AudioManagerAndroid_jni.h" 13 #include "jni/AudioManagerAndroid_jni.h"
9 #include "media/audio/android/opensles_input.h" 14 #include "media/audio/android/opensles_input.h"
10 #include "media/audio/android/opensles_output.h" 15 #include "media/audio/android/opensles_output.h"
11 #include "media/audio/audio_manager.h" 16 #include "media/audio/audio_manager.h"
12 #include "media/audio/audio_parameters.h" 17 #include "media/audio/audio_parameters.h"
13 #include "media/audio/fake_audio_input_stream.h" 18 #include "media/audio/fake_audio_input_stream.h"
14 #include "media/base/channel_layout.h" 19 #include "media/base/channel_layout.h"
15 20
21 using base::android::AppendJavaStringArrayToStringVector;
22 using base::android::AttachCurrentThread;
23 using base::android::ConvertJavaStringToUTF8;
24 using base::android::ConvertUTF8ToJavaString;
25 using base::android::ScopedJavaLocalRef;
26
16 namespace media { 27 namespace media {
17 28
18 static void AddDefaultDevice(AudioDeviceNames* device_names) { 29 static void AddDefaultDevice(AudioDeviceNames* device_names) {
19 DCHECK(device_names->empty()); 30 DCHECK(device_names->empty());
20 device_names->push_front( 31 device_names->push_front(
21 AudioDeviceName(AudioManagerBase::kDefaultDeviceName, 32 AudioDeviceName(AudioManagerBase::kDefaultDeviceName,
22 AudioManagerBase::kDefaultDeviceId)); 33 AudioManagerBase::kDefaultDeviceId));
23 } 34 }
24 35
25 // Maximum number of output streams that can be open simultaneously. 36 // Maximum number of output streams that can be open simultaneously.
26 static const int kMaxOutputStreams = 10; 37 static const int kMaxOutputStreams = 10;
27 38
28 static const int kAudioModeNormal = 0x00000000; 39 static const int kAudioModeNormal = 0x00000000;
29 static const int kAudioModeInCommunication = 0x00000003; 40 static const int kAudioModeInCommunication = 0x00000003;
30 41
31 static const int kDefaultInputBufferSize = 1024; 42 static const int kDefaultInputBufferSize = 1024;
32 static const int kDefaultOutputBufferSize = 2048; 43 static const int kDefaultOutputBufferSize = 2048;
33 44
34 AudioManager* CreateAudioManager() { 45 AudioManager* CreateAudioManager() {
35 return new AudioManagerAndroid(); 46 return new AudioManagerAndroid();
36 } 47 }
37 48
38 AudioManagerAndroid::AudioManagerAndroid() { 49 AudioManagerAndroid::AudioManagerAndroid() {
39 SetMaxOutputStreamsAllowed(kMaxOutputStreams); 50 SetMaxOutputStreamsAllowed(kMaxOutputStreams);
40 51
41 j_audio_manager_.Reset( 52 j_audio_manager_.Reset(
42 Java_AudioManagerAndroid_createAudioManagerAndroid( 53 Java_AudioManagerAndroid_createAudioManagerAndroid(
43 base::android::AttachCurrentThread(), 54 base::android::AttachCurrentThread(),
44 base::android::GetApplicationContext())); 55 base::android::GetApplicationContext()));
56 Init();
45 } 57 }
46 58
47 AudioManagerAndroid::~AudioManagerAndroid() { 59 AudioManagerAndroid::~AudioManagerAndroid() {
60 Close();
48 Shutdown(); 61 Shutdown();
49 } 62 }
50 63
51 bool AudioManagerAndroid::HasAudioOutputDevices() { 64 bool AudioManagerAndroid::HasAudioOutputDevices() {
52 return true; 65 return true;
53 } 66 }
54 67
55 bool AudioManagerAndroid::HasAudioInputDevices() { 68 bool AudioManagerAndroid::HasAudioInputDevices() {
56 return true; 69 return true;
57 } 70 }
58 71
59 void AudioManagerAndroid::GetAudioInputDeviceNames( 72 void AudioManagerAndroid::GetAudioInputDeviceNames(
60 AudioDeviceNames* device_names) { 73 AudioDeviceNames* device_names) {
74 // Always add default device parameters as first element.
61 AddDefaultDevice(device_names); 75 AddDefaultDevice(device_names);
76
77 // Get all available devices and add these to the list.
78 AudioDeviceName device;
79 JNIEnv* env = AttachCurrentThread();
80 ScopedJavaLocalRef<jobjectArray> j_device_array =
81 Java_AudioManagerAndroid_getAudioInputDeviceNames(
82 env, j_audio_manager_.obj());
83 jsize len = env->GetArrayLength(j_device_array.obj());
84 for (jsize i = 0; i < len; ++i) {
85 ScopedJavaLocalRef<jobject> j_device(
86 env, env->GetObjectArrayElement(j_device_array.obj(), i));
87 ScopedJavaLocalRef<jstring> j_device_name =
88 Java_AudioDeviceName_name(env, j_device.obj());
89 ConvertJavaStringToUTF8(env, j_device_name.obj(), &device.device_name);
90 ScopedJavaLocalRef<jstring> j_device_id =
91 Java_AudioDeviceName_id(env, j_device.obj());
92 ConvertJavaStringToUTF8(env, j_device_id.obj(), &device.unique_id);
93 device_names->push_back(device);
94 }
62 } 95 }
63 96
64 void AudioManagerAndroid::GetAudioOutputDeviceNames( 97 void AudioManagerAndroid::GetAudioOutputDeviceNames(
65 AudioDeviceNames* device_names) { 98 AudioDeviceNames* device_names) {
99 // TODO(henrika): enumerate using GetAudioInputDeviceNames().
66 AddDefaultDevice(device_names); 100 AddDefaultDevice(device_names);
67 } 101 }
68 102
69 AudioParameters AudioManagerAndroid::GetInputStreamParameters( 103 AudioParameters AudioManagerAndroid::GetInputStreamParameters(
70 const std::string& device_id) { 104 const std::string& device_id) {
71 // Use mono as preferred number of input channels on Android to save 105 // Use mono as preferred number of input channels on Android to save
72 // resources. Using mono also avoids a driver issue seen on Samsung 106 // resources. Using mono also avoids a driver issue seen on Samsung
73 // Galaxy S3 and S4 devices. See http://crbug.com/256851 for details. 107 // Galaxy S3 and S4 devices. See http://crbug.com/256851 for details.
74 ChannelLayout channel_layout = CHANNEL_LAYOUT_MONO; 108 ChannelLayout channel_layout = CHANNEL_LAYOUT_MONO;
75 int buffer_size = Java_AudioManagerAndroid_getMinInputFrameSize( 109 int buffer_size = Java_AudioManagerAndroid_getMinInputFrameSize(
76 base::android::AttachCurrentThread(), GetNativeOutputSampleRate(), 110 base::android::AttachCurrentThread(), GetNativeOutputSampleRate(),
77 ChannelLayoutToChannelCount(channel_layout)); 111 ChannelLayoutToChannelCount(channel_layout));
78 112
79 return AudioParameters( 113 return AudioParameters(
80 AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout, 114 AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout,
81 GetNativeOutputSampleRate(), 16, 115 GetNativeOutputSampleRate(), 16,
82 buffer_size <= 0 ? kDefaultInputBufferSize : buffer_size); 116 buffer_size <= 0 ? kDefaultInputBufferSize : buffer_size);
83 } 117 }
84 118
85 AudioOutputStream* AudioManagerAndroid::MakeAudioOutputStream( 119 AudioOutputStream* AudioManagerAndroid::MakeAudioOutputStream(
86 const AudioParameters& params, 120 const AudioParameters& params,
87 const std::string& device_id, 121 const std::string& device_id,
88 const std::string& input_device_id) { 122 const std::string& input_device_id) {
89 AudioOutputStream* stream = 123 AudioOutputStream* stream =
90 AudioManagerBase::MakeAudioOutputStream(params, std::string(), 124 AudioManagerBase::MakeAudioOutputStream(params, std::string(),
91 std::string()); 125 std::string());
92 if (stream && output_stream_count() == 1) { 126 if (stream && output_stream_count() == 1) {
93 SetAudioMode(kAudioModeInCommunication); 127 SetAudioMode(kAudioModeInCommunication);
bulach 2013/11/29 10:58:39 nit: unindent
henrika (OOO until Aug 14) 2013/11/29 12:20:20 Done.
94 RegisterHeadsetReceiver();
95 } 128 }
96 return stream; 129 return stream;
97 } 130 }
98 131
99 AudioInputStream* AudioManagerAndroid::MakeAudioInputStream( 132 AudioInputStream* AudioManagerAndroid::MakeAudioInputStream(
100 const AudioParameters& params, const std::string& device_id) { 133 const AudioParameters& params, const std::string& device_id) {
101 AudioInputStream* stream = 134 AudioInputStream* stream =
102 AudioManagerBase::MakeAudioInputStream(params, device_id); 135 AudioManagerBase::MakeAudioInputStream(params, device_id);
103 return stream; 136 return stream;
104 } 137 }
105 138
106 void AudioManagerAndroid::ReleaseOutputStream(AudioOutputStream* stream) { 139 void AudioManagerAndroid::ReleaseOutputStream(AudioOutputStream* stream) {
107 AudioManagerBase::ReleaseOutputStream(stream); 140 AudioManagerBase::ReleaseOutputStream(stream);
108 if (!output_stream_count()) { 141 if (!output_stream_count()) {
109 UnregisterHeadsetReceiver();
110 SetAudioMode(kAudioModeNormal); 142 SetAudioMode(kAudioModeNormal);
111 } 143 }
112 } 144 }
113 145
114 void AudioManagerAndroid::ReleaseInputStream(AudioInputStream* stream) { 146 void AudioManagerAndroid::ReleaseInputStream(AudioInputStream* stream) {
115 AudioManagerBase::ReleaseInputStream(stream); 147 AudioManagerBase::ReleaseInputStream(stream);
116 } 148 }
117 149
118 AudioOutputStream* AudioManagerAndroid::MakeLinearOutputStream( 150 AudioOutputStream* AudioManagerAndroid::MakeLinearOutputStream(
119 const AudioParameters& params) { 151 const AudioParameters& params) {
(...skipping 12 matching lines...) Expand all
132 164
133 AudioInputStream* AudioManagerAndroid::MakeLinearInputStream( 165 AudioInputStream* AudioManagerAndroid::MakeLinearInputStream(
134 const AudioParameters& params, const std::string& device_id) { 166 const AudioParameters& params, const std::string& device_id) {
135 DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format()); 167 DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
136 return new OpenSLESInputStream(this, params); 168 return new OpenSLESInputStream(this, params);
137 } 169 }
138 170
139 AudioInputStream* AudioManagerAndroid::MakeLowLatencyInputStream( 171 AudioInputStream* AudioManagerAndroid::MakeLowLatencyInputStream(
140 const AudioParameters& params, const std::string& device_id) { 172 const AudioParameters& params, const std::string& device_id) {
141 DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format()); 173 DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
174 DLOG_IF(ERROR, device_id.empty()) << "Invalid device ID!";
175 // Utilize the deviceI ID to select the correct input device.
bulach 2013/11/29 10:58:39 nit: s/deviceI/device/
henrika (OOO until Aug 14) 2013/11/29 12:20:20 Done.
176 // Note that the input device is always associated with a certain output
177 // device, i.e., this selection does also switch the output device.
178 // All input and output streams will be affected by the device selection.
179 SetAudioDevice(device_id);
142 return new OpenSLESInputStream(this, params); 180 return new OpenSLESInputStream(this, params);
143 } 181 }
144 182
145 int AudioManagerAndroid::GetOptimalOutputFrameSize(int sample_rate, 183 int AudioManagerAndroid::GetOptimalOutputFrameSize(int sample_rate,
146 int channels) { 184 int channels) {
147 if (IsAudioLowLatencySupported()) { 185 if (IsAudioLowLatencySupported()) {
148 return GetAudioLowLatencyOutputFrameSize(); 186 return GetAudioLowLatencyOutputFrameSize();
149 } else { 187 } else {
150 return std::max(kDefaultOutputBufferSize, 188 return std::max(kDefaultOutputBufferSize,
151 Java_AudioManagerAndroid_getMinOutputFrameSize( 189 Java_AudioManagerAndroid_getMinOutputFrameSize(
(...skipping 29 matching lines...) Expand all
181 return AudioParameters( 219 return AudioParameters(
182 AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout, input_channels, 220 AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout, input_channels,
183 sample_rate, bits_per_sample, buffer_size); 221 sample_rate, bits_per_sample, buffer_size);
184 } 222 }
185 223
186 // static 224 // static
187 bool AudioManagerAndroid::RegisterAudioManager(JNIEnv* env) { 225 bool AudioManagerAndroid::RegisterAudioManager(JNIEnv* env) {
188 return RegisterNativesImpl(env); 226 return RegisterNativesImpl(env);
189 } 227 }
190 228
229 void AudioManagerAndroid::Init() {
230 Java_AudioManagerAndroid_init(
231 base::android::AttachCurrentThread(),
232 j_audio_manager_.obj());
233 }
234
235 void AudioManagerAndroid::Close() {
236 Java_AudioManagerAndroid_close(
237 base::android::AttachCurrentThread(),
238 j_audio_manager_.obj());
239 }
240
191 void AudioManagerAndroid::SetAudioMode(int mode) { 241 void AudioManagerAndroid::SetAudioMode(int mode) {
192 Java_AudioManagerAndroid_setMode( 242 Java_AudioManagerAndroid_setMode(
193 base::android::AttachCurrentThread(), 243 base::android::AttachCurrentThread(),
194 j_audio_manager_.obj(), mode); 244 j_audio_manager_.obj(), mode);
195 } 245 }
196 246
197 void AudioManagerAndroid::RegisterHeadsetReceiver() { 247 void AudioManagerAndroid::SetAudioDevice(std::string device_id) {
198 Java_AudioManagerAndroid_registerHeadsetReceiver( 248 JNIEnv* env = AttachCurrentThread();
199 base::android::AttachCurrentThread(),
200 j_audio_manager_.obj());
201 }
202 249
203 void AudioManagerAndroid::UnregisterHeadsetReceiver() { 250 // Provide an empty string to the Java audio manager if the default device
204 Java_AudioManagerAndroid_unregisterHeadsetReceiver( 251 // is selected.
205 base::android::AttachCurrentThread(), 252 if (device_id == AudioManagerBase::kDefaultDeviceId)
206 j_audio_manager_.obj()); 253 device_id.clear();
254
255 // Send the unique device ID to the Java audio manager and make the
256 // device switch.
257 ScopedJavaLocalRef<jstring> j_device_id =
258 ConvertUTF8ToJavaString(env, device_id);
259 Java_AudioManagerAndroid_setDevice(
260 env, j_audio_manager_.obj(), j_device_id.obj());
207 } 261 }
208 262
209 int AudioManagerAndroid::GetNativeOutputSampleRate() { 263 int AudioManagerAndroid::GetNativeOutputSampleRate() {
210 return Java_AudioManagerAndroid_getNativeOutputSampleRate( 264 return Java_AudioManagerAndroid_getNativeOutputSampleRate(
211 base::android::AttachCurrentThread(), 265 base::android::AttachCurrentThread(),
212 j_audio_manager_.obj()); 266 j_audio_manager_.obj());
213 } 267 }
214 268
215 bool AudioManagerAndroid::IsAudioLowLatencySupported() { 269 bool AudioManagerAndroid::IsAudioLowLatencySupported() {
216 return Java_AudioManagerAndroid_isAudioLowLatencySupported( 270 return Java_AudioManagerAndroid_isAudioLowLatencySupported(
217 base::android::AttachCurrentThread(), 271 base::android::AttachCurrentThread(),
218 j_audio_manager_.obj()); 272 j_audio_manager_.obj());
219 } 273 }
220 274
221 int AudioManagerAndroid::GetAudioLowLatencyOutputFrameSize() { 275 int AudioManagerAndroid::GetAudioLowLatencyOutputFrameSize() {
222 return Java_AudioManagerAndroid_getAudioLowLatencyOutputFrameSize( 276 return Java_AudioManagerAndroid_getAudioLowLatencyOutputFrameSize(
223 base::android::AttachCurrentThread(), 277 base::android::AttachCurrentThread(),
224 j_audio_manager_.obj()); 278 j_audio_manager_.obj());
225 } 279 }
226 280
227 } // namespace media 281 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698