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

Commit 293e9346 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix an issue that the syncTimestampToDisplayLocked incorrect" into tm-qpr-dev am: c0ef8df2 

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



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

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);

        }