From a718a3b2fb4b845d0663de22681f2277fd03e869 Mon Sep 17 00:00:00 2001 From: wangruikang Date: Wed, 9 Jul 2025 10:16:18 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=B8=E6=9C=BA=E6=8E=A7=E5=88=B6=E5=99=A8TA?= =?UTF-8?q?G?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangruikang --- .../include/camera_device_ability_items.h | 26 +++++++++++++++++++ .../include/camera_metadata_item_info.h | 4 +++ camera/metadata/src/camera_metadata_info.cpp | 2 ++ 3 files changed, 32 insertions(+) diff --git a/camera/metadata/include/camera_device_ability_items.h b/camera/metadata/include/camera_device_ability_items.h index 011e0a39..52e74d10 100644 --- a/camera/metadata/include/camera_device_ability_items.h +++ b/camera/metadata/include/camera_device_ability_items.h @@ -2337,6 +2337,20 @@ typedef enum camera_device_metadata_tag { * (i.e. enum: NONE/PORTRAIT ...) */ OHOS_CONTROL_COLOR_RESERVATION_TYPE, + /** + * ohos.ability.camera [static, byte, public] + * + * camera device property, report current camera control center supported + * (i.e. byte ...) + */ + OHOS_ABILITY_CONTROL_CENTER_SUPPORTED, + /** + * ohos.ability.camera [static, byte[], public] + * + * camera device property, report current camera support control center effect type + * (i.e. byte[]: ...) + */ + OHOS_ABILITY_CONTROL_CENTER_EFFECT_TYPE, /** * ohos.camera.effectEnd * @@ -3022,6 +3036,18 @@ typedef enum camera_color_reservation_type { OHOS_CAMERA_COLOR_RESERVATION_PORTRAIT } camera_color_reservation_type_t; +// OHOS_ABILITY_CONTROL_CENTER_SUPPORTED +enum ControlCenterSupportedType { + OHOS_CAMERA_CONTROL_CENTER_NOT_SUPPORTED = 0, + OHOS_CAMERA_CONTROL_CENTER_SUPPORTED, +}; + +// OHOS_ABILITY_CONTROL_CENTER_EFFECT_TYPE +enum CameraControlCenterEffectType { + OHOS_CAMERA_CONTROL_CENTER_EFFECT_TYPE_BEAUTY = 0, + OHOS_CAMERA_CONTROL_CENTER_EFFECT_TYPE_PORTRAIT, +}; + // OHOS_CONTROL_PRERECORD_MODE enum CameraPrerecordMode { OHOS_CAMERA_PRERECORD_MODE_ON = 1, diff --git a/camera/metadata/include/camera_metadata_item_info.h b/camera/metadata/include/camera_metadata_item_info.h index 14b85f56..2e0ebc78 100644 --- a/camera/metadata/include/camera_metadata_item_info.h +++ b/camera/metadata/include/camera_metadata_item_info.h @@ -591,6 +591,10 @@ static item_info_t g_ohosPostProcess[OHOS_CAMERA_EFFECT_END - OHOS_CAMERA_EFFECT OHOS_CAMERA_EFFECT_START] = {"colorReservationTypes", META_TYPE_BYTE, -1}, [OHOS_CONTROL_COLOR_RESERVATION_TYPE - OHOS_CAMERA_EFFECT_START] = {"colorReservationType", META_TYPE_BYTE, 1}, + [OHOS_ABILITY_CONTROL_CENTER_SUPPORTED - + OHOS_CAMERA_EFFECT_START] = {"controlCenterSupported", META_TYPE_BYTE, 1}, + [OHOS_ABILITY_CONTROL_CENTER_EFFECT_TYPE - + OHOS_CAMERA_EFFECT_START] = {"controlCenterEffectType", META_TYPE_BYTE, -1}, }; static item_info_t g_ohosCameraSecure[OHOS_CAMERA_SECURE_END - OHOS_CAMERA_SECURE_START] = { diff --git a/camera/metadata/src/camera_metadata_info.cpp b/camera/metadata/src/camera_metadata_info.cpp index 807ed8a4..f02d4651 100644 --- a/camera/metadata/src/camera_metadata_info.cpp +++ b/camera/metadata/src/camera_metadata_info.cpp @@ -350,6 +350,8 @@ const std::vector g_metadataTags = { OHOS_MOVING_PHOTO_END, OHOS_ABILITY_COLOR_RESERVATION_TYPES, OHOS_CONTROL_COLOR_RESERVATION_TYPE, + OHOS_ABILITY_CONTROL_CENTER_SUPPORTED, + OHOS_ABILITY_CONTROL_CENTER_EFFECT_TYPE, // camera secure related OHOS_CONTROL_SECURE_FACE_MODE, -- Gitee