From: Shuzhen Wang <shuzhenwang@google.com>
Date: Mon, 27 Feb 2017 07:29:04 +0000 (-0800)
Subject: Camera: Fix error check for HFR timestamp
X-Git-Tag: android-x86-8.1-r1~355^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=403044af4352f6d56aef0fb9548d2bfce56d3127;p=android-x86%2Fframeworks-av.git

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
---

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 ")",