From 69cca607b6d0c77e2d87dc21447a29d081c1729a Mon Sep 17 00:00:00 2001 From: banana_pluto Date: Wed, 27 Aug 2025 20:13:06 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E7=9B=B8=E6=9C=BA=E6=8B=8D=E7=85=A7TAG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: banana_pluto --- .../metadata/include/camera_device_ability_items.h | 14 ++++++++++++++ .../metadata/include/camera_metadata_item_info.h | 4 ++++ camera/metadata/src/camera_metadata_info.cpp | 2 ++ 3 files changed, 20 insertions(+) diff --git a/camera/metadata/include/camera_device_ability_items.h b/camera/metadata/include/camera_device_ability_items.h index 2f3c26eb..8e0520a8 100644 --- a/camera/metadata/include/camera_device_ability_items.h +++ b/camera/metadata/include/camera_device_ability_items.h @@ -1149,6 +1149,13 @@ typedef enum camera_device_metadata_tag { * (i.e. byte ...) */ OHOS_CONTROL_QUALITY_PRIORITIZATION, + /** + * ohos.control.systemCapture [static, enum, public] + * + * camera device property, set current camera device system application capture + * (i.e. enum: 0-false/1-true ...) + */ + OHOS_CONTROL_SYSTEM_CAPTURE, /** * ohos.device.controlEnd * @@ -1634,6 +1641,13 @@ typedef enum camera_device_metadata_tag { * (i.e. uint8: 0-false/1-true ...) */ OHOS_ABILITY_ROTATION_IN_IPS_SUPPORTED, + /** + * ohos.control.delayAlloc [static, uint8, public] + * + * camera device property, whether delay alloc. + * (i.e. uint8: 0-false/1-true ...) + */ + OHOS_CONTROL_DELAY_ALLOC, /** * ohos.ability.prerecord [static, int32[], public] * diff --git a/camera/metadata/include/camera_metadata_item_info.h b/camera/metadata/include/camera_metadata_item_info.h index babd8dd2..3a08cb40 100644 --- a/camera/metadata/include/camera_metadata_item_info.h +++ b/camera/metadata/include/camera_metadata_item_info.h @@ -299,6 +299,8 @@ static item_info_t g_ohosCameraControl[OHOS_DEVICE_CONTROL_END - OHOS_DEVICE_CON OHOS_DEVICE_CONTROL_START] = {"sunBlockBlendColor", META_TYPE_BYTE, 1}, [OHOS_CONTROL_QUALITY_PRIORITIZATION - OHOS_DEVICE_CONTROL_START] = {"qualityPrioritization", META_TYPE_BYTE, 1}, + [OHOS_CONTROL_SYSTEM_CAPTURE - + OHOS_DEVICE_CONTROL_START] = {"cameraControlSystemCapture", META_TYPE_BYTE, 1}, }; static item_info_t g_ohosDeviceExposure[OHOS_DEVICE_EXPOSURE_END - OHOS_DEVICE_EXPOSURE_START] = { @@ -403,6 +405,8 @@ static item_info_t g_ohosStreamAbility[OHOS_STREAM_ABILITY_END - OHOS_STREAM_ABI OHOS_STREAM_ABILITY_START] = {"offlineControlValue", META_TYPE_BYTE, -1}, [OHOS_ABILITY_ROTATION_IN_IPS_SUPPORTED - OHOS_STREAM_ABILITY_START] = {"rotationInIpsSupported", META_TYPE_BYTE, 1}, + [OHOS_CONTROL_DELAY_ALLOC - + OHOS_STREAM_ABILITY_START] = {"delayAlloc", META_TYPE_BYTE, 1}, }; static item_info_t g_ohosStreamControl[OHOS_STREAM_CONTROL_END - OHOS_STREAM_CONTROL_START] = { diff --git a/camera/metadata/src/camera_metadata_info.cpp b/camera/metadata/src/camera_metadata_info.cpp index b5944047..ee8c3b58 100644 --- a/camera/metadata/src/camera_metadata_info.cpp +++ b/camera/metadata/src/camera_metadata_info.cpp @@ -181,6 +181,7 @@ const std::vector g_metadataTags = { OHOS_CONTROL_SUN_BLOCK_PREVIEW_TYPE, OHOS_CONTROL_SUN_BLOCK_BLEND_COLOR, OHOS_CONTROL_QUALITY_PRIORITIZATION, + OHOS_CONTROL_SYSTEM_CAPTURE, OHOS_CONTROL_AUTO_VIDEO_FRAME_RATE, OHOS_ABILITY_AUTO_VIDEO_FRAME_RATE, @@ -254,6 +255,7 @@ const std::vector g_metadataTags = { OHOS_ABILITY_CHANGETO_OFFLINE_STREAM_OPEATOR, OHOS_CONTROL_CHANGETO_OFFLINE_STREAM_OPEATOR, OHOS_ABILITY_ROTATION_IN_IPS_SUPPORTED, + OHOS_CONTROL_DELAY_ALLOC, OHOS_JPEG_GPS_COORDINATES, OHOS_JPEG_GPS_PROCESSING_METHOD, -- Gitee From 43e0d0a23e31d07b2232fdd0f90ace979eac6ac5 Mon Sep 17 00:00:00 2001 From: banana_pluto Date: Thu, 28 Aug 2025 16:15:52 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=9B=B8=E6=9C=BA?= =?UTF-8?q?=E6=8B=8D=E7=85=A7TAG=E7=B1=BB=E5=9E=8B=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: banana_pluto --- camera/metadata/include/camera_device_ability_items.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/camera/metadata/include/camera_device_ability_items.h b/camera/metadata/include/camera_device_ability_items.h index 8e0520a8..6793ed0e 100644 --- a/camera/metadata/include/camera_device_ability_items.h +++ b/camera/metadata/include/camera_device_ability_items.h @@ -1150,10 +1150,10 @@ typedef enum camera_device_metadata_tag { */ OHOS_CONTROL_QUALITY_PRIORITIZATION, /** - * ohos.control.systemCapture [static, enum, public] + * ohos.control.systemCapture [static, uint8, public] * * camera device property, set current camera device system application capture - * (i.e. enum: 0-false/1-true ...) + * (i.e. uint8: 0-false/1-true ...) */ OHOS_CONTROL_SYSTEM_CAPTURE, /** -- Gitee