Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use audio_session_t consistently" into nyc-dev

Browse Source
This commit is contained in:
Glenn Kasten
2016-03-17 14:22:50 +00:00
committed by Android (Google) Code Review
parent 8b1918e5a6 33b840444f
commit 58ae278294
10 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/speech/tts/AudioPlaybackQueueItem.java
View File

@@ -16,7 +16,7 @@
package android.speech.tts;
import android.content.Context;
import android.media.AudioSystem;
import android.media.AudioManager;
import android.media.MediaPlayer;
import android.net.Uri;
import android.os.ConditionVariable;
@@ -57,7 +57,7 @@ class AudioPlaybackQueueItem extends PlaybackQueueItem {
int sessionId = mAudioParams.mSessionId;
mPlayer = MediaPlayer.create(
mContext, mUri, null, mAudioParams.mAudioAttributes,
sessionId > 0 ? sessionId : AudioSystem.AUDIO_SESSION_ALLOCATE);
sessionId > 0 ? sessionId : AudioManager.AUDIO_SESSION_ID_GENERATE);
if (mPlayer == null) {
dispatcher.dispatchOnError(TextToSpeech.ERROR_OUTPUT);
return;

8
core/java/android/speech/tts/TextToSpeechService.java
View File

@@ -19,7 +19,7 @@ import android.annotation.NonNull;
import android.app.Service;
import android.content.Intent;
import android.media.AudioAttributes;
import android.media.AudioSystem;
import android.media.AudioManager;
import android.net.Uri;
import android.os.Binder;
import android.os.Bundle;
@@ -659,7 +659,7 @@ public abstract class TextToSpeechService extends Service {
/**
* Audio session identifier. May be used to associate audio playback with one of the
* {@link android.media.audiofx.AudioEffect} objects. If not specified by client,
* it should be equal to {@link AudioSystem#AUDIO_SESSION_ALLOCATE}.
* it should be equal to {@link AudioManager#AUDIO_SESSION_ID_GENERATE}.
*/
public final int mSessionId;
@@ -684,7 +684,7 @@ public abstract class TextToSpeechService extends Service {
/** Create AudioOutputParams with default values */
AudioOutputParams() {
mSessionId = AudioSystem.AUDIO_SESSION_ALLOCATE;
mSessionId = AudioManager.AUDIO_SESSION_ID_GENERATE;
mVolume = Engine.DEFAULT_VOLUME;
mPan = Engine.DEFAULT_PAN;
mAudioAttributes = null;
@@ -722,7 +722,7 @@ public abstract class TextToSpeechService extends Service {
return new AudioOutputParams(
paramsBundle.getInt(
Engine.KEY_PARAM_SESSION_ID,
AudioSystem.AUDIO_SESSION_ALLOCATE),
AudioManager.AUDIO_SESSION_ID_GENERATE),
paramsBundle.getFloat(
Engine.KEY_PARAM_VOLUME,
Engine.DEFAULT_VOLUME),

4
core/jni/android_media_AudioRecord.cpp
View File

@@ -200,7 +200,7 @@ android_media_AudioRecord_setup(JNIEnv *env, jobject thiz, jobject weak_this,
ALOGE("Error creating AudioRecord: Error retrieving session id pointer");
return (jint) AUDIO_JAVA_ERROR;
}
int sessionId = nSession[0];
audio_session_t sessionId = (audio_session_t) nSession[0];
env->ReleasePrimitiveArrayCritical(jSession, nSession, 0);
nSession = NULL;
@@ -385,7 +385,7 @@ android_media_AudioRecord_start(JNIEnv *env, jobject thiz, jint event, jint trig
}
return nativeToJavaStatus(
lpRecorder->start((AudioSystem::sync_event_t)event, triggerSession));
lpRecorder->start((AudioSystem::sync_event_t)event, (audio_session_t) triggerSession));
}

4
core/jni/android_media_AudioSystem.cpp
View File

@@ -389,7 +389,7 @@ android_media_AudioSystem_dyn_policy_callback(int event, String8 regId, int val)
}
static void
android_media_AudioSystem_recording_callback(int event, int session, int source,
android_media_AudioSystem_recording_callback(int event, audio_session_t session, int source,
const audio_config_base_t *clientConfig, const audio_config_base_t *deviceConfig,
audio_patch_handle_t patchHandle)
{
@@ -1540,7 +1540,7 @@ android_media_AudioSystem_eventHandlerFinalize(JNIEnv *env, jobject thiz)
static jint
android_media_AudioSystem_getAudioHwSyncForSession(JNIEnv *env, jobject thiz, jint sessionId)
{
return (jint)AudioSystem::getAudioHwSyncForSession((audio_session_t)sessionId);
return (jint) AudioSystem::getAudioHwSyncForSession((audio_session_t) sessionId);
}
static void

2
core/jni/android_media_AudioTrack.cpp
View File

@@ -235,7 +235,7 @@ android_media_AudioTrack_setup(JNIEnv *env, jobject thiz, jobject weak_this, job
ALOGE("Error creating AudioTrack: Error retrieving session id pointer");
return (jint) AUDIO_JAVA_ERROR;
}
int sessionId = nSession[0];
audio_session_t sessionId = (audio_session_t) nSession[0];
env->ReleasePrimitiveArrayCritical(jSession, nSession, 0);
nSession = NULL;

2
media/java/android/media/AudioRecord.java
View File

@@ -228,7 +228,7 @@ public class AudioRecord implements AudioRouting
/**
* Audio session ID
*/
private int mSessionId = AudioSystem.AUDIO_SESSION_ALLOCATE;
private int mSessionId = AudioManager.AUDIO_SESSION_ID_GENERATE;
/**
* AudioAttributes
*/

4
media/java/android/media/AudioTrack.java
View File

@@ -295,7 +295,7 @@ public class AudioTrack implements AudioRouting
/**
* Audio session ID
*/
private int mSessionId = AudioSystem.AUDIO_SESSION_ALLOCATE;
private int mSessionId = AudioManager.AUDIO_SESSION_ID_GENERATE;
/**
* Reference to the app-ops service.
*/
@@ -368,7 +368,7 @@ public class AudioTrack implements AudioRouting
int bufferSizeInBytes, int mode)
throws IllegalArgumentException {
this(streamType, sampleRateInHz, channelConfig, audioFormat,
bufferSizeInBytes, mode, AudioSystem.AUDIO_SESSION_ALLOCATE);
bufferSizeInBytes, mode, AudioManager.AUDIO_SESSION_ID_GENERATE);
}
/**

6
media/jni/android_media_MediaPlayer.cpp
View File

@@ -906,14 +906,16 @@ android_media_MediaPlayer_native_finalize(JNIEnv *env, jobject thiz)
android_media_MediaPlayer_release(env, thiz);
}
static void android_media_MediaPlayer_set_audio_session_id(JNIEnv *env, jobject thiz, jint sessionId) {
static void android_media_MediaPlayer_set_audio_session_id(JNIEnv *env, jobject thiz,
jint sessionId) {
ALOGV("set_session_id(): %d", sessionId);
sp<MediaPlayer> mp = getMediaPlayer(env, thiz);
if (mp == NULL ) {
jniThrowException(env, "java/lang/IllegalStateException", NULL);
return;
}
process_media_player_call( env, thiz, mp->setAudioSessionId(sessionId), NULL, NULL );
process_media_player_call( env, thiz, mp->setAudioSessionId((audio_session_t) sessionId), NULL,
NULL);
}
static jint android_media_MediaPlayer_get_audio_session_id(JNIEnv *env, jobject thiz) {

4
media/jni/audioeffect/android_media_AudioEffect.cpp
View File

@@ -351,7 +351,7 @@ android_media_AudioEffect_native_setup(JNIEnv *env, jobject thiz, jobject weak_t
priority,
effectCallback,
&lpJniStorage->mCallbackData,
sessionId,
(audio_session_t) sessionId,
0);
if (lpAudioEffect == 0) {
ALOGE("Error creating AudioEffect");
@@ -819,7 +819,7 @@ android_media_AudioEffect_native_queryPreProcessings(JNIEnv *env, jclass clazz _
effect_descriptor_t *descriptors = new effect_descriptor_t[AudioEffect::kMaxPreProcessing];
uint32_t numEffects = AudioEffect::kMaxPreProcessing;
status_t status = AudioEffect::queryDefaultPreProcessing(audioSession,
status_t status = AudioEffect::queryDefaultPreProcessing((audio_session_t) audioSession,
descriptors,
&numEffects);
if (status != NO_ERROR || numEffects == 0) {

2
media/jni/audioeffect/android_media_Visualizer.cpp
View File

@@ -388,7 +388,7 @@ android_media_visualizer_native_setup(JNIEnv *env, jobject thiz, jobject weak_th
0,
android_media_visualizer_effect_callback,
lpJniStorage,
sessionId);
(audio_session_t) sessionId);
if (lpVisualizer == 0) {
ALOGE("Error creating Visualizer");
goto setup_failure;