commit 35e1232315ce3334457d7d86e908149977acab01
author Mansoor Aftab <maftab@codeaurora.org> Fri May 23 01:48:20 2014 -0700
committer Vineeta Srivastava <vsrivastava@google.com> Tue May 27 14:27:26 2014 -0700
tree 041fbedad65ad13fc86ad96c1dcf7e734b434cf6
parent b1e45ef0722b16164a905317c46d804c62264c9d

Camera3: Handle AF & AE ROI as regular metadata

AF and AE ROI metadata should arrive at the same time than crop
metadata. Also if only one focus mode is supported AF region is going to
be disable since AF is not supported.

Bug: 15017413
Change-Id: I331d673e75d3d7454ce814c5edd34a7e8f56b2df

QCamera2/HAL3/QCamera3HWI.cpp

diff --git a/QCamera2/HAL3/QCamera3HWI.cpp b/QCamera2/HAL3/QCamera3HWI.cpp
index aba7ab3..6b602dc 100644
--- a/QCamera2/HAL3/QCamera3HWI.cpp
+++ b/QCamera2/HAL3/QCamera3HWI.cpp
@@ -2005,12 +2005,10 @@
 
          // 3A state is sent in urgent partial result (uses quirk)
          case CAM_INTF_META_AEC_PRECAPTURE_ID:
-         case CAM_INTF_META_AEC_ROI:
          case CAM_INTF_META_AEC_STATE:
          case CAM_INTF_PARM_AEC_LOCK:
          case CAM_INTF_PARM_EV:
          case CAM_INTF_PARM_FOCUS_MODE:
-         case CAM_INTF_META_AF_ROI:
          case CAM_INTF_META_AF_STATE:
          case CAM_INTF_META_AF_TRIGGER_ID:
          case CAM_INTF_PARM_WHITE_BALANCE:
@@ -2132,6 +2130,29 @@
              camMetadata.update(ANDROID_SCALER_CROP_REGION, scalerCropRegion, 4);
              break;
           }
+          case CAM_INTF_META_AEC_ROI: {
+            cam_area_t  *hAeRegions =
+                (cam_area_t *)POINTER_OF(CAM_INTF_META_AEC_ROI, metadata);
+            int32_t aeRegions[5];
+            convertToRegions(hAeRegions->rect, aeRegions, hAeRegions->weight);
+            camMetadata.update(ANDROID_CONTROL_AE_REGIONS, aeRegions, 5);
+            ALOGV("%s: Metadata : ANDROID_CONTROL_AE_REGIONS: FWK: [%d, %d, %d, %d] HAL: [%d, %d, %d, %d]",
+                __func__, aeRegions[0], aeRegions[1], aeRegions[2], aeRegions[3],
+                hAeRegions->rect.left, hAeRegions->rect.top, hAeRegions->rect.width, hAeRegions->rect.height);
+            break;
+          }
+          case CAM_INTF_META_AF_ROI:{
+            /*af regions*/
+            cam_area_t  *hAfRegions =
+                (cam_area_t *)POINTER_OF(CAM_INTF_META_AF_ROI, metadata);
+            int32_t afRegions[5];
+            convertToRegions(hAfRegions->rect, afRegions, hAfRegions->weight);
+            camMetadata.update(ANDROID_CONTROL_AF_REGIONS, afRegions, 5);
+            ALOGV("%s: Metadata : ANDROID_CONTROL_AF_REGIONS: FWK: [%d, %d, %d, %d] HAL: [%d, %d, %d, %d]",
+                __func__, afRegions[0], afRegions[1], afRegions[2], afRegions[3],
+                hAfRegions->rect.left, hAfRegions->rect.top, hAfRegions->rect.width, hAfRegions->rect.height);
+            break;
+          }
           case CAM_INTF_META_SENSOR_EXPOSURE_TIME:{
              int64_t  *sensorExpTime =
                 (int64_t *)POINTER_OF(CAM_INTF_META_SENSOR_EXPOSURE_TIME, metadata);
@@ -2453,15 +2474,6 @@
             ALOGV("%s: urgent Metadata : ANDROID_CONTROL_AE_PRECAPTURE_ID", __func__);
           break;
         }
-        case CAM_INTF_META_AEC_ROI: {
-            cam_area_t  *hAeRegions =
-                (cam_area_t *)POINTER_OF(CAM_INTF_META_AEC_ROI, metadata);
-            int32_t aeRegions[5];
-            convertToRegions(hAeRegions->rect, aeRegions, hAeRegions->weight);
-            camMetadata.update(ANDROID_CONTROL_AE_REGIONS, aeRegions, 5);
-            ALOGV("%s: urgent Metadata : ANDROID_CONTROL_AE_REGIONS", __func__);
-            break;
-        }
         case CAM_INTF_META_AEC_STATE:{
             uint8_t *ae_state =
                 (uint8_t *)POINTER_OF(CAM_INTF_META_AEC_STATE, metadata);
@@ -2507,16 +2519,6 @@
             ALOGV("%s: urgent Metadata : ANDROID_CONTROL_AF_MODE", __func__);
             break;
         }
-        case CAM_INTF_META_AF_ROI:{
-            /*af regions*/
-            cam_area_t  *hAfRegions =
-                (cam_area_t *)POINTER_OF(CAM_INTF_META_AF_ROI, metadata);
-            int32_t afRegions[5];
-            convertToRegions(hAfRegions->rect, afRegions, hAfRegions->weight);
-            camMetadata.update(ANDROID_CONTROL_AF_REGIONS, afRegions, 5);
-            ALOGV("%s: urgent Metadata : ANDROID_CONTROL_AF_REGIONS", __func__);
-            break;
-        }
         case CAM_INTF_META_AF_STATE: {
             uint8_t  *afState =
                (uint8_t *)POINTER_OF(CAM_INTF_META_AF_STATE, metadata);
@@ -3293,7 +3295,9 @@
     staticInfo.update(ANDROID_SCALER_AVAILABLE_MAX_DIGITAL_ZOOM,
             &maxZoom, 1);
 
-    int32_t max3aRegions[] = {/*AE*/1,/*AWB*/ 0,/*AF*/ 1};
+    int32_t max3aRegions[3] = {/*AE*/1,/*AWB*/ 0,/*AF*/ 1};
+    if (gCamCapability[cameraId]->supported_focus_modes_cnt == 1)
+        max3aRegions[2] = 0; /* AF not supported */
     staticInfo.update(ANDROID_CONTROL_MAX_REGIONS,
             max3aRegions, 3);