diff options
| -rw-r--r-- | camera/QCamera2/HAL3/QCamera3HWI.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/camera/QCamera2/HAL3/QCamera3HWI.cpp b/camera/QCamera2/HAL3/QCamera3HWI.cpp index a881f04..652fde8 100644 --- a/camera/QCamera2/HAL3/QCamera3HWI.cpp +++ b/camera/QCamera2/HAL3/QCamera3HWI.cpp @@ -4801,10 +4801,22 @@ QCamera3HardwareInterface::translateFromHalMetadata( 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); + CDBG("%s: Metadata : ANDROID_CONTROL_AF_MODE %d", __func__, val); + } else { + CDBG_HIGH("%s: Metadata not found : ANDROID_CONTROL_AF_MODE %d", + __func__, 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); - CDBG("%s: urgent Metadata : ANDROID_CONTROL_AF_STATE %u", __func__, *afState); + CDBG("%s: Metadata : ANDROID_CONTROL_AF_STATE %u", __func__, *afState); } IF_META_AVAILABLE(float, focusDistance, CAM_INTF_META_LENS_FOCUS_DISTANCE, metadata) { @@ -5124,18 +5136,6 @@ QCamera3HardwareInterface::translateCbUrgentMetadataToResultMetadata CDBG("%s: urgent Metadata : ANDROID_CONTROL_AE_STATE %u", __func__, *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); - CDBG("%s: urgent Metadata : ANDROID_CONTROL_AF_MODE", __func__); - } else { - CDBG_HIGH("%s: urgent Metadata not found : ANDROID_CONTROL_AF_MODE %d", __func__, - 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); |