OLD | NEW |
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 "jni/AudioManagerAndroid_jni.h" | 8 #include "jni/AudioManagerAndroid_jni.h" |
9 #include "media/audio/android/opensles_input.h" | 9 #include "media/audio/android/opensles_input.h" |
10 #include "media/audio/android/opensles_output.h" | 10 #include "media/audio/android/opensles_output.h" |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
52 | 52 |
53 void AudioManagerAndroid::GetAudioInputDeviceNames( | 53 void AudioManagerAndroid::GetAudioInputDeviceNames( |
54 media::AudioDeviceNames* device_names) { | 54 media::AudioDeviceNames* device_names) { |
55 DCHECK(device_names->empty()); | 55 DCHECK(device_names->empty()); |
56 device_names->push_front( | 56 device_names->push_front( |
57 media::AudioDeviceName(kDefaultDeviceName, kDefaultDeviceId)); | 57 media::AudioDeviceName(kDefaultDeviceName, kDefaultDeviceId)); |
58 } | 58 } |
59 | 59 |
60 AudioParameters AudioManagerAndroid::GetInputStreamParameters( | 60 AudioParameters AudioManagerAndroid::GetInputStreamParameters( |
61 const std::string& device_id) { | 61 const std::string& device_id) { |
| 62 const media::ChannelLayout kChannelLayout = media::CHANNEL_LAYOUT_MONO; |
62 int buffer_size = Java_AudioManagerAndroid_getMinInputFrameSize( | 63 int buffer_size = Java_AudioManagerAndroid_getMinInputFrameSize( |
63 base::android::AttachCurrentThread(), GetNativeOutputSampleRate(), 2); | 64 base::android::AttachCurrentThread(), GetNativeOutputSampleRate(), |
| 65 ChannelLayoutToChannelCount(kChannelLayout)); |
64 | 66 |
65 return AudioParameters( | 67 return AudioParameters( |
66 AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_STEREO, | 68 AudioParameters::AUDIO_PCM_LOW_LATENCY, kChannelLayout, |
67 GetNativeOutputSampleRate(), 16, | 69 GetNativeOutputSampleRate(), 16, |
68 buffer_size <= 0 ? kDefaultInputBufferSize : buffer_size); | 70 buffer_size <= 0 ? kDefaultInputBufferSize : buffer_size); |
69 } | 71 } |
70 | 72 |
71 AudioOutputStream* AudioManagerAndroid::MakeAudioOutputStream( | 73 AudioOutputStream* AudioManagerAndroid::MakeAudioOutputStream( |
72 const AudioParameters& params, const std::string& input_device_id) { | 74 const AudioParameters& params, const std::string& input_device_id) { |
73 AudioOutputStream* stream = | 75 AudioOutputStream* stream = |
74 AudioManagerBase::MakeAudioOutputStream(params, std::string()); | 76 AudioManagerBase::MakeAudioOutputStream(params, std::string()); |
75 if (stream && output_stream_count() == 1) { | 77 if (stream && output_stream_count() == 1) { |
76 SetAudioMode(kAudioModeInCommunication); | 78 SetAudioMode(kAudioModeInCommunication); |
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
195 j_audio_manager_.obj()); | 197 j_audio_manager_.obj()); |
196 } | 198 } |
197 | 199 |
198 int AudioManagerAndroid::GetAudioLowLatencyOutputFrameSize() { | 200 int AudioManagerAndroid::GetAudioLowLatencyOutputFrameSize() { |
199 return Java_AudioManagerAndroid_getAudioLowLatencyOutputFrameSize( | 201 return Java_AudioManagerAndroid_getAudioLowLatencyOutputFrameSize( |
200 base::android::AttachCurrentThread(), | 202 base::android::AttachCurrentThread(), |
201 j_audio_manager_.obj()); | 203 j_audio_manager_.obj()); |
202 } | 204 } |
203 | 205 |
204 } // namespace media | 206 } // namespace media |
OLD | NEW |