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

Commit 99d54433 authored by Glenn Kasten's avatar Glenn Kasten
Browse files

Bug 4903178 Restore priority and cgroup on stop 

On AudioTrack and AudioRecord stop or failed start, restore the priority
and cgroup of the caller to their previous values, rather than forcing
to NORMAL.  Dependent on new thread APIs.

Also fixes bug where priority was set to AUDIO but cgroup not set.

Change-Id: Ib83893918fb4fdf57c6b87884b51038997a631d8
parent 5a471818

include/media/AudioRecord.h

+2 −0
Original line number Diff line number Diff line
@@ -385,6 +385,8 @@ private: 
    uint32_t                mChannelMask;

    audio_io_handle_t       mInput;

    int                     mSessionId;

    int                     mPreviousPriority;          // before start()

    int                     mPreviousSchedulingGroup;

};



}; // namespace android

include/media/AudioTrack.h

+2 −0
Original line number Diff line number Diff line
@@ -487,6 +487,8 @@ private: 
    int                     mAuxEffectId;

    Mutex                   mLock;

    status_t                mRestoreStatus;

    int                     mPreviousPriority;          // before start()

    int                     mPreviousSchedulingGroup;

};

media/libmedia/AudioRecord.cpp

+10 −5
Original line number Diff line number Diff line
@@ -80,7 +80,8 @@ status_t AudioRecord::getMinFrameCount( 
// ---------------------------------------------------------------------------



AudioRecord::AudioRecord()

    : mStatus(NO_INIT), mSessionId(0)

    : mStatus(NO_INIT), mSessionId(0),

      mPreviousPriority(ANDROID_PRIORITY_NORMAL), mPreviousSchedulingGroup(ANDROID_TGROUP_DEFAULT)

{

}
@@ -95,7 +96,8 @@ AudioRecord::AudioRecord( 
        void* user,

        int notificationFrames,

        int sessionId)

    : mStatus(NO_INIT), mSessionId(0)

    : mStatus(NO_INIT), mSessionId(0),

      mPreviousPriority(ANDROID_PRIORITY_NORMAL), mPreviousSchedulingGroup(ANDROID_TGROUP_DEFAULT)

{

    mStatus = set(inputSource, sampleRate, format, channelMask,

            frameCount, flags, cbf, user, notificationFrames, sessionId);
@@ -328,7 +330,9 @@ status_t AudioRecord::start() 
            if (t != 0) {

                t->run("ClientRecordThread", ANDROID_PRIORITY_AUDIO);

            } else {

                setpriority(PRIO_PROCESS, 0, ANDROID_PRIORITY_AUDIO);

                mPreviousPriority = getpriority(PRIO_PROCESS, 0);

                mPreviousSchedulingGroup = androidGetThreadSchedulingGroup(0);

                androidSetThreadPriority(0, ANDROID_PRIORITY_AUDIO);

            }

        } else {

            mActive = 0;
@@ -363,7 +367,8 @@ status_t AudioRecord::stop() 
        if (t != 0) {

            t->requestExit();

        } else {

            setpriority(PRIO_PROCESS, 0, ANDROID_PRIORITY_NORMAL);

            setpriority(PRIO_PROCESS, 0, mPreviousPriority);

            androidSetThreadSchedulingGroup(0, mPreviousSchedulingGroup);

        }

    }

media/libmedia/AudioTrack.cpp

+14 −7
Original line number Diff line number Diff line
@@ -79,7 +79,8 @@ status_t AudioTrack::getMinFrameCount( 
// ---------------------------------------------------------------------------



AudioTrack::AudioTrack()

    : mStatus(NO_INIT)

    : mStatus(NO_INIT),

      mPreviousPriority(ANDROID_PRIORITY_NORMAL), mPreviousSchedulingGroup(ANDROID_TGROUP_DEFAULT)

{

}
@@ -94,7 +95,8 @@ AudioTrack::AudioTrack( 
        void* user,

        int notificationFrames,

        int sessionId)

    : mStatus(NO_INIT)

    : mStatus(NO_INIT),

      mPreviousPriority(ANDROID_PRIORITY_NORMAL), mPreviousSchedulingGroup(ANDROID_TGROUP_DEFAULT)

{

    mStatus = set(streamType, sampleRate, format, channelMask,

            frameCount, flags, cbf, user, notificationFrames,
@@ -112,7 +114,8 @@ AudioTrack::AudioTrack( 
        void* user,

        int notificationFrames,

        int sessionId)

    : mStatus(NO_INIT)

    : mStatus(NO_INIT),

      mPreviousPriority(ANDROID_PRIORITY_NORMAL), mPreviousSchedulingGroup(ANDROID_TGROUP_DEFAULT)

{

    mStatus = set(streamType, sampleRate, format, channelMask,

            0, flags, cbf, user, notificationFrames,
@@ -348,7 +351,9 @@ void AudioTrack::start() 
        if (t != 0) {

            t->run("AudioTrackThread", ANDROID_PRIORITY_AUDIO);

        } else {

            setpriority(PRIO_PROCESS, 0, ANDROID_PRIORITY_AUDIO);

            mPreviousPriority = getpriority(PRIO_PROCESS, 0);

            mPreviousSchedulingGroup = androidGetThreadSchedulingGroup(0);

            androidSetThreadPriority(0, ANDROID_PRIORITY_AUDIO);

        }



        ALOGV("start %p before lock cblk %p", this, mCblk);
@@ -370,7 +375,8 @@ void AudioTrack::start() 
            if (t != 0) {

                t->requestExit();

            } else {

                setpriority(PRIO_PROCESS, 0, ANDROID_PRIORITY_NORMAL);

                setpriority(PRIO_PROCESS, 0, mPreviousPriority);

                androidSetThreadSchedulingGroup(0, mPreviousSchedulingGroup);

            }

        }

    }
@@ -408,7 +414,8 @@ void AudioTrack::stop() 
        if (t != 0) {

            t->requestExit();

        } else {

            setpriority(PRIO_PROCESS, 0, ANDROID_PRIORITY_NORMAL);

            setpriority(PRIO_PROCESS, 0, mPreviousPriority);

            androidSetThreadSchedulingGroup(0, mPreviousSchedulingGroup);

        }

    }