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

Commit 8ab62b1b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix an issue that the syncTimestampToDisplayLocked incorrect" am: c7abb66e 

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



Change-Id: I963bccad53dd2650a4c093aa96d2bd1b45077358
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ecc90a61 c7abb66e

services/camera/libcameraservice/device3/Camera3OutputStream.cpp

+2 −1
Original line number Diff line number Diff line
@@ -1526,7 +1526,8 @@ nsecs_t Camera3OutputStream::syncTimestampToDisplayLocked(nsecs_t t) { 
                vsyncTime.deadlineTimestamp >= currentTime &&

                ((!cameraDisplayInSync && vsyncTime.expectedPresentationTime > minPresentT) ||

                 (cameraDisplayInSync && vsyncTime.expectedPresentationTime >

                mLastPresentTime + minInterval + biasForShortDelay * kTimelineThresholdNs))) {

                mLastPresentTime + minInterval +

                    static_cast<nsecs_t>(biasForShortDelay * kTimelineThresholdNs)))) {

            expectedPresentT = vsyncTime.expectedPresentationTime;

            minDiff = std::abs(vsyncTime.expectedPresentationTime - idealPresentT);

        }