Use audio_session_t consistently

Bug: 27562099
Change-Id: Ie04efb44923fdd2f034b771157fa30dababdfb58

7 files changed, 21 insertions, 16 deletions

diff --git a/src/android/AudioPlayer_to_android.cpp b/src/android/AudioPlayer_to_android.cpp
index 2069a0b..204889a 100644
--- a/src/android/AudioPlayer_to_android.cpp
+++ b/src/android/AudioPlayer_to_android.cpp
@@ -1280,7 +1280,8 @@ void android_audioPlayer_create(CAudioPlayer *pAudioPlayer) {
     // FIXME Consolidate initializations (many of these already in IEngine_CreateAudioPlayer)
     // mAndroidObjType: see above comment
     pAudioPlayer->mAndroidObjState = ANDROID_UNINITIALIZED;
-    pAudioPlayer->mSessionId = android::AudioSystem::newAudioUniqueId(AUDIO_UNIQUE_ID_USE_SESSION);
+    pAudioPlayer->mSessionId = (audio_session_t) android::AudioSystem::newAudioUniqueId(
+            AUDIO_UNIQUE_ID_USE_SESSION);
 
     // placeholder: not necessary yet as session ID lifetime doesn't extend beyond player
     // android::AudioSystem::acquireAudioSessionId(pAudioPlayer->mSessionId);
diff --git a/src/android/AudioRecorder_to_android.cpp b/src/android/AudioRecorder_to_android.cpp
index d2c63cd..809b983 100644
--- a/src/android/AudioRecorder_to_android.cpp
+++ b/src/android/AudioRecorder_to_android.cpp
@@ -467,7 +467,7 @@ SLresult android_audioRecorder_realize(CAudioRecorder* ar, SLboolean async) {
             audioRecorder_callback,// callback_t
             (void*)ar,             // user, callback data, here the AudioRecorder
             0,                     // notificationFrames
-            0,                     // session ID
+            AUDIO_SESSION_ALLOCATE,
             android::AudioRecord::TRANSFER_CALLBACK,
                                    // transfer type
             policy);               // audio_input_flags_t
diff --git a/src/android/MediaPlayer_to_android.cpp b/src/android/MediaPlayer_to_android.cpp
index 1dde036..7d8d1af 100644
--- a/src/android/MediaPlayer_to_android.cpp
+++ b/src/android/MediaPlayer_to_android.cpp
@@ -393,7 +393,8 @@ XAresult android_Player_create(CMediaPlayer *mp) {
     // FIXME duplicates an initialization also done by higher level
     mp->mAndroidObjState = ANDROID_UNINITIALIZED;
     mp->mStreamType = ANDROID_DEFAULT_OUTPUT_STREAM_TYPE;
-    mp->mSessionId = android::AudioSystem::newAudioUniqueId(AUDIO_UNIQUE_ID_USE_SESSION);
+    mp->mSessionId = (audio_session_t) android::AudioSystem::newAudioUniqueId(
+            AUDIO_UNIQUE_ID_USE_SESSION);
 
     // placeholder: not necessary yet as session ID lifetime doesn't extend beyond player
     // android::AudioSystem::acquireAudioSessionId(mp->mSessionId);
diff --git a/src/android/android_Effect.cpp b/src/android/android_Effect.cpp
index 090a211..fcd844b 100644
--- a/src/android/android_Effect.cpp
+++ b/src/android/android_Effect.cpp
@@ -261,7 +261,7 @@ android::status_t android_bb_getParam(android::sp<android::AudioEffect> pFx,
 }
 
 //-----------------------------------------------------------------------------
-void android_bb_init(int sessionId, IBassBoost* ibb) {
+void android_bb_init(audio_session_t sessionId, IBassBoost* ibb) {
     SL_LOGV("session %d", sessionId);
 
     if (!android_fx_initEffectObj(sessionId, ibb->mBassBoostEffect,
@@ -281,7 +281,7 @@ void android_bb_init(int sessionId, IBassBoost* ibb) {
 
 
 //-----------------------------------------------------------------------------
-void android_eq_init(int sessionId, IEqualizer* ieq) {
+void android_eq_init(audio_session_t sessionId, IEqualizer* ieq) {
     SL_LOGV("android_eq_init on session %d", sessionId);
 
     if (!android_fx_initEffectObj(sessionId, ieq->mEqEffect, &ieq->mEqDescriptor.type)) {
@@ -330,7 +330,7 @@ void android_eq_init(int sessionId, IEqualizer* ieq) {
 
 
 //-----------------------------------------------------------------------------
-void android_virt_init(int sessionId, IVirtualizer* ivi) {
+void android_virt_init(audio_session_t sessionId, IVirtualizer* ivi) {
     SL_LOGV("android_virt_init on session %d", sessionId);
 
     if (!android_fx_initEffectObj(sessionId, ivi->mVirtualizerEffect,
@@ -625,7 +625,7 @@ SLresult android_fx_statusToResult(android::status_t status) {
 
 
 //-----------------------------------------------------------------------------
-bool android_fx_initEffectObj(int sessionId, android::sp<android::AudioEffect>& effect,
+bool android_fx_initEffectObj(audio_session_t sessionId, android::sp<android::AudioEffect>& effect,
         const effect_uuid_t *type) {
     //SL_LOGV("android_fx_initEffectObj on session %d", sessionId);
 
@@ -757,7 +757,9 @@ SLresult android_genericFx_queryEffect(SLuint32 index, effect_descriptor_t* pDes
 
 
 //-----------------------------------------------------------------------------
-SLresult android_genericFx_createEffect(IAndroidEffect* iae, SLInterfaceID pUuid, int sessionId) {
+SLresult android_genericFx_createEffect(IAndroidEffect* iae, SLInterfaceID pUuid,
+        audio_session_t sessionId)
+{
 
     SLresult result = SL_RESULT_SUCCESS;
 
diff --git a/src/android/android_Effect.h b/src/android/android_Effect.h
index 6ca4b5a..78572c6 100644
--- a/src/android/android_Effect.h
+++ b/src/android/android_Effect.h
@@ -17,7 +17,7 @@
 /**************************************************************************************************
  * Equalizer functions
  ****************************/
-extern void android_eq_init(int sessionId, IEqualizer* ieq);
+extern void android_eq_init(audio_session_t sessionId, IEqualizer* ieq);
 
 extern android::status_t android_eq_setParam(android::sp<android::AudioEffect> pFx,
         int32_t param, int32_t param2, void *pValue);
@@ -28,7 +28,7 @@ extern android::status_t android_eq_getParam(android::sp<android::AudioEffect> p
 /**************************************************************************************************
  * BassBoost functions
  ****************************/
-extern void android_bb_init(int sessionId, IBassBoost* ibb);
+extern void android_bb_init(audio_session_t sessionId, IBassBoost* ibb);
 
 extern android::status_t android_bb_setParam(android::sp<android::AudioEffect> pFx,
         int32_t param, void *pValue);
@@ -39,7 +39,7 @@ extern android::status_t android_bb_getParam(android::sp<android::AudioEffect> p
 /**************************************************************************************************
  * Virtualizer functions
  ****************************/
-extern void android_virt_init(int sessionId, IVirtualizer* ivi);
+extern void android_virt_init(audio_session_t sessionId, IVirtualizer* ivi);
 
 extern android::status_t android_virt_setParam(android::sp<android::AudioEffect> pFx,
         int32_t param, void *pValue);
@@ -77,7 +77,7 @@ extern SLresult android_genericFx_queryNumEffects(SLuint32 *pNumSupportedAudioEf
 extern SLresult android_genericFx_queryEffect(SLuint32 index, effect_descriptor_t* pDescriptor);
 
 extern SLresult android_genericFx_createEffect(IAndroidEffect* iae, SLInterfaceID pUuid,
-        int sessionId);
+        audio_session_t sessionId);
 
 extern SLresult android_genericFx_releaseEffect(IAndroidEffect* iae, SLInterfaceID pUuid);
 
@@ -129,7 +129,8 @@ extern android::status_t android_fx_getParam(android::sp<android::AudioEffect> p
 
 extern SLresult android_fx_statusToResult(android::status_t status);
 
-extern bool android_fx_initEffectObj(int sessionId, android::sp<android::AudioEffect>& effect,
+extern bool android_fx_initEffectObj(audio_session_t sessionId,
+        android::sp<android::AudioEffect>& effect,
         const effect_uuid_t *type);
 
 extern bool android_fx_initEffectDescriptor(const SLInterfaceID effectId,
diff --git a/src/android/android_defs.h b/src/android/android_defs.h
index 408a18e..5244592 100644
--- a/src/android/android_defs.h
+++ b/src/android/android_defs.h
@@ -67,7 +67,7 @@ enum AndroidObjectState {
 
 struct AudioPlayback_Parameters {
     audio_stream_type_t streamType;
-    int sessionId;
+    audio_session_t sessionId;
 };
 
 /**
diff --git a/src/classes.h b/src/classes.h
index b6c5d90..c9d0520 100644
--- a/src/classes.h
+++ b/src/classes.h
@@ -94,7 +94,7 @@
     /** identifies the initialization and preparation state */
     enum AndroidObjectState mAndroidObjState;
     /** identifies which group of effects ("session") this player belongs to */
-    int mSessionId;
+    audio_session_t mSessionId;
     /** identifies the Android stream type playback will occur on */
     audio_stream_type_t mStreamType;
     // FIXME consolidate the next several variables into one class to avoid placement new
@@ -344,7 +344,7 @@ typedef struct CMediaPlayer_struct {
     /** identifies the initialization and preparation state */
     enum AndroidObjectState mAndroidObjState;
     /** identifies which group of effects ("session") this player belongs to */
-    int mSessionId;
+    audio_session_t mSessionId;
     /** identifies the Android stream type playback will occur on */
     audio_stream_type_t mStreamType;
 #endif