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

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

Merge "AudioTrack: Fix offload timeout" am: 2526b75e 

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



Change-Id: I54645353b24e6abe107afaa9e0254cee0d44cacc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ed2e7d7f 2526b75e

media/libaudioclient/AudioTrack.cpp

+13 −1
Original line number Diff line number Diff line
@@ -2484,11 +2484,22 @@ nsecs_t AudioTrack::processAudioBuffer() 
        timeout.tv_sec = WAIT_STREAM_END_TIMEOUT_SEC;

        timeout.tv_nsec = 0;



        // Use timestamp progress to safeguard we don't falsely time out.

        AudioTimestamp timestamp{};

        const bool isTimestampValid = getTimestamp(timestamp) == OK;

        const auto frameCount = isTimestampValid ? timestamp.mPosition : 0;



        status_t status = proxy->waitStreamEndDone(&timeout);

        switch (status) {

        case TIMED_OUT:

            if (isTimestampValid

                    && getTimestamp(timestamp) == OK && frameCount != timestamp.mPosition) {

                ALOGD("%s: waitStreamEndDone retrying", __func__);

                break;  // we retry again (and recheck possible state change).

            }

            [[fallthrough]];

        case NO_ERROR:

        case DEAD_OBJECT:

        case TIMED_OUT:

            if (status != DEAD_OBJECT) {

                // for DEAD_OBJECT, we do not send a EVENT_STREAM_END after stop();

                // instead, the application should handle the EVENT_NEW_IAUDIOTRACK.
@@ -2506,6 +2517,7 @@ nsecs_t AudioTrack::processAudioBuffer() 
                }

            }

            if (waitStreamEnd && status != DEAD_OBJECT) {

               ALOGV("%s: waitStreamEndDone complete", __func__);

               return NS_INACTIVE;

            }

            break;