commit 685339b1a1438a96b658b5d2a92efc6040e8b2dc
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Dec 21 00:20:59 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Dec 21 00:20:59 2022 +0000
tree 45f6e5e8a3559f6cbd9d364e2ce91e17ff9f6b53
parent 341c75f6ce823a7d5642af8ecf0055ad9621d5d7
parent c0ef8df2faf9a23a2fbba1b9a908f2f8d6e2ca92

Snap for 9424627 from c0ef8df2faf9a23a2fbba1b9a908f2f8d6e2ca92 to tm-qpr2-release

Change-Id: If25f6a096320c6963b34b8dc30b03e5b0a465755

services/camera/libcameraservice/device3/Camera3OutputStream.cpp

diff --git a/services/camera/libcameraservice/device3/Camera3OutputStream.cpp b/services/camera/libcameraservice/device3/Camera3OutputStream.cpp
index 84b5aa4..396104c 100644
--- a/services/camera/libcameraservice/device3/Camera3OutputStream.cpp
+++ b/services/camera/libcameraservice/device3/Camera3OutputStream.cpp
@@ -1526,7 +1526,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);
         }