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

Commit d64be957 authored by Phil Burk's avatar Phil Burk Committed by android-build-merger
Browse files

Merge "aaudio: fix reset of frame counters on stop, flush" into pi-dev 

am: 0dd0949c

Change-Id: I014db88b882dfefc079c55b6a3b0a6596a1bc5cf
parents 812511db 0dd0949c

media/libaaudio/src/legacy/AudioStreamRecord.cpp

+1 −1
Original line number Diff line number Diff line
@@ -350,7 +350,7 @@ aaudio_result_t AudioStreamRecord::requestStop() { 
    mTimestampPosition.set(getFramesRead());

    mAudioRecord->stop();

    mCallbackEnabled.store(false);

    mFramesRead.reset32();

    mFramesWritten.reset32(); // service writes frames, service position reset on flush

    mTimestampPosition.reset32();

    // Pass false to prevent errorCallback from being called after disconnect

    // when app has already requested a stop().

media/libaaudio/src/legacy/AudioStreamTrack.cpp

+2 −2
Original line number Diff line number Diff line
@@ -310,7 +310,7 @@ aaudio_result_t AudioStreamTrack::requestFlush() { 
    setState(AAUDIO_STREAM_STATE_FLUSHING);

    incrementFramesRead(getFramesWritten() - getFramesRead());

    mAudioTrack->flush();

    mFramesWritten.reset32();

    mFramesRead.reset32(); // service reads frames, service position reset on flush

    mTimestampPosition.reset32();

    return AAUDIO_OK;

}
@@ -324,7 +324,7 @@ aaudio_result_t AudioStreamTrack::requestStop() { 
    setState(AAUDIO_STREAM_STATE_STOPPING);

    incrementFramesRead(getFramesWritten() - getFramesRead()); // TODO review

    mTimestampPosition.set(getFramesWritten());

    mFramesWritten.reset32();

    mFramesRead.reset32(); // service reads frames, service position reset on stop

    mTimestampPosition.reset32();

    mAudioTrack->stop();

    mCallbackEnabled.store(false);