commit 5d1800b45649c7cbe1245093742007c3ad7da690
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Dec 20 19:36:34 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Dec 20 19:36:34 2022 +0000
tree 9a46c8213b4870e756372dd1dd81ee6f3d40bd4b
parent c65b9b090c48abf431183a278caeb1c06fc3cac0
parent 293e93460f0e20ea0866564353e2402fb0c3bc54

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

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

Change-Id: Ic3aa888ba7150e68b0431349c4b4e80807065a1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

services/camera/libcameraservice/device3/Camera3OutputStream.cpp

diff --git a/services/camera/libcameraservice/device3/Camera3OutputStream.cpp b/services/camera/libcameraservice/device3/Camera3OutputStream.cpp
index 1abcd86..557245c 100644
--- a/services/camera/libcameraservice/device3/Camera3OutputStream.cpp
+++ b/services/camera/libcameraservice/device3/Camera3OutputStream.cpp
@@ -1523,7 +1523,8 @@
                 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);
         }