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

Commit 0077bf0b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "libaudioclient: fix AudioTrack blocking write after underrun" into main am: 0a121506 

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



Change-Id: Idc2a3c89f01dd150895651cb59b9f70e3c42026a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bdc4c6c6 0a121506

media/libaudioclient/AudioTrackShared.cpp

+9 −1
Original line number Diff line number Diff line
@@ -310,8 +310,16 @@ status_t ClientProxy::obtainBuffer(Buffer* buffer, const struct timespec *reques 
            ts = NULL;

            break;

        }



        int32_t old = android_atomic_and(~CBLK_FUTEX_WAKE, &cblk->mFutex);

        if (!(old & CBLK_FUTEX_WAKE)) {



        // Check inactive to prevent waiting if the track has been disabled due to underrun

        // (or invalidated).  The subsequent call to obtainBufer will return NOT_ENOUGH_DATA

        // (or DEAD_OBJECT) and restart (or restore) the track.

        const int32_t current_flags = android_atomic_acquire_load(&cblk->mFlags);

        const bool inactive = current_flags & (CBLK_INVALID | CBLK_DISABLED);



        if (!(old & CBLK_FUTEX_WAKE) && !inactive) {

            if (measure && !beforeIsValid) {

                clock_gettime(CLOCK_MONOTONIC, &before);

                beforeIsValid = true;