Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aea7ea06 authored by Glenn Kasten's avatar Glenn Kasten
Browse files

Use AUDIO_SESSION_ALLOCATE instead of 0 

Also fix a couple of places where we were using AUDIO_SESSION_OUTPUT_MIX,
which happens to also be equal to 0, but has a different meaning.

Change-Id: I90e39be3b89f5021a96d9e3b8d10929013ca977f
parent bd72d220

include/media/AudioRecord.h

+2 −2
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ public: 
                                    callback_t cbf = NULL,

                                    void* user = NULL,

                                    int notificationFrames = 0,

                                    int sessionId = 0,

                                    int sessionId = AUDIO_SESSION_ALLOCATE,

                                    transfer_type transferType = TRANSFER_DEFAULT,

                                    audio_input_flags_t flags = AUDIO_INPUT_FLAG_NONE);
@@ -188,7 +188,7 @@ public: 
                            void* user = NULL,

                            int notificationFrames = 0,

                            bool threadCanCallJava = false,

                            int sessionId = 0,

                            int sessionId = AUDIO_SESSION_ALLOCATE,

                            transfer_type transferType = TRANSFER_DEFAULT,

                            audio_input_flags_t flags = AUDIO_INPUT_FLAG_NONE);

include/media/AudioTrack.h

+3 −3
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ public: 
                                    callback_t cbf       = NULL,

                                    void* user           = NULL,

                                    int notificationFrames = 0,

                                    int sessionId        = 0,

                                    int sessionId        = AUDIO_SESSION_ALLOCATE,

                                    transfer_type transferType = TRANSFER_DEFAULT,

                                    const audio_offload_info_t *offloadInfo = NULL,

                                    int uid = -1);
@@ -210,7 +210,7 @@ public: 
                                    callback_t cbf      = NULL,

                                    void* user          = NULL,

                                    int notificationFrames = 0,

                                    int sessionId       = 0,

                                    int sessionId       = AUDIO_SESSION_ALLOCATE,

                                    transfer_type transferType = TRANSFER_DEFAULT,

                                    const audio_offload_info_t *offloadInfo = NULL,

                                    int uid = -1);
@@ -248,7 +248,7 @@ public: 
                            int notificationFrames = 0,

                            const sp<IMemory>& sharedBuffer = 0,

                            bool threadCanCallJava = false,

                            int sessionId       = 0,

                            int sessionId       = AUDIO_SESSION_ALLOCATE,

                            transfer_type transferType = TRANSFER_DEFAULT,

                            const audio_offload_info_t *offloadInfo = NULL,

                            int uid = -1);

media/libmedia/AudioRecord.cpp

+4 −4
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ status_t AudioRecord::getMinFrameCount( 
// ---------------------------------------------------------------------------



AudioRecord::AudioRecord()

    : mStatus(NO_INIT), mSessionId(0),

    : mStatus(NO_INIT), mSessionId(AUDIO_SESSION_ALLOCATE),

      mPreviousPriority(ANDROID_PRIORITY_NORMAL), mPreviousSchedulingGroup(SP_DEFAULT)

{

}
@@ -88,7 +88,7 @@ AudioRecord::AudioRecord( 
        int sessionId,

        transfer_type transferType,

        audio_input_flags_t flags)

    : mStatus(NO_INIT), mSessionId(0),

    : mStatus(NO_INIT), mSessionId(AUDIO_SESSION_ALLOCATE),

      mPreviousPriority(ANDROID_PRIORITY_NORMAL),

      mPreviousSchedulingGroup(SP_DEFAULT),

      mProxy(NULL)
@@ -233,7 +233,7 @@ status_t AudioRecord::set( 
    mNotificationFramesReq = notificationFrames;

    mNotificationFramesAct = 0;



    if (sessionId == 0 ) {

    if (sessionId == AUDIO_SESSION_ALLOCATE) {

        mSessionId = AudioSystem::newAudioSessionId();

    } else {

        mSessionId = sessionId;
@@ -471,7 +471,7 @@ status_t AudioRecord::openRecord_l(size_t epoch) 
                                                       tid,

                                                       &mSessionId,

                                                       &status);

    ALOGE_IF(originalSessionId != 0 && mSessionId != originalSessionId,

    ALOGE_IF(originalSessionId != AUDIO_SESSION_ALLOCATE && mSessionId != originalSessionId,

            "session ID changed from %d to %d", originalSessionId, mSessionId);



    if (record == 0 || status != NO_ERROR) {

media/libmedia/IAudioFlinger.cpp

+2 −2
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ public: 
        }

        data.writeInt32((int32_t) output);

        data.writeInt32((int32_t) tid);

        int lSessionId = 0;

        int lSessionId = AUDIO_SESSION_ALLOCATE;

        if (sessionId != NULL) {

            lSessionId = *sessionId;

        }
@@ -167,7 +167,7 @@ public: 
        track_flags_t lFlags = flags != NULL ? *flags : (track_flags_t) TRACK_DEFAULT;

        data.writeInt32(lFlags);

        data.writeInt32((int32_t) tid);

        int lSessionId = 0;

        int lSessionId = AUDIO_SESSION_ALLOCATE;

        if (sessionId != NULL) {

            lSessionId = *sessionId;

        }

services/audioflinger/AudioFlinger.cpp

+2 −2
Original line number Diff line number Diff line
@@ -534,7 +534,7 @@ sp<IAudioTrack> AudioFlinger::createTrack( 
        client = registerPid_l(pid);



        ALOGV("createTrack() sessionId: %d", (sessionId == NULL) ? -2 : *sessionId);

        if (sessionId != NULL && *sessionId != AUDIO_SESSION_OUTPUT_MIX) {

        if (sessionId != NULL && *sessionId != AUDIO_SESSION_ALLOCATE) {

            // check if an effect chain with the same session ID is present on another

            // output thread and move it here.

            for (size_t i = 0; i < mPlaybackThreads.size(); i++) {
@@ -1324,7 +1324,7 @@ sp<IAudioRecord> AudioFlinger::openRecord( 
        client = registerPid_l(pid);



        // If no audio session id is provided, create one here

        if (sessionId != NULL && *sessionId != AUDIO_SESSION_OUTPUT_MIX) {

        if (sessionId != NULL && *sessionId != AUDIO_SESSION_ALLOCATE) {

            lSessionId = *sessionId;

        } else {

            lSessionId = nextUniqueId();