summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2020-04-07 23:14:50 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2020-04-07 23:14:50 +0000
commitbc7c5411d6fdd81ad8705db48cfa69b1bc3ff4e0 (patch)
tree8edbc85b977a3b36a36adae7e882a7088e7d8fc3
parent8236194904ccd415096c655999575c147b58fc27 (diff)
parent8e7be728199c9123744860ce80921fb605501c61 (diff)
downloadframeworks_av-bc7c5411d6fdd81ad8705db48cfa69b1bc3ff4e0.tar.gz
frameworks_av-bc7c5411d6fdd81ad8705db48cfa69b1bc3ff4e0.tar.bz2
frameworks_av-bc7c5411d6fdd81ad8705db48cfa69b1bc3ff4e0.zip
Snap for 6373393 from 8e7be728199c9123744860ce80921fb605501c61 to qt-qpr3-release
Change-Id: I139a49e004d31c1b3d23a957687a600b2aade901
-rw-r--r--services/camera/libcameraservice/device3/Camera3Device.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/device3/Camera3Device.cpp b/services/camera/libcameraservice/device3/Camera3Device.cpp
index 4227a3b9de..93e18cfee3 100644
--- a/services/camera/libcameraservice/device3/Camera3Device.cpp
+++ b/services/camera/libcameraservice/device3/Camera3Device.cpp
@@ -3529,6 +3529,8 @@ void Camera3Device::sendCaptureResult(CameraMetadata &pendingMetadata,
frameNumber);
return;
}
+ nsecs_t sensorTimestamp = timestamp.data.i64[0];
+
for (auto& physicalMetadata : captureResult.mPhysicalMetadatas) {
camera_metadata_entry timestamp =
physicalMetadata.mPhysicalCameraMetadata.find(ANDROID_SENSOR_TIMESTAMP);
@@ -3583,7 +3585,7 @@ void Camera3Device::sendCaptureResult(CameraMetadata &pendingMetadata,
CameraMetadata(m.mPhysicalCameraMetadata));
}
mTagMonitor.monitorMetadata(TagMonitor::RESULT,
- frameNumber, timestamp.data.i64[0], captureResult.mMetadata,
+ frameNumber, sensorTimestamp, captureResult.mMetadata,
monitoredPhysicalMetadata);
insertResultLocked(&captureResult, frameNumber);