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

Commit 985793c9 authored by Andy Hung's avatar Andy Hung Committed by Automerger Merge Worker
Browse files

Merge "AudioFlinger: Fix read timestamp if HAL returns error" into rvc-dev am: 2db02506

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

Change-Id: I0e53815cf10029676b63110b3a5e8b8c57bf62f0
parents b484a03d 2db02506
Loading
Loading
Loading
Loading
+4 −2
Original line number Diff line number Diff line
@@ -7366,8 +7366,10 @@ reacquire_wakelock:

        // Update server timestamp with server stats
        // systemTime() is optional if the hardware supports timestamps.
        if (framesRead >= 0) {
            mTimestamp.mPosition[ExtendedTimestamp::LOCATION_SERVER] += framesRead;
            mTimestamp.mTimeNs[ExtendedTimestamp::LOCATION_SERVER] = lastIoEndNs;
        }

        // Update server timestamp with kernel stats
        if (mPipeSource.get() == nullptr /* don't obtain for FastCapture, could block */) {