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

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

Issue 12571006: Add MODIFY_AUDIO_SETTINGS permission in Android manifest and implementation in audio manager. (Closed) Base URL: https://src.chromium.org/svn/trunk/src/
Patch Set: change header order Created 7 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
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 "jni/AudioManagerAndroid_jni.h"
8 #include "media/audio/android/opensles_input.h" 9 #include "media/audio/android/opensles_input.h"
9 #include "media/audio/android/opensles_output.h" 10 #include "media/audio/android/opensles_output.h"
10 #include "media/audio/audio_manager.h" 11 #include "media/audio/audio_manager.h"
11 #include "media/audio/audio_parameters.h" 12 #include "media/audio/audio_parameters.h"
12 #include "media/audio/audio_util.h" 13 #include "media/audio/audio_util.h"
13 #include "media/audio/fake_audio_input_stream.h" 14 #include "media/audio/fake_audio_input_stream.h"
14 #include "media/base/channel_layout.h" 15 #include "media/base/channel_layout.h"
15 16
16 namespace media { 17 namespace media {
17 18
18 // Maximum number of output streams that can be open simultaneously. 19 // Maximum number of output streams that can be open simultaneously.
19 static const int kMaxOutputStreams = 10; 20 static const int kMaxOutputStreams = 10;
20 21
21 AudioManager* CreateAudioManager() { 22 AudioManager* CreateAudioManager() {
22 return new AudioManagerAndroid(); 23 return new AudioManagerAndroid();
23 } 24 }
24 25
25 AudioManagerAndroid::AudioManagerAndroid() { 26 AudioManagerAndroid::AudioManagerAndroid() {
26 SetMaxOutputStreamsAllowed(kMaxOutputStreams); 27 SetMaxOutputStreamsAllowed(kMaxOutputStreams);
27 } 28 }
28 29
29 AudioManagerAndroid::~AudioManagerAndroid() { 30 AudioManagerAndroid::~AudioManagerAndroid() {
30 Shutdown(); 31 Shutdown();
31 } 32 }
32 33
34 // static
35 bool AudioManagerAndroid::RegisterAudioManager(JNIEnv* env) {
tommi (sloooow) - chröme 2013/03/11 09:57:18 try to keep methods in the source file in the same
leozwang1 2013/03/11 15:12:24 Done.
36 return RegisterNativesImpl(env);
37 }
38
33 bool AudioManagerAndroid::HasAudioOutputDevices() { 39 bool AudioManagerAndroid::HasAudioOutputDevices() {
34 return true; 40 return true;
35 } 41 }
36 42
37 bool AudioManagerAndroid::HasAudioInputDevices() { 43 bool AudioManagerAndroid::HasAudioInputDevices() {
38 return true; 44 return true;
39 } 45 }
40 46
41 void AudioManagerAndroid::GetAudioInputDeviceNames( 47 void AudioManagerAndroid::GetAudioInputDeviceNames(
42 media::AudioDeviceNames* device_names) { 48 media::AudioDeviceNames* device_names) {
(...skipping 10 matching lines...) Expand all
53 static const int kDefaultSampleRate = 16000; 59 static const int kDefaultSampleRate = 16000;
54 static const int kDefaultBufferSize = 1024; 60 static const int kDefaultBufferSize = 1024;
55 return AudioParameters( 61 return AudioParameters(
56 AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_STEREO, 62 AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_STEREO,
57 kDefaultSampleRate, 16, kDefaultBufferSize); 63 kDefaultSampleRate, 16, kDefaultBufferSize);
58 } 64 }
59 65
60 AudioOutputStream* AudioManagerAndroid::MakeLinearOutputStream( 66 AudioOutputStream* AudioManagerAndroid::MakeLinearOutputStream(
61 const AudioParameters& params) { 67 const AudioParameters& params) {
62 DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format()); 68 DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
69 SetAudioMode(kAudioModeNormal);
63 return new OpenSLESOutputStream(this, params); 70 return new OpenSLESOutputStream(this, params);
64 } 71 }
65 72
66 AudioOutputStream* AudioManagerAndroid::MakeLowLatencyOutputStream( 73 AudioOutputStream* AudioManagerAndroid::MakeLowLatencyOutputStream(
67 const AudioParameters& params) { 74 const AudioParameters& params) {
68 DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format()); 75 DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
76 SetAudioMode(kAudioModeInCommunication);
69 return new OpenSLESOutputStream(this, params); 77 return new OpenSLESOutputStream(this, params);
70 } 78 }
71 79
72 AudioInputStream* AudioManagerAndroid::MakeLinearInputStream( 80 AudioInputStream* AudioManagerAndroid::MakeLinearInputStream(
73 const AudioParameters& params, const std::string& device_id) { 81 const AudioParameters& params, const std::string& device_id) {
74 DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format()); 82 DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
75 return new OpenSLESInputStream(this, params); 83 return new OpenSLESInputStream(this, params);
76 } 84 }
77 85
78 AudioInputStream* AudioManagerAndroid::MakeLowLatencyInputStream( 86 AudioInputStream* AudioManagerAndroid::MakeLowLatencyInputStream(
(...skipping 30 matching lines...) Expand all
109 117
110 int user_buffer_size = GetUserBufferSize(); 118 int user_buffer_size = GetUserBufferSize();
111 if (user_buffer_size) 119 if (user_buffer_size)
112 buffer_size = user_buffer_size; 120 buffer_size = user_buffer_size;
113 121
114 return AudioParameters( 122 return AudioParameters(
115 AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout, input_channels, 123 AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout, input_channels,
116 sample_rate, bits_per_sample, buffer_size); 124 sample_rate, bits_per_sample, buffer_size);
117 } 125 }
118 126
127 void AudioManagerAndroid::SetAudioMode(int mode) {
128 JNIEnv* env = base::android::AttachCurrentThread();
129 DCHECK(env);
130 jobject context = base::android::GetApplicationContext();
131 DCHECK(context);
132
133 Java_AudioManagerAndroid_setMode(env, context, mode);
134 }
135
119 } // namespace media 136 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698