From 7620985e20defbcc848b19b7610d3063acfb24cd Mon Sep 17 00:00:00 2001 From: banana_pluto Date: Tue, 26 Aug 2025 20:35:17 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=BA=95=E5=B1=82?= =?UTF-8?q?=E5=8A=A8=E6=80=81=E7=94=B3=E8=AF=B7=E5=86=85=E5=AD=98TAG?= 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 | 7 +++++++ camera/metadata/include/camera_metadata_item_info.h | 2 ++ camera/metadata/src/camera_metadata_info.cpp | 1 + 3 files changed, 10 insertions(+) diff --git a/camera/metadata/include/camera_device_ability_items.h b/camera/metadata/include/camera_device_ability_items.h index 2f3c26eb..ca1c4aab 100644 --- a/camera/metadata/include/camera_device_ability_items.h +++ b/camera/metadata/include/camera_device_ability_items.h @@ -1634,6 +1634,13 @@ typedef enum camera_device_metadata_tag { * (i.e. uint8: 0-false/1-true ...) */ OHOS_ABILITY_ROTATION_IN_IPS_SUPPORTED, + /** + * ohos.control.delayAloc [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..220a534d 100644 --- a/camera/metadata/include/camera_metadata_item_info.h +++ b/camera/metadata/include/camera_metadata_item_info.h @@ -403,6 +403,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 d7dc536a..396fcaed 100644 --- a/camera/metadata/src/camera_metadata_info.cpp +++ b/camera/metadata/src/camera_metadata_info.cpp @@ -254,6 +254,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 85cb29c175a098dd1b0c1b25797726ec325296fa Mon Sep 17 00:00:00 2001 From: banana_pluto Date: Tue, 26 Aug 2025 20:53:02 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=BA=95=E5=B1=82?= =?UTF-8?q?=E5=8A=A8=E6=80=81=E7=94=B3=E8=AF=B7=E5=86=85=E5=AD=98TAG=20cod?= =?UTF-8?q?echeck?= 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/camera/metadata/include/camera_device_ability_items.h b/camera/metadata/include/camera_device_ability_items.h index ca1c4aab..452c11a1 100644 --- a/camera/metadata/include/camera_device_ability_items.h +++ b/camera/metadata/include/camera_device_ability_items.h @@ -1635,7 +1635,7 @@ typedef enum camera_device_metadata_tag { */ OHOS_ABILITY_ROTATION_IN_IPS_SUPPORTED, /** - * ohos.control.delayAloc [static, uint8, public] + * ohos.control.delayAlloc [static, uint8, public] * * camera device property, whether delay alloc. * (i.e. uint8: 0-false/1-true ...) -- Gitee From c6e7765e3d18a8ced966ec1ca7a836582cd758f0 Mon Sep 17 00:00:00 2001 From: banana_pluto Date: Wed, 27 Aug 2025 10:10:07 +0800 Subject: [PATCH 3/3] =?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 --- camera/metadata/include/camera_device_ability_items.h | 7 +++++++ camera/metadata/include/camera_metadata_item_info.h | 2 ++ camera/metadata/src/camera_metadata_info.cpp | 1 + 3 files changed, 10 insertions(+) diff --git a/camera/metadata/include/camera_device_ability_items.h b/camera/metadata/include/camera_device_ability_items.h index 452c11a1..786c6404 100644 --- a/camera/metadata/include/camera_device_ability_items.h +++ b/camera/metadata/include/camera_device_ability_items.h @@ -1100,6 +1100,13 @@ typedef enum camera_device_metadata_tag { * (i.e. enum: begin/end ...) */ OHOS_CONTROL_BURST_CAPTURE, + /** + * 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.control.cameraUsedAsPosition [static, byte, public] * diff --git a/camera/metadata/include/camera_metadata_item_info.h b/camera/metadata/include/camera_metadata_item_info.h index 220a534d..811e15fe 100644 --- a/camera/metadata/include/camera_metadata_item_info.h +++ b/camera/metadata/include/camera_metadata_item_info.h @@ -285,6 +285,8 @@ static item_info_t g_ohosCameraControl[OHOS_DEVICE_CONTROL_END - OHOS_DEVICE_CON [OHOS_CONTROL_HIGH_QUALITY_MODE - OHOS_DEVICE_CONTROL_START] = {"highQualityMode", META_TYPE_BYTE, 1}, [OHOS_CONTROL_BURST_CAPTURE - OHOS_DEVICE_CONTROL_START] = {"cameraControlBurstCapture", META_TYPE_BYTE, 1}, + [OHOS_CONTROL_SYSTEM_CAPTURE - + OHOS_DEVICE_CONTROL_START] = {"cameraControlSystemCapture", META_TYPE_BYTE, 1}, [OHOS_CONTROL_CAMERA_USED_AS_POSITION - OHOS_DEVICE_CONTROL_START] = {"cameraUsedAsPosition", META_TYPE_BYTE, 1}, [OHOS_CONTROL_CAMERA_SESSION_USAGE - diff --git a/camera/metadata/src/camera_metadata_info.cpp b/camera/metadata/src/camera_metadata_info.cpp index 396fcaed..7e9df120 100644 --- a/camera/metadata/src/camera_metadata_info.cpp +++ b/camera/metadata/src/camera_metadata_info.cpp @@ -174,6 +174,7 @@ const std::vector g_metadataTags = { OHOS_CONTROL_SENSOR_WB_VALUE, OHOS_CONTROL_HIGH_QUALITY_MODE, OHOS_CONTROL_BURST_CAPTURE, + OHOS_CONTROL_SYSTEM_CAPTURE, OHOS_CONTROL_CAMERA_USED_AS_POSITION, OHOS_CONTROL_CAMERA_SESSION_USAGE, OHOS_CONTROL_EJECT_RETRY, -- Gitee