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

Commit 33a7d424 authored by Phil Burk's avatar Phil Burk Committed by Automerger Merge Worker
Browse files

Merge "audio: fix race when stopping a stream" into sc-dev am: 84165ed1 

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

Change-Id: I749dca8b9b346b8df005012530ef0f563e5b0579
parents 5defa39c 84165ed1

media/libaaudio/src/legacy/AudioStreamLegacy.cpp

+7 −2
Original line number Original line Diff line number Diff line
@@ -94,10 +94,15 @@ void AudioStreamLegacy::processCallbackCommon(aaudio_callback_operation_t opcode 
            AudioTrack::Buffer *audioBuffer = static_cast<AudioTrack::Buffer *>(info);

            AudioTrack::Buffer *audioBuffer = static_cast<AudioTrack::Buffer *>(info);

            if (getState() == AAUDIO_STREAM_STATE_DISCONNECTED) {

            if (getState() == AAUDIO_STREAM_STATE_DISCONNECTED) {

                ALOGW("processCallbackCommon() data, stream disconnected");

                ALOGW("processCallbackCommon() data, stream disconnected");

                // This will kill the stream and prevent it from being restarted.

                // That is OK because the stream is disconnected.

                audioBuffer->size = SIZE_STOP_CALLBACKS;

                audioBuffer->size = SIZE_STOP_CALLBACKS;

            } else if (!mCallbackEnabled.load()) {

            } else if (!mCallbackEnabled.load()) {

                ALOGW("processCallbackCommon() no data because callback disabled");

                ALOGW("processCallbackCommon() no data because callback disabled, set size=0");

                audioBuffer->size = SIZE_STOP_CALLBACKS;

                // Do NOT use SIZE_STOP_CALLBACKS here because that will kill the stream and

                // prevent it from being restarted. This can occur because of a race condition

                // caused by Legacy callbacks running after the track is "stopped".

                audioBuffer->size = 0;

            } else {

            } else {

                if (audioBuffer->frameCount == 0) {

                if (audioBuffer->frameCount == 0) {

                    ALOGW("processCallbackCommon() data, frameCount is zero");

                    ALOGW("processCallbackCommon() data, frameCount is zero");