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

Commit a45f1e76 authored by Andy Hung's avatar Andy Hung Committed by Automerger Merge Worker
Browse files

Merge "AudioFlinger: Fix direct output resource from being occupied for too... 

Merge "AudioFlinger: Fix direct output resource from being occupied for too long" am: e36dfbf3 am: d52ea144 am: 3d0f00a2

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1554983

Change-Id: Id4773ce1fe092a6f2b54939337e2526bf1a92d5f
parents 02ebd761 3d0f00a2

services/audioflinger/PlaybackTracks.h

+5 −0
Original line number Diff line number Diff line
@@ -219,6 +219,10 @@ protected: 
    void flushAck();

    bool isResumePending();

    void resumeAck();

    // For direct or offloaded tracks ensure that the pause state is acknowledged

    // by the playback thread in case of an immediate flush.

    bool isPausePending() const { return mPauseHwPending; }

    void pauseAck();

    void updateTrackFrameInfo(int64_t trackFramesReleased, int64_t sinkFramesWritten,

            uint32_t halSampleRate, const ExtendedTimestamp &timeStamp);
@@ -314,6 +318,7 @@ private: 
    sp<AudioTrackServerProxy>  mAudioTrackServerProxy;

    bool                mResumeToStopping; // track was paused in stopping state.

    bool                mFlushHwPending; // track requests for thread flush

    bool                mPauseHwPending = false; // direct/offload track request for thread pause

    audio_output_flags_t mFlags;

    // If the last track change was notified to the client with readAndClearHasChanged

    std::atomic_flag     mChangeNotified = ATOMIC_FLAG_INIT;

services/audioflinger/Threads.cpp

+18 −4
Original line number Diff line number Diff line
@@ -5880,8 +5880,15 @@ AudioFlinger::PlaybackThread::mixer_state AudioFlinger::DirectOutputThread::prep 
        sp<Track> l = mActiveTracks.getLatest();

        bool last = l.get() == track;



        if (track->isPausePending()) {

            track->pauseAck();

            // It is possible a track might have been flushed or stopped.

            // Other operations such as flush pending might occur on the next prepare.

            if (track->isPausing()) {

                track->setPaused();

            }

            // Always perform pause, as an immediate flush will change

            // the pause state to be no longer isPausing().

            if (mHwSupportsPause && last && !mHwPaused) {

                doHwPause = true;

                mHwPaused = true;
@@ -6423,8 +6430,15 @@ AudioFlinger::PlaybackThread::mixer_state AudioFlinger::OffloadThread::prepareTr 
            continue;

        }



        if (track->isPausePending()) {

            track->pauseAck();

            // It is possible a track might have been flushed or stopped.

            // Other operations such as flush pending might occur on the next prepare.

            if (track->isPausing()) {

                track->setPaused();

            }

            // Always perform pause if last, as an immediate flush will change

            // the pause state to be no longer isPausing().

            if (last) {

                if (mHwSupportsPause && !mHwPaused) {

                    doHwPause = true;

services/audioflinger/Tracks.cpp

+8 −0
Original line number Diff line number Diff line
@@ -1219,6 +1219,9 @@ void AudioFlinger::PlaybackThread::Track::pause() 
            mState = PAUSING;

            ALOGV("%s(%d): ACTIVE/RESUMING => PAUSING on thread %d",

                    __func__, mId, (int)mThreadIoHandle);

            if (isOffloadedOrDirect()) {

                mPauseHwPending = true;

            }

            playbackThread->broadcast_l();

            break;
@@ -1306,6 +1309,11 @@ void AudioFlinger::PlaybackThread::Track::flushAck() 
    mFlushHwPending = false;

}



void AudioFlinger::PlaybackThread::Track::pauseAck()

{

    mPauseHwPending = false;

}



void AudioFlinger::PlaybackThread::Track::reset()

{

    // Do not reset twice to avoid discarding data written just after a flush and before