commit 9264fe9f909ff0f64a7ae62fa9a7580a6e7b92e4
author Chien-Yu Chen <cychen@google.com> Sat Apr 29 03:28:46 2017 +0000
committer Chien-Yu Chen <cychen@google.com> Sat Apr 29 03:28:46 2017 +0000
tree 03048e659747ba4c085a59ae89e74475b89502fd
parent e412598dc8036e8c0a182ec8fea662b95161868a

Revert "QCamera3: Support early shutter callback for HDR+"

This reverts commit e412598dc8036e8c0a182ec8fea662b95161868a.

Change-Id: I4f97e3717ae8e34cc72f2038ea231fc236b65f0a

msm8998/QCamera2/HAL3/QCamera3HWI.cpp

diff --git a/msm8998/QCamera2/HAL3/QCamera3HWI.cpp b/msm8998/QCamera2/HAL3/QCamera3HWI.cpp
index d3d4332..6e3bdae 100644
--- a/msm8998/QCamera2/HAL3/QCamera3HWI.cpp
+++ b/msm8998/QCamera2/HAL3/QCamera3HWI.cpp
@@ -3481,7 +3481,7 @@
             LOGD("Iterator Frame = %d urgent frame = %d",
                  i->frame_number, urgent_frame_number);
 
-            if ((!i->input_buffer) && (!i->hdrplus) && (i->frame_number < urgent_frame_number) &&
+            if ((!i->input_buffer) && (i->frame_number < urgent_frame_number) &&
                 (i->partial_result_cnt == 0)) {
                 LOGE("Error: HAL missed urgent metadata for frame number %d",
                          i->frame_number);
@@ -4070,8 +4070,8 @@
     // Check what type of request this is.
     bool liveRequest = false;
     if (requestIter->hdrplus) {
-        // HDR+ request's first partial result is sensor timestamp.
-        requestIter->partial_result_cnt++;
+        // HDR+ request doesn't have partial results.
+        requestIter->partial_result_cnt = PARTIAL_RESULT_COUNT;
     } else if (requestIter->input_buffer != nullptr) {
         // Reprocessing request result is the same as settings.
         requestIter->resultMetadata = requestIter->settings;
@@ -14592,20 +14592,6 @@
     gHdrPlusClientOpening = false;
 }
 
-void QCamera3HardwareInterface::onShutter(uint32_t requestId, int64_t apSensorTimestampNs)
-{
-    ALOGV("%s: %d: Received a shutter for HDR+ request %d timestamp %" PRId64, __FUNCTION__,
-            __LINE__, requestId, apSensorTimestampNs);
-
-    CameraMetadata metadata;
-    metadata.update(ANDROID_SENSOR_TIMESTAMP, &apSensorTimestampNs, 1);
-
-    // Send shutter to framework.
-    pthread_mutex_lock(&mMutex);
-    handlePendingResultsWithLock(requestId, metadata.release());
-    pthread_mutex_unlock(&mMutex);
-}
-
 void QCamera3HardwareInterface::onCaptureResult(pbcamera::CaptureResult *result,
         const camera_metadata_t &resultMetadata) {
     if (result != nullptr) {