diff options
| author | Shuzhen Wang <shuzhenwang@google.com> | 2016-07-14 11:56:49 -0700 |
|---|---|---|
| committer | Shuzhen Wang <shuzhenwang@google.com> | 2016-07-14 17:23:31 -0700 |
| commit | 204e68c745b70c1978497056f4b1833e42a2584d (patch) | |
| tree | 51eae86cbb6c87aa90f14768d6db2d671aa8158a | |
| parent | 726d4ddd5f93a93f2e4acca3228b55a0cd7dfba3 (diff) | |
| download | bullhead-204e68c745b70c1978497056f4b1833e42a2584d.tar.gz | |
QCamera2: HAL3: Move AF mode to the same metadata section as AF state
This makes sure the mapping between af state and af mode are aligned
with spec. In other words, we make sure af state change aligns with af
mode change.
Bug: 30100921
Change-Id: Ie115eff5fa6fb7602e4218fd92510fe7062269ff
| -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); |