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

Commit 9ea0680e authored by Glenn Kasten's avatar Glenn Kasten Committed by Android Git Automerger
Browse files

am b177e8a7: Merge "AudioTrack: Prevent stop() from reissuing last marker event" into mnc-dr-dev

* commit 'b177e8a7':
  AudioTrack: Prevent stop() from reissuing last marker event
parents 25bba20e b177e8a7
Loading
Loading
Loading
Loading
+12 −3
Original line number Diff line number Diff line
@@ -523,6 +523,15 @@ status_t AudioTrack::start()
        mTimestampStartupGlitchReported = false;
        mRetrogradeMotionReported = false;

        // If previousState == STATE_STOPPED, we reactivate markers (mMarkerPosition != 0)
        // as the position is reset to 0. This is legacy behavior. This is not done
        // in stop() to avoid a race condition where the last marker event is issued twice.
        // Note: the if is technically unnecessary because previousState == STATE_FLUSHED
        // is only for streaming tracks, and mMarkerReached is already set to false.
        if (previousState == STATE_STOPPED) {
            mMarkerReached = false;
        }

        // For offloaded tracks, we don't know if the hardware counters are really zero here,
        // since the flush is asynchronous and stop may not fully drain.
        // We save the time when the track is started to later verify whether
@@ -592,9 +601,9 @@ void AudioTrack::stop()

    mProxy->interrupt();
    mAudioTrack->stop();
    // the playback head position will reset to 0, so if a marker is set, we need
    // to activate it again
    mMarkerReached = false;

    // Note: legacy handling - stop does not clear playback marker
    // and periodic update counter, but flush does for streaming tracks.

    if (mSharedBuffer != 0) {
        // clear buffer position and loop count.