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

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

Issue 12218036: Enable audio capture on Android (Closed) Base URL: https://src.chromium.org/svn/trunk/src/
Patch Set: Created 7 years, 10 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
« no previous file with comments | « media/audio/android/audio_manager_android.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/opensles_input.h" 8 #include "media/audio/android/opensles_input.h"
9 #include "media/audio/android/opensles_output.h" 9 #include "media/audio/android/opensles_output.h"
10 #include "media/audio/audio_manager.h" 10 #include "media/audio/audio_manager.h"
11 #include "media/audio/audio_util.h"
11 #include "media/audio/fake_audio_input_stream.h" 12 #include "media/audio/fake_audio_input_stream.h"
12 13
13 namespace media { 14 namespace media {
14 15
16 static const char kAndroidInputDeviceName[] = "Mic";
17 static const char kAndroidInputDeviceId[] = "mic";
wjia(left Chromium) 2013/02/06 18:17:05 move these 2 into anonymous namespace and remove s
leozwang1 2013/02/11 08:05:00 I removed these defines because unit test assume t
18
15 // Maximum number of output streams that can be open simultaneously. 19 // Maximum number of output streams that can be open simultaneously.
16 static const int kMaxOutputStreams = 10; 20 static const int kMaxOutputStreams = 10;
17 21
18 AudioManager* CreateAudioManager() { 22 AudioManager* CreateAudioManager() {
19 return new AudioManagerAndroid(); 23 return new AudioManagerAndroid();
20 } 24 }
21 25
22 AudioManagerAndroid::AudioManagerAndroid() { 26 AudioManagerAndroid::AudioManagerAndroid() {
23 SetMaxOutputStreamsAllowed(kMaxOutputStreams); 27 SetMaxOutputStreamsAllowed(kMaxOutputStreams);
24 } 28 }
25 29
26 AudioManagerAndroid::~AudioManagerAndroid() { 30 AudioManagerAndroid::~AudioManagerAndroid() {
27 Shutdown(); 31 Shutdown();
28 } 32 }
29 33
30 bool AudioManagerAndroid::HasAudioOutputDevices() { 34 bool AudioManagerAndroid::HasAudioOutputDevices() {
31 return true; 35 return true;
32 } 36 }
33 37
34 bool AudioManagerAndroid::HasAudioInputDevices() { 38 bool AudioManagerAndroid::HasAudioInputDevices() {
39 return true;
40 }
41
42 bool AudioManagerAndroid::CanShowAudioInputSettings() {
35 return false; 43 return false;
36 } 44 }
37 45
46 void AudioManagerAndroid::ShowAudioInputSettings() {
wjia(left Chromium) 2013/02/06 18:17:05 Do you need a no-op override here? It's same def a
leozwang1 2013/02/11 08:05:00 Done.
47 }
48
49 void AudioManagerAndroid::GetAudioInputDeviceNames(
50 media::AudioDeviceNames* device_names) {
51 if (device_names->empty()) {
52 device_names->push_front(media::AudioDeviceName(
53 kAndroidInputDeviceName, kAndroidInputDeviceId));
54 }
55 }
56
57 AudioParameters
58 AudioManagerAndroid::GetPreferredLowLatencyOutputStreamParameters(
59 const AudioParameters& input_params) {
60 // TODO(leozwang): Android defines the minimal buffer size requirment
61 // we should follow it. From Android 4.1, a new audio low latency api
62 // set was introduced and is under development, we want to take advantage
63 // of it.
64 int buffer_size = GetAudioHardwareBufferSize();
65 if (input_params.frames_per_buffer() < buffer_size)
66 buffer_size = input_params.frames_per_buffer();
67
68 return AudioParameters(
69 AudioParameters::AUDIO_PCM_LOW_LATENCY, input_params.channel_layout(),
70 input_params.sample_rate(), 16, buffer_size);
71 }
72
38 AudioOutputStream* AudioManagerAndroid::MakeLinearOutputStream( 73 AudioOutputStream* AudioManagerAndroid::MakeLinearOutputStream(
39 const AudioParameters& params) { 74 const AudioParameters& params) {
40 DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format()); 75 DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
41 return new OpenSLESOutputStream(this, params); 76 return new OpenSLESOutputStream(this, params);
42 } 77 }
43 78
44 AudioOutputStream* AudioManagerAndroid::MakeLowLatencyOutputStream( 79 AudioOutputStream* AudioManagerAndroid::MakeLowLatencyOutputStream(
45 const AudioParameters& params) { 80 const AudioParameters& params) {
46 DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format()); 81 DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
47 return new OpenSLESOutputStream(this, params); 82 return new OpenSLESOutputStream(this, params);
48 } 83 }
49 84
50 AudioInputStream* AudioManagerAndroid::MakeLinearInputStream( 85 AudioInputStream* AudioManagerAndroid::MakeLinearInputStream(
51 const AudioParameters& params, const std::string& device_id) { 86 const AudioParameters& params, const std::string& device_id) {
52 DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format()); 87 DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
53 return new OpenSLESInputStream(this, params); 88 return new OpenSLESInputStream(this, params);
54 } 89 }
55 90
56 AudioInputStream* AudioManagerAndroid::MakeLowLatencyInputStream( 91 AudioInputStream* AudioManagerAndroid::MakeLowLatencyInputStream(
57 const AudioParameters& params, const std::string& device_id) { 92 const AudioParameters& params, const std::string& device_id) {
58 DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format()); 93 DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
59 return new OpenSLESInputStream(this, params); 94 return new OpenSLESInputStream(this, params);
60 } 95 }
61 96
62 } // namespace media 97 } // namespace media
OLDNEW
« no previous file with comments | « media/audio/android/audio_manager_android.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698