commit 2fea89efd3963bb1054c99613ff501609a745037
author Shuzhen Wang <shuzhenwang@google.com> Mon May 08 17:02:15 2017 -0700
committer Shuzhen Wang <shuzhenwang@google.com> Sat Jun 17 01:59:28 2017 +0000
tree 2842cc5ccd39aa944f88b3981546f064bd8c8921
parent d9c58dacf807a63f3bff6c57f4eb786d3ca4b538

QCamera2: HAL3: Do not send PRIVATE metadata if there is no input stream

Test: Camera CTS
Bug: 34737817
Change-Id: I728c1a368bb5ade13a062b0edf7cfa9ede5890d3

msm8998/QCamera2/HAL3/QCamera3HWI.cpp

diff --git a/msm8998/QCamera2/HAL3/QCamera3HWI.cpp b/msm8998/QCamera2/HAL3/QCamera3HWI.cpp
index 22f43f7..f06e0c3 100644
--- a/msm8998/QCamera2/HAL3/QCamera3HWI.cpp
+++ b/msm8998/QCamera2/HAL3/QCamera3HWI.cpp
@@ -7507,10 +7507,13 @@
         camMetadata.update(ANDROID_JPEG_THUMBNAIL_SIZE, fwk_thumb_size, 2);
     }
 
-    IF_META_AVAILABLE(int32_t, privateData, CAM_INTF_META_PRIVATE_DATA, metadata) {
-        camMetadata.update(QCAMERA3_PRIVATEDATA_REPROCESS,
-                privateData,
-                MAX_METADATA_PRIVATE_PAYLOAD_SIZE_IN_BYTES / sizeof(int32_t));
+    // Skip reprocess metadata if there is no input stream.
+    if (mInputStreamInfo.dim.width > 0 && mInputStreamInfo.dim.height > 0) {
+        IF_META_AVAILABLE(int32_t, privateData, CAM_INTF_META_PRIVATE_DATA, metadata) {
+            camMetadata.update(QCAMERA3_PRIVATEDATA_REPROCESS,
+                    privateData,
+                    MAX_METADATA_PRIVATE_PAYLOAD_SIZE_IN_BYTES / sizeof(int32_t));
+        }
     }
 
     IF_META_AVAILABLE(int32_t, meteringMode, CAM_INTF_PARM_AEC_ALGO_TYPE, metadata) {