From 1e0708b1abc16b3adb71866fd43047c8f898f841 Mon Sep 17 00:00:00 2001 From: zhanglei Date: Fri, 22 Aug 2025 15:26:01 +0800 Subject: [PATCH] add zoom center point hdi tag Signed-off-by: zhanglei --- .../include/camera_device_ability_items.h | 20 +++++++++++++++++++ .../include/camera_metadata_item_info.h | 4 ++++ camera/metadata/src/camera_metadata_info.cpp | 2 ++ 3 files changed, 26 insertions(+) diff --git a/camera/metadata/include/camera_device_ability_items.h b/camera/metadata/include/camera_device_ability_items.h index 2f3c26eb..a3a32d7c 100644 --- a/camera/metadata/include/camera_device_ability_items.h +++ b/camera/metadata/include/camera_device_ability_items.h @@ -1538,6 +1538,20 @@ typedef enum camera_device_metadata_tag { * (i.e. byte ...) */ OHOS_ABILITY_CAMERA_ZOOM_BEZIER_CURVC_POINT, + /** + * ohos.control.zoomCenterPointSupported [static, enum, public] + * + * camera device property, report current camera zoom center point supported + * (i.e. enum: NOT_SUPPORTED/SUPPORTED...) + */ + OHOS_ABILITY_ZOOM_CENTER_POINT_SUPPORTED, + /** + * ohos.control.zoomCenterPoint [static, float[], public] + * + * camera device property, set current camera zoom center point + * (i.e. float[] ...) + */ + OHOS_CONTROL_ZOOM_CENTER_POINT, /** * ohos.device.zoomEnd * @@ -3088,4 +3102,10 @@ enum SketchStreamInfoStatus { OHOS_CAMERA_SKETCH_STREAM_SUPPORT }; +// OHOS_ABILITY_ZOOM_CENTER_POINT_SUPPORTED +enum ZoomCenterPointSuppotedType { + OHOS_CAMERA_ZOOM_CENTER_POINT_NOT_SUPPORTED = 0, + OHOS_CAMERA_ZOOM_CENTER_POINT_SUPPORTED +}; + #endif diff --git a/camera/metadata/include/camera_metadata_item_info.h b/camera/metadata/include/camera_metadata_item_info.h index babd8dd2..df1f326b 100644 --- a/camera/metadata/include/camera_metadata_item_info.h +++ b/camera/metadata/include/camera_metadata_item_info.h @@ -373,6 +373,10 @@ static item_info_t g_ohosDeviceZoom[OHOS_DEVICE_ZOOM_END - OHOS_DEVICE_ZOOM_STAR [OHOS_STATUS_CAMERA_ZOOM_PERFORMANCE - OHOS_DEVICE_ZOOM_START] = {"statusZoomPerformance", META_TYPE_UINT32, -1}, [OHOS_ABILITY_CAMERA_ZOOM_BEZIER_CURVC_POINT - OHOS_DEVICE_ZOOM_START] = {"zoomBezierCurvePoint", META_TYPE_FLOAT, -1}, + [OHOS_ABILITY_ZOOM_CENTER_POINT_SUPPORTED - + OHOS_DEVICE_ZOOM_START] = {"zoomCenterPointSupported", META_TYPE_BYTE, 1}, + [OHOS_CONTROL_ZOOM_CENTER_POINT - + OHOS_DEVICE_ZOOM_START] = {"zoomCenterPoint", META_TYPE_FLOAT, -1}, }; diff --git a/camera/metadata/src/camera_metadata_info.cpp b/camera/metadata/src/camera_metadata_info.cpp index d7dc536a..fc83413e 100644 --- a/camera/metadata/src/camera_metadata_info.cpp +++ b/camera/metadata/src/camera_metadata_info.cpp @@ -238,6 +238,8 @@ const std::vector g_metadataTags = { OHOS_ABILITY_CAMERA_ZOOM_PERFORMANCE, OHOS_STATUS_CAMERA_ZOOM_PERFORMANCE, OHOS_ABILITY_CAMERA_ZOOM_BEZIER_CURVC_POINT, + OHOS_ABILITY_ZOOM_CENTER_POINT_SUPPORTED, + OHOS_CONTROL_ZOOM_CENTER_POINT, // Camera flow control related OHOS_ABILITY_STREAM_AVAILABLE_BASIC_CONFIGURATIONS, -- Gitee