From 403044af4352f6d56aef0fb9548d2bfce56d3127 Mon Sep 17 00:00:00 2001 From: Shuzhen Wang Date: Sun, 26 Feb 2017 23:29:04 -0800 Subject: [PATCH] Camera: Fix error check for HFR timestamp With Camera HAL sending empty metadata for HFR batching, service shouldn't check matching timestamp for empty metadata. Test: Manually test high speed recording Bug: 35775704 Change-Id: I68f3c16ea9a91f15c70e406540764b02cb6951e1 --- services/camera/libcameraservice/device3/Camera3Device.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/services/camera/libcameraservice/device3/Camera3Device.cpp b/services/camera/libcameraservice/device3/Camera3Device.cpp index 204f68cbec..71e52af1da 100644 --- a/services/camera/libcameraservice/device3/Camera3Device.cpp +++ b/services/camera/libcameraservice/device3/Camera3Device.cpp @@ -2513,8 +2513,9 @@ void Camera3Device::removeInFlightRequestIfReadyLocked(int idx) { (request.haveResultMetadata && shutterTimestamp != 0))) { ATRACE_ASYNC_END("frame capture", frameNumber); - // Sanity check - if sensor timestamp matches shutter timestamp - if (request.requestStatus == OK && + // Sanity check - if sensor timestamp matches shutter timestamp in the + // case of request having callback. + if (request.hasCallback && request.requestStatus == OK && sensorTimestamp != shutterTimestamp) { SET_ERR("sensor timestamp (%" PRId64 ") for frame %d doesn't match shutter timestamp (%" PRId64 ")", -- 2.11.0