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

Commit 430f4d5f authored by Yamit Mehta's avatar Yamit Mehta Committed by Linux Build Service Account
Browse files

audioTrack: Handle track invalidate on wait for stream done 

If a track invalidate is called while waiting for a stream done,
AudioCallback handler is notified with event EVENT_STREAM_END.
This might cause substantial data loss for offload playback. Try to
recreate the track if needed.

Change-Id: Ie663c85e92588ddfd8d633f4bf5024f9fa4f5c2e
parent a50186bc

media/libmedia/AudioTrack.cpp

+30 −30
Original line number Diff line number Diff line
@@ -1931,6 +1931,36 @@ nsecs_t AudioTrack::processAudioBuffer() 
    // get anchor time to account for callbacks.

    const nsecs_t timeBeforeCallbacks = systemTime();



    // perform callbacks while unlocked

    if (newUnderrun) {

        mCbf(EVENT_UNDERRUN, mUserData, NULL);

    }

    while (loopCountNotifications > 0) {

        mCbf(EVENT_LOOP_END, mUserData, NULL);

        --loopCountNotifications;

    }

    if (flags & CBLK_BUFFER_END) {

        mCbf(EVENT_BUFFER_END, mUserData, NULL);

    }

    if (markerReached) {

        mCbf(EVENT_MARKER, mUserData, &markerPosition);

    }

    while (newPosCount > 0) {

        size_t temp = newPosition.value(); // FIXME size_t != uint32_t

        mCbf(EVENT_NEW_POS, mUserData, &temp);

        newPosition += updatePeriod;

        newPosCount--;

    }



    if (mObservedSequence != sequence) {

        mObservedSequence = sequence;

        mCbf(EVENT_NEW_IAUDIOTRACK, mUserData, NULL);

        // for offloaded tracks, just wait for the upper layers to recreate the track

        if (isOffloadedOrDirect()) {

            return NS_INACTIVE;

        }

    }



    if (waitStreamEnd) {

        // FIXME:  Instead of blocking in proxy->waitStreamEndDone(), Callback thread

        // should wait on proxy futex and handle CBLK_STREAM_END_DONE within this function
@@ -1969,36 +1999,6 @@ nsecs_t AudioTrack::processAudioBuffer() 
        return 0;

    }



    // perform callbacks while unlocked

    if (newUnderrun) {

        mCbf(EVENT_UNDERRUN, mUserData, NULL);

    }

    while (loopCountNotifications > 0) {

        mCbf(EVENT_LOOP_END, mUserData, NULL);

        --loopCountNotifications;

    }

    if (flags & CBLK_BUFFER_END) {

        mCbf(EVENT_BUFFER_END, mUserData, NULL);

    }

    if (markerReached) {

        mCbf(EVENT_MARKER, mUserData, &markerPosition);

    }

    while (newPosCount > 0) {

        size_t temp = newPosition.value(); // FIXME size_t != uint32_t

        mCbf(EVENT_NEW_POS, mUserData, &temp);

        newPosition += updatePeriod;

        newPosCount--;

    }



    if (mObservedSequence != sequence) {

        mObservedSequence = sequence;

        mCbf(EVENT_NEW_IAUDIOTRACK, mUserData, NULL);

        // for offloaded tracks, just wait for the upper layers to recreate the track

        if (isOffloadedOrDirect()) {

            return NS_INACTIVE;

        }

    }



    // if inactive, then don't run me again until re-started

    if (!active) {

        return NS_INACTIVE;