From eee2ec2b14fc561a39e3b0368c582e50c435386b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=95=8F=E6=9D=B0?= Date: Sun, 7 Sep 2025 07:32:20 +0000 Subject: [PATCH 1/4] =?UTF-8?q?camera=E5=91=8A=E8=AD=A6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 吴敏杰 --- camera/metadata/include/metadata_utils.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/camera/metadata/include/metadata_utils.h b/camera/metadata/include/metadata_utils.h index 4ff73ea2..c0e7c42d 100644 --- a/camera/metadata/include/metadata_utils.h +++ b/camera/metadata/include/metadata_utils.h @@ -71,6 +71,9 @@ void MetadataUtils::ReadData(T &data, int32_t &index, const std::vector constexpr uint32_t typeLen = sizeof(T); uint8_t array[typeLen] = {0}; T *ptr = nullptr; + if (cameraAbility.empty()) { + return; + } for (size_t j = 0; j < sizeof(T); j++) { array[j] = cameraAbility.at(index++); } -- Gitee From 1888a36fcdae18797435a9359f2edacff001dacc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=95=8F=E6=9D=B0?= Date: Mon, 8 Sep 2025 07:43:27 +0000 Subject: [PATCH 2/4] update camera/metadata/include/metadata_utils.h. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 吴敏杰 --- camera/metadata/include/metadata_utils.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/camera/metadata/include/metadata_utils.h b/camera/metadata/include/metadata_utils.h index c0e7c42d..30f054c7 100644 --- a/camera/metadata/include/metadata_utils.h +++ b/camera/metadata/include/metadata_utils.h @@ -72,6 +72,8 @@ void MetadataUtils::ReadData(T &data, int32_t &index, const std::vector uint8_t array[typeLen] = {0}; T *ptr = nullptr; if (cameraAbility.empty()) { + ptr = reinterpret_cast(array); + data = *ptr; return; } for (size_t j = 0; j < sizeof(T); j++) { -- Gitee From 7272a918d4cc38922b005e77254c559cbd6148ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=95=8F=E6=9D=B0?= Date: Wed, 10 Sep 2025 03:19:25 +0000 Subject: [PATCH 3/4] d MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 吴敏杰 --- camera/metadata/src/camera_metadata_info.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/camera/metadata/src/camera_metadata_info.cpp b/camera/metadata/src/camera_metadata_info.cpp index 558d789b..1d481cfd 100644 --- a/camera/metadata/src/camera_metadata_info.cpp +++ b/camera/metadata/src/camera_metadata_info.cpp @@ -1307,6 +1307,10 @@ int CameraMetadata::DeleteCameraMetadataItemByIndex(common_metadata_header_t *ds dst->data_count -= dataBytes; camera_metadata_item_entry_t *metadataItems = GetMetadataItems(dst); + if (metadataItems == nullptr) { + METADATA_ERR_LOG("DeleteCameraMetadataItemByIndex metadataItems is null"); + return CAM_META_INVALID_PARAM; + } for (uint32_t i = 0; i < dst->item_count; i++, ++metadataItems) { if (CalculateCameraMetadataItemDataSize( metadataItems->data_type, metadataItems->count) > 0 && -- Gitee From 161124887d10574ab4f65ac152ab98eb1c3d41f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=95=8F=E6=9D=B0?= Date: Wed, 10 Sep 2025 05:58:59 +0000 Subject: [PATCH 4/4] d MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 吴敏杰 --- camera/metadata/src/camera_metadata_info.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/camera/metadata/src/camera_metadata_info.cpp b/camera/metadata/src/camera_metadata_info.cpp index 1d481cfd..558d789b 100644 --- a/camera/metadata/src/camera_metadata_info.cpp +++ b/camera/metadata/src/camera_metadata_info.cpp @@ -1307,10 +1307,6 @@ int CameraMetadata::DeleteCameraMetadataItemByIndex(common_metadata_header_t *ds dst->data_count -= dataBytes; camera_metadata_item_entry_t *metadataItems = GetMetadataItems(dst); - if (metadataItems == nullptr) { - METADATA_ERR_LOG("DeleteCameraMetadataItemByIndex metadataItems is null"); - return CAM_META_INVALID_PARAM; - } for (uint32_t i = 0; i < dst->item_count; i++, ++metadataItems) { if (CalculateCameraMetadataItemDataSize( metadataItems->data_type, metadataItems->count) > 0 && -- Gitee