commit 65328604dedbb0c01937efa0e831e62a191869f8
author Andy Hung <hunga@google.com> Mon Apr 06 22:57:50 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 06 22:57:50 2020 +0000
tree 41870604bbdecc2565f81e2e8651dddaca86913b
parent 9509d74058eda44fb4de1acc3e119e53f78e1ae7
parent e9eb03e9db8f66c711e2824e0f96d1fdc8f727b5

Merge "MediaUtils: Move MemoryLeakTrackUtil.h to the proper library." into rvc-dev

services/camera/libcameraservice/device3/Camera3OutputUtils.cpp

diff --git a/services/camera/libcameraservice/device3/Camera3OutputUtils.cpp b/services/camera/libcameraservice/device3/Camera3OutputUtils.cpp
index 238356e..4c8366f 100644
--- a/services/camera/libcameraservice/device3/Camera3OutputUtils.cpp
+++ b/services/camera/libcameraservice/device3/Camera3OutputUtils.cpp
@@ -246,6 +246,8 @@
                 frameNumber);
         return;
     }
+    nsecs_t sensorTimestamp = timestamp.data.i64[0];
+
     for (auto& physicalMetadata : captureResult.mPhysicalMetadatas) {
         camera_metadata_entry timestamp =
                 physicalMetadata.mPhysicalCameraMetadata.find(ANDROID_SENSOR_TIMESTAMP);
@@ -337,7 +339,7 @@
                 CameraMetadata(m.mPhysicalCameraMetadata));
     }
     states.tagMonitor.monitorMetadata(TagMonitor::RESULT,
-            frameNumber, timestamp.data.i64[0], captureResult.mMetadata,
+            frameNumber, sensorTimestamp, captureResult.mMetadata,
             monitoredPhysicalMetadata);
 
     insertResultLocked(states, &captureResult, frameNumber);