From 33b840444f5a481dd31e129079d3c0cf3acdf80e Mon Sep 17 00:00:00 2001 From: Glenn Kasten Date: Tue, 8 Mar 2016 12:02:55 -0800 Subject: [PATCH] Use audio_session_t consistently Also prefer AudioManager.AUDIO_SESSION_ID_GENERATE over AudioSystem.AUDIO_SESSION_ALLOCATE, because AudioSystem.AUDIO_SESSION_ALLOCATE is @hide. Bug: 27562099 Change-Id: I5924554feb919db7f2390f5b062faedd515421af --- core/java/android/speech/tts/AudioPlaybackQueueItem.java | 4 ++-- core/java/android/speech/tts/TextToSpeechService.java | 8 ++++---- core/jni/android_media_AudioRecord.cpp | 4 ++-- core/jni/android_media_AudioSystem.cpp | 4 ++-- core/jni/android_media_AudioTrack.cpp | 2 +- media/java/android/media/AudioRecord.java | 2 +- media/java/android/media/AudioTrack.java | 4 ++-- media/jni/android_media_MediaPlayer.cpp | 6 ++++-- media/jni/audioeffect/android_media_AudioEffect.cpp | 4 ++-- media/jni/audioeffect/android_media_Visualizer.cpp | 2 +- 10 files changed, 21 insertions(+), 19 deletions(-) diff --git a/core/java/android/speech/tts/AudioPlaybackQueueItem.java b/core/java/android/speech/tts/AudioPlaybackQueueItem.java index d4fea534aced6..ed7534dcf0091 100644 --- a/core/java/android/speech/tts/AudioPlaybackQueueItem.java +++ b/core/java/android/speech/tts/AudioPlaybackQueueItem.java @@ -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; diff --git a/core/java/android/speech/tts/TextToSpeechService.java b/core/java/android/speech/tts/TextToSpeechService.java index fc075de59cf2d..1eaa7cfd5b154 100644 --- a/core/java/android/speech/tts/TextToSpeechService.java +++ b/core/java/android/speech/tts/TextToSpeechService.java @@ -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), diff --git a/core/jni/android_media_AudioRecord.cpp b/core/jni/android_media_AudioRecord.cpp index 3e4e3522d5dd1..1bc4285a23d75 100644 --- a/core/jni/android_media_AudioRecord.cpp +++ b/core/jni/android_media_AudioRecord.cpp @@ -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)); } diff --git a/core/jni/android_media_AudioSystem.cpp b/core/jni/android_media_AudioSystem.cpp index 1eb0111009196..9d15019bab50b 100644 --- a/core/jni/android_media_AudioSystem.cpp +++ b/core/jni/android_media_AudioSystem.cpp @@ -388,7 +388,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) { @@ -1539,7 +1539,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 diff --git a/core/jni/android_media_AudioTrack.cpp b/core/jni/android_media_AudioTrack.cpp index 302cf639f4d9f..024c21de4a509 100644 --- a/core/jni/android_media_AudioTrack.cpp +++ b/core/jni/android_media_AudioTrack.cpp @@ -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; diff --git a/media/java/android/media/AudioRecord.java b/media/java/android/media/AudioRecord.java index 37714746ae698..d058ff3a60f2d 100644 --- a/media/java/android/media/AudioRecord.java +++ b/media/java/android/media/AudioRecord.java @@ -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 */ diff --git a/media/java/android/media/AudioTrack.java b/media/java/android/media/AudioTrack.java index 2aac2b32bc629..bfbd3a5c835a2 100644 --- a/media/java/android/media/AudioTrack.java +++ b/media/java/android/media/AudioTrack.java @@ -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); } /** diff --git a/media/jni/android_media_MediaPlayer.cpp b/media/jni/android_media_MediaPlayer.cpp index e9d62dec80a47..2fb1a3b9fbcf8 100644 --- a/media/jni/android_media_MediaPlayer.cpp +++ b/media/jni/android_media_MediaPlayer.cpp @@ -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 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) { diff --git a/media/jni/audioeffect/android_media_AudioEffect.cpp b/media/jni/audioeffect/android_media_AudioEffect.cpp index fa6913573add6..10efe188ad590 100644 --- a/media/jni/audioeffect/android_media_AudioEffect.cpp +++ b/media/jni/audioeffect/android_media_AudioEffect.cpp @@ -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) { diff --git a/media/jni/audioeffect/android_media_Visualizer.cpp b/media/jni/audioeffect/android_media_Visualizer.cpp index 3d3adba609c05..f1a8c6fbdb29c 100644 --- a/media/jni/audioeffect/android_media_Visualizer.cpp +++ b/media/jni/audioeffect/android_media_Visualizer.cpp @@ -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;