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

Commit 55d1fe30 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:... 

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

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

Change-Id: I09468513090cb4b8dfdaa90cb6cd92181a744a5c
parents 106e203a 985793c9

services/audioflinger/Threads.cpp

+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 */) {