commit 6174b7950f7fe2e593556e742c7c6ab68e1e57f8
author Shuzhen Wang <shuzhenwang@google.com> Fri Jul 15 15:25:16 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 15 15:25:16 2016 +0000
tree 6995ed744ddf92f43b08b08ed9052733713ad0bd
parent d1def918b20dbccf98a4096a7fe98058db6e9eef
parent 174f59d261701f7ee915cd29c792830508d27f7c

Merge "QCamera2: HAL3: Move AF mode to the same metadata section as AF state" into nyc-mr1-dev

QCamera2/HAL3/QCamera3HWI.cpp

diff --git a/QCamera2/HAL3/QCamera3HWI.cpp b/QCamera2/HAL3/QCamera3HWI.cpp
index f40ac5b..6494dfe 100644
--- a/QCamera2/HAL3/QCamera3HWI.cpp
+++ b/QCamera2/HAL3/QCamera3HWI.cpp
@@ -5707,10 +5707,22 @@
                 hAeRegions->rect.height);
     }
 
+    IF_META_AVAILABLE(uint32_t, focusMode, CAM_INTF_PARM_FOCUS_MODE, metadata) {
+        int val = lookupFwkName(FOCUS_MODES_MAP, METADATA_MAP_SIZE(FOCUS_MODES_MAP), *focusMode);
+        if (NAME_NOT_FOUND != val) {
+            uint8_t fwkAfMode = (uint8_t)val;
+            camMetadata.update(ANDROID_CONTROL_AF_MODE, &fwkAfMode, 1);
+            LOGD("Metadata : ANDROID_CONTROL_AF_MODE %d", val);
+        } else {
+            LOGH("Metadata not found : ANDROID_CONTROL_AF_MODE %d",
+                    val);
+        }
+    }
+
     IF_META_AVAILABLE(uint32_t, afState, CAM_INTF_META_AF_STATE, metadata) {
         uint8_t fwk_afState = (uint8_t) *afState;
         camMetadata.update(ANDROID_CONTROL_AF_STATE, &fwk_afState, 1);
-        LOGD("urgent Metadata : ANDROID_CONTROL_AF_STATE %u", *afState);
+        LOGD("Metadata : ANDROID_CONTROL_AF_STATE %u", *afState);
     }
 
     IF_META_AVAILABLE(float, focusDistance, CAM_INTF_META_LENS_FOCUS_DISTANCE, metadata) {
@@ -6071,18 +6083,6 @@
         LOGD("urgent Metadata : ANDROID_CONTROL_AE_STATE %u", *ae_state);
     }
 
-    IF_META_AVAILABLE(uint32_t, focusMode, CAM_INTF_PARM_FOCUS_MODE, metadata) {
-        int val = lookupFwkName(FOCUS_MODES_MAP, METADATA_MAP_SIZE(FOCUS_MODES_MAP), *focusMode);
-        if (NAME_NOT_FOUND != val) {
-            uint8_t fwkAfMode = (uint8_t)val;
-            camMetadata.update(ANDROID_CONTROL_AF_MODE, &fwkAfMode, 1);
-            LOGD("urgent Metadata : ANDROID_CONTROL_AF_MODE %d", val);
-        } else {
-            LOGH("urgent Metadata not found : ANDROID_CONTROL_AF_MODE %d",
-                    val);
-        }
-    }
-
     IF_META_AVAILABLE(cam_trigger_t, af_trigger, CAM_INTF_META_AF_TRIGGER, metadata) {
         camMetadata.update(ANDROID_CONTROL_AF_TRIGGER,
                 &af_trigger->trigger, 1);