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

Commit de3f8392 authored by Eric Laurent's avatar Eric Laurent
Browse files

rename AudioSystem::newAudioSessionId() 

Rename AudioSystem::newAudioSessionId() to
AudioSystem::newAudioUniqueId() as it can be used
also for I/O handles.

Bug: 12378680.
Change-Id: I611ea3b5eb57a4b0774437f477ee87dc4ccc2cc2
parent 03524dcc

include/media/AudioSystem.h

+6 −6
Original line number Diff line number Diff line
@@ -139,12 +139,12 @@ public: 
    // return the number of input frames lost by HAL implementation, or 0 if the handle is invalid

    static uint32_t getInputFramesLost(audio_io_handle_t ioHandle);



    // Allocate a new audio session ID and return that new ID.

    // If unable to contact AudioFlinger, returns AUDIO_SESSION_ALLOCATE instead.

    // FIXME If AudioFlinger were to ever exhaust the session ID namespace,

    //       this method could fail by returning either AUDIO_SESSION_ALLOCATE

    //       or an unspecified existing session ID.

    static int newAudioSessionId();

    // Allocate a new unique ID for use as an audio session ID or I/O handle.

    // If unable to contact AudioFlinger, returns AUDIO_UNIQUE_ID_ALLOCATE instead.

    // FIXME If AudioFlinger were to ever exhaust the unique ID namespace,

    //       this method could fail by returning either AUDIO_UNIQUE_ID_ALLOCATE

    //       or an unspecified existing unique ID.

    static audio_unique_id_t newAudioUniqueId();



    static void acquireAudioSessionId(int audioSession, pid_t pid);

    static void releaseAudioSessionId(int audioSession, pid_t pid);

include/media/IAudioFlinger.h

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ public: 


    virtual uint32_t getInputFramesLost(audio_io_handle_t ioHandle) const = 0;



    virtual int newAudioSessionId() = 0;

    virtual audio_unique_id_t newAudioUniqueId() = 0;



    virtual void acquireAudioSessionId(int audioSession, pid_t pid) = 0;

    virtual void releaseAudioSessionId(int audioSession, pid_t pid) = 0;

media/libmedia/AudioRecord.cpp

+1 −1
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ status_t AudioRecord::set( 
    // mNotificationFramesAct is initialized in openRecord_l



    if (sessionId == AUDIO_SESSION_ALLOCATE) {

        mSessionId = AudioSystem::newAudioSessionId();

        mSessionId = AudioSystem::newAudioUniqueId();

    } else {

        mSessionId = sessionId;

    }

media/libmedia/AudioSystem.cpp

+3 −3
Original line number Diff line number Diff line
@@ -427,11 +427,11 @@ uint32_t AudioSystem::getInputFramesLost(audio_io_handle_t ioHandle) 
    return result;

}



int AudioSystem::newAudioSessionId()

audio_unique_id_t AudioSystem::newAudioUniqueId()

{

    const sp<IAudioFlinger>& af = AudioSystem::get_audio_flinger();

    if (af == 0) return AUDIO_SESSION_ALLOCATE;

    return af->newAudioSessionId();

    if (af == 0) return AUDIO_UNIQUE_ID_ALLOCATE;

    return af->newAudioUniqueId();

}



void AudioSystem::acquireAudioSessionId(int audioSession, pid_t pid)

media/libmedia/IAudioFlinger.cpp

+3 −3
Original line number Diff line number Diff line
@@ -604,12 +604,12 @@ public: 
        return (uint32_t) reply.readInt32();

    }



    virtual int newAudioSessionId()

    virtual audio_unique_id_t newAudioUniqueId()

    {

        Parcel data, reply;

        data.writeInterfaceToken(IAudioFlinger::getInterfaceDescriptor());

        status_t status = remote()->transact(NEW_AUDIO_SESSION_ID, data, &reply);

        int id = AUDIO_SESSION_ALLOCATE;

        audio_unique_id_t id = AUDIO_SESSION_ALLOCATE;

        if (status == NO_ERROR) {

            id = reply.readInt32();

        }
@@ -1176,7 +1176,7 @@ status_t BnAudioFlinger::onTransact( 
        } break;

        case NEW_AUDIO_SESSION_ID: {

            CHECK_INTERFACE(IAudioFlinger, data, reply);

            reply->writeInt32(newAudioSessionId());

            reply->writeInt32(newAudioUniqueId());

            return NO_ERROR;

        } break;

        case ACQUIRE_AUDIO_SESSION_ID: {