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

Commit e73d7f59 authored by Andy Hung's avatar Andy Hung
Browse files

AudioTrackShared: Fix assertion on Java Offload 

Two concurrent obtainBuffers are possible, one from the notification
thread and the other from the app data delivery thread.
Fix mUnreleased to prevent assertion on releaseBuffer.

Flag: EXEMPT bugfix
Test: atest AudioTrackOffloadTest#testPcmAudioTrackOffload
Test: atest CtsMediaAudioTestCases
Test: validated fix in the bug
Bug: 417174139
Change-Id: Ia4e687b5a8b860b8e6891d949703ed0d2b7cc0cb
parent d362eff8

media/libaudioclient/AudioTrackShared.cpp

+5 −1
Original line number Diff line number Diff line
@@ -267,7 +267,11 @@ status_t ClientProxy::obtainBuffer(Buffer* buffer, const struct timespec *reques 
            buffer->mRaw = part1 > 0 ?

                    &((char *) mBuffers)[(mIsOut ? rear : front) * mFrameSize] : NULL;

            buffer->mNonContig = avail - part1;

            mUnreleased = part1;

            // If two obtainBuffers requests are concurrent (for Java Offload),

            // take the maximum of the two mUnreleased (consistency check variable)

            // to avoid triggering an assertion on releaseBuffer.

            // TODO(b/419572928) improve this logic.

            mUnreleased = std::max(mUnreleased, part1);

            status = NO_ERROR;

            break;

        }