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

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

Merge "Fix for trying to restore audio track after obtain buffer error" into... 

Merge "Fix for trying to restore audio track after obtain buffer error" into main am: 1eee8744 am: 1e5ca7e7

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



Change-Id: Ic695eb44a854edd2172d94b092f7b3930b74fac1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dafff31d 1e5ca7e7

media/libaudioclient/AudioTrack.cpp

+2 −3
Original line number Diff line number Diff line
@@ -2221,11 +2221,10 @@ status_t AudioTrack::obtainBuffer(Buffer* audioBuffer, const struct timespec *re 
        {   // start of lock scope

            AutoMutex lock(mLock);



            uint32_t newSequence = mSequence;

            // did previous obtainBuffer() fail due to media server death or voluntary invalidation?

            if (status == DEAD_OBJECT) {

                // re-create track, unless someone else has already done so

                if (newSequence == oldSequence) {

                if (mSequence == oldSequence) {

                    status = restoreTrack_l("obtainBuffer");

                    if (status != NO_ERROR) {

                        buffer.mFrameCount = 0;
@@ -2235,7 +2234,7 @@ status_t AudioTrack::obtainBuffer(Buffer* audioBuffer, const struct timespec *re 
                    }

                }

            }

            oldSequence = newSequence;

            oldSequence = mSequence;



            if (status == NOT_ENOUGH_DATA) {

                restartIfDisabled();