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

Commit e8158ffe authored by Glenn Kasten's avatar Glenn Kasten Committed by Android (Google) Code Review
Browse files

Merge "Add use for audio_unique_id_t" into nyc-dev

parents ddfef426 eeecb980

include/media/AudioSystem.h

+2 −2
Original line number Diff line number Diff line
@@ -150,9 +150,9 @@ public: 
    // 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

    //       this method could fail by returning either a reserved ID like AUDIO_UNIQUE_ID_ALLOCATE

    //       or an unspecified existing unique ID.

    static audio_unique_id_t newAudioUniqueId();

    static audio_unique_id_t newAudioUniqueId(audio_unique_id_use_t use);



    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
@@ -182,7 +182,7 @@ public: 


    virtual uint32_t getInputFramesLost(audio_io_handle_t ioHandle) const = 0;



    virtual audio_unique_id_t newAudioUniqueId() = 0;

    virtual audio_unique_id_t newAudioUniqueId(audio_unique_id_use_t use) = 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
@@ -231,7 +231,7 @@ status_t AudioRecord::set( 
    // mNotificationFramesAct is initialized in openRecord_l



    if (sessionId == AUDIO_SESSION_ALLOCATE) {

        mSessionId = AudioSystem::newAudioUniqueId();

        mSessionId = AudioSystem::newAudioUniqueId(AUDIO_UNIQUE_ID_USE_SESSION);

    } else {

        mSessionId = sessionId;

    }

media/libmedia/AudioSystem.cpp

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

}



audio_unique_id_t AudioSystem::newAudioUniqueId()

audio_unique_id_t AudioSystem::newAudioUniqueId(audio_unique_id_use_t use)

{

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

    if (af == 0) return AUDIO_UNIQUE_ID_ALLOCATE;

    return af->newAudioUniqueId();

    return af->newAudioUniqueId(use);

}



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

media/libmedia/AudioTrack.cpp

+1 −1
Original line number Diff line number Diff line
@@ -438,7 +438,7 @@ status_t AudioTrack::set( 
    mNotificationFramesReq = notificationFrames;

    mNotificationFramesAct = 0;

    if (sessionId == AUDIO_SESSION_ALLOCATE) {

        mSessionId = AudioSystem::newAudioUniqueId();

        mSessionId = AudioSystem::newAudioUniqueId(AUDIO_UNIQUE_ID_USE_SESSION);

    } else {

        mSessionId = sessionId;

    }