commit 5306c55ec7920e9bcba164855dc7163b256cbf10
author Mansoor Aftab <maftab@codeaurora.org> Thu Aug 20 19:57:33 2015 -0700
committer Zhijun He <zhijunhe@google.com> Thu Aug 20 20:03:33 2015 -0700
tree fd68f4d63293cb3927b3164c748ca276907ba6f7
parent 77e1315e1bfa44fc305c24f88c38e9efe865158e

Camera3: Disable CDS for EIS

This is a workaround to handle exclusivity between CDS and EIS.

Bug: 23393150
Change-Id: I0b88781a9cf07a8a498060f9e9f9f67652a154cf

QCamera2/HAL3/QCamera3HWI.cpp

diff --git a/QCamera2/HAL3/QCamera3HWI.cpp b/QCamera2/HAL3/QCamera3HWI.cpp
index 21ce2b9..abefb6a 100755
--- a/QCamera2/HAL3/QCamera3HWI.cpp
+++ b/QCamera2/HAL3/QCamera3HWI.cpp
@@ -2902,7 +2902,8 @@
         //Disable CDS for HFR mode and if mPprocBypass = true.
         //CDS is a session parameter in the backend/ISP, so need to be set/reset
         //after every configure_stream
-        if(CAMERA3_STREAM_CONFIGURATION_CONSTRAINED_HIGH_SPEED_MODE == mOpMode) {
+        if((CAMERA3_STREAM_CONFIGURATION_CONSTRAINED_HIGH_SPEED_MODE == mOpMode) ||
+                (DIS_ENABLE == vsMode)) {
             int32_t cds = CAM_CDS_MODE_OFF;
             if (ADD_SET_PARAM_ENTRY_TO_BATCH(mParameters,
                     CAM_INTF_PARM_CDS_MODE, cds))
@@ -4482,7 +4483,7 @@
                 }
             }
         } else {
-            CDBG_HIGH("%s: Invalid stream count %d in CDS_DATA", __func__, cnt);
+            CDBG("%s: Invalid stream count %d in CDS_DATA", __func__, cnt);
         }
         camMetadata.update(QCAMERA3_CDS_INFO,
                 (uint8_t *)&cdsDataOverride,
@@ -7876,6 +7877,7 @@
 
     // CDS for non-HFR mode
     if ((mOpMode != CAMERA3_STREAM_CONFIGURATION_CONSTRAINED_HIGH_SPEED_MODE) &&
+            !(m_bEisEnable && m_bEisSupportedSize) &&
             frame_settings.exists(QCAMERA3_CDS_MODE)) {
         int32_t *fwk_cds = frame_settings.find(QCAMERA3_CDS_MODE).data.i32;
         if ((CAM_CDS_MODE_MAX <= *fwk_cds) || (0 > *fwk_cds)) {