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

Commit cbbb9a50 authored by Andy Hung's avatar Andy Hung Committed by android-build-merger
Browse files

Merge \"Only read timestamps from HAL if not FastCapture\" into nyc-mr1-dev 

am: b5aac433

Change-Id: I35220717ab32936421a8dc906c4af2cac979a5f5
parents 012ff16b b5aac433

services/audioflinger/Threads.cpp

+2 −1
Original line number Original line Diff line number Diff line
@@ -6246,7 +6246,8 @@ reacquire_wakelock: 
        mTimestamp.mTimeNs[ExtendedTimestamp::LOCATION_SERVER] = systemTime();

        mTimestamp.mTimeNs[ExtendedTimestamp::LOCATION_SERVER] = systemTime();





        // Update server timestamp with kernel stats

        // Update server timestamp with kernel stats

        if (mInput->stream->get_capture_position != nullptr) {

        if (mInput->stream->get_capture_position != nullptr

                && mPipeSource.get() == nullptr /* don't obtain for FastCapture, could block */) {

            int64_t position, time;

            int64_t position, time;

            int ret = mInput->stream->get_capture_position(mInput->stream, &position, &time);

            int ret = mInput->stream->get_capture_position(mInput->stream, &position, &time);

            if (ret == NO_ERROR) {

            if (ret == NO_ERROR) {