From 214d9bbfc474964f6e95356d108b6cf540e7d1ce Mon Sep 17 00:00:00 2001 From: w30076694 Date: Mon, 16 Jun 2025 11:56:42 +0800 Subject: [PATCH] Add new OHOS_ABILITY_LENS_EQUIVALENT_FOCUS TAG Signed-off-by: w30076694 --- camera/metadata/include/camera_device_ability_items.h | 7 +++++++ camera/metadata/include/camera_metadata_item_info.h | 1 + camera/metadata/src/camera_metadata_info.cpp | 1 + 3 files changed, 9 insertions(+) diff --git a/camera/metadata/include/camera_device_ability_items.h b/camera/metadata/include/camera_device_ability_items.h index dda13add..011e0a39 100644 --- a/camera/metadata/include/camera_device_ability_items.h +++ b/camera/metadata/include/camera_device_ability_items.h @@ -1284,6 +1284,13 @@ typedef enum camera_device_metadata_tag { * (i.e. int32[] ...) */ OHOS_ABILITY_EQUIVALENT_FOCUS, + /** + * ohos.ability.lensEquivalentFocus [static, int32[], public] + * + * camera device property, report current camera support lens equivalent focus + * (i.e. int32[] ...) + */ + OHOS_ABILITY_LENS_EQUIVALENT_FOCUS, /** * ohos.ability.focusDistance [static, float, public] * diff --git a/camera/metadata/include/camera_metadata_item_info.h b/camera/metadata/include/camera_metadata_item_info.h index fe1751f7..14b85f56 100644 --- a/camera/metadata/include/camera_metadata_item_info.h +++ b/camera/metadata/include/camera_metadata_item_info.h @@ -326,6 +326,7 @@ static item_info_t g_ohosDeviceFocus[OHOS_DEVICE_FOCUS_END - OHOS_DEVICE_FOCUS_S OHOS_DEVICE_FOCUS_START] = {"lensInfoMinimumFocusDistance", META_TYPE_FLOAT, 1}, [OHOS_CONTROL_LENS_FOCUS_DISTANCE - OHOS_DEVICE_FOCUS_START] = {"lensFocusDistance", META_TYPE_FLOAT, 1}, [OHOS_ABILITY_EQUIVALENT_FOCUS - OHOS_DEVICE_FOCUS_START] = {"equivalentFocus", META_TYPE_INT32, -1}, + [OHOS_ABILITY_LENS_EQUIVALENT_FOCUS - OHOS_DEVICE_FOCUS_START] = {"lensEquivalentFocus", META_TYPE_INT32, -1}, [OHOS_CONTROL_FOCUS_DISTANCE - OHOS_DEVICE_FOCUS_START] = {"controlFocusDistance", META_TYPE_FLOAT, 1}, [OHOS_ABILITY_FOCUS_RANGE_TYPES - OHOS_DEVICE_FOCUS_START] = {"focusRangeTypes", META_TYPE_BYTE, -1}, diff --git a/camera/metadata/src/camera_metadata_info.cpp b/camera/metadata/src/camera_metadata_info.cpp index fc302d20..c2782fff 100644 --- a/camera/metadata/src/camera_metadata_info.cpp +++ b/camera/metadata/src/camera_metadata_info.cpp @@ -203,6 +203,7 @@ const std::vector g_metadataTags = { OHOS_ABILITY_LENS_INFO_MINIMUM_FOCUS_DISTANCE, OHOS_CONTROL_LENS_FOCUS_DISTANCE, OHOS_ABILITY_EQUIVALENT_FOCUS, + OHOS_ABILITY_LENS_EQUIVALENT_FOCUS, OHOS_CONTROL_FOCUS_DISTANCE, OHOS_ABILITY_FOCUS_RANGE_TYPES, OHOS_CONTROL_FOCUS_RANGE_TYPE, -- Gitee