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

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: missed one comment and addressed Ami's comment 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;
21 // AudioMode.
22 static const int kAudioModeInCommunication = 0x00000003;
20 23
21 AudioManager* CreateAudioManager() { 24 AudioManager* CreateAudioManager() {
22 return new AudioManagerAndroid(); 25 return new AudioManagerAndroid();
23 } 26 }
24 27
25 AudioManagerAndroid::AudioManagerAndroid() { 28 AudioManagerAndroid::AudioManagerAndroid() {
26 SetMaxOutputStreamsAllowed(kMaxOutputStreams); 29 SetMaxOutputStreamsAllowed(kMaxOutputStreams);
27 } 30 }
28 31
29 AudioManagerAndroid::~AudioManagerAndroid() { 32 AudioManagerAndroid::~AudioManagerAndroid() {
(...skipping 23 matching lines...) Expand all
53 static const int kDefaultSampleRate = 16000; 56 static const int kDefaultSampleRate = 16000;
54 static const int kDefaultBufferSize = 1024; 57 static const int kDefaultBufferSize = 1024;
55 return AudioParameters( 58 return AudioParameters(
56 AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_STEREO, 59 AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_STEREO,
57 kDefaultSampleRate, 16, kDefaultBufferSize); 60 kDefaultSampleRate, 16, kDefaultBufferSize);
58 } 61 }
59 62
60 AudioOutputStream* AudioManagerAndroid::MakeLinearOutputStream( 63 AudioOutputStream* AudioManagerAndroid::MakeLinearOutputStream(
61 const AudioParameters& params) { 64 const AudioParameters& params) {
62 DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format()); 65 DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
66 SetAudioMode(kAudioModeInCommunication);
Yaron 2013/03/13 01:15:07 Ok, but when does this ever get unset? Presumably
63 return new OpenSLESOutputStream(this, params); 67 return new OpenSLESOutputStream(this, params);
64 } 68 }
65 69
66 AudioOutputStream* AudioManagerAndroid::MakeLowLatencyOutputStream( 70 AudioOutputStream* AudioManagerAndroid::MakeLowLatencyOutputStream(
67 const AudioParameters& params) { 71 const AudioParameters& params) {
68 DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format()); 72 DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
73 SetAudioMode(kAudioModeInCommunication);
69 return new OpenSLESOutputStream(this, params); 74 return new OpenSLESOutputStream(this, params);
70 } 75 }
71 76
72 AudioInputStream* AudioManagerAndroid::MakeLinearInputStream( 77 AudioInputStream* AudioManagerAndroid::MakeLinearInputStream(
73 const AudioParameters& params, const std::string& device_id) { 78 const AudioParameters& params, const std::string& device_id) {
74 DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format()); 79 DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
75 return new OpenSLESInputStream(this, params); 80 return new OpenSLESInputStream(this, params);
76 } 81 }
77 82
78 AudioInputStream* AudioManagerAndroid::MakeLowLatencyInputStream( 83 AudioInputStream* AudioManagerAndroid::MakeLowLatencyInputStream(
79 const AudioParameters& params, const std::string& device_id) { 84 const AudioParameters& params, const std::string& device_id) {
80 DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format()); 85 DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
81 return new OpenSLESInputStream(this, params); 86 return new OpenSLESInputStream(this, params);
82 } 87 }
83 88
89 // static
90 bool AudioManagerAndroid::RegisterAudioManager(JNIEnv* env) {
91 return RegisterNativesImpl(env);
92 }
93
84 AudioParameters AudioManagerAndroid::GetPreferredOutputStreamParameters( 94 AudioParameters AudioManagerAndroid::GetPreferredOutputStreamParameters(
85 const AudioParameters& input_params) { 95 const AudioParameters& input_params) {
86 // TODO(xians): figure out the right output sample rate and sample rate to 96 // TODO(xians): figure out the right output sample rate and sample rate to
87 // achieve the best audio performance for Android devices. 97 // achieve the best audio performance for Android devices.
88 static const int kDefaultSampleRate = 16000; 98 static const int kDefaultSampleRate = 16000;
89 static const int kDefaultBufferSize = 1024; 99 static const int kDefaultBufferSize = 1024;
90 100
91 ChannelLayout channel_layout = CHANNEL_LAYOUT_STEREO; 101 ChannelLayout channel_layout = CHANNEL_LAYOUT_STEREO;
92 int sample_rate = kDefaultSampleRate; 102 int sample_rate = kDefaultSampleRate;
93 int buffer_size = kDefaultBufferSize; 103 int buffer_size = kDefaultBufferSize;
(...skipping 15 matching lines...) Expand all
109 119
110 int user_buffer_size = GetUserBufferSize(); 120 int user_buffer_size = GetUserBufferSize();
111 if (user_buffer_size) 121 if (user_buffer_size)
112 buffer_size = user_buffer_size; 122 buffer_size = user_buffer_size;
113 123
114 return AudioParameters( 124 return AudioParameters(
115 AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout, input_channels, 125 AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout, input_channels,
116 sample_rate, bits_per_sample, buffer_size); 126 sample_rate, bits_per_sample, buffer_size);
117 } 127 }
118 128
129 void AudioManagerAndroid::SetAudioMode(int mode) {
130 JNIEnv* env = base::android::AttachCurrentThread();
131 jobject context = base::android::GetApplicationContext();
132 DCHECK(context);
133
134 Java_AudioManagerAndroid_setMode(env, context, mode);
135 }
136
119 } // namespace media 137 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698