From b42cde07708990d75c68c951ac5381b0fc6142f8 Mon Sep 17 00:00:00 2001 From: liufeng Date: Wed, 10 Jul 2024 11:40:37 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E8=BF=98=E5=8E=9Fall=5Fdependent=5Fconfigs?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: liufeng --- camera/sequenceable/buffer_handle/BUILD.gn | 2 ++ camera/sequenceable/buffer_producer/BUILD.gn | 1 + camera/sequenceable/map_data/BUILD.gn | 1 + 3 files changed, 4 insertions(+) diff --git a/camera/sequenceable/buffer_handle/BUILD.gn b/camera/sequenceable/buffer_handle/BUILD.gn index c53b2f22..429fd18b 100644 --- a/camera/sequenceable/buffer_handle/BUILD.gn +++ b/camera/sequenceable/buffer_handle/BUILD.gn @@ -24,6 +24,8 @@ config("buffer_handle_sequenceable_config") { ohos_shared_library("libbuffer_handle_sequenceable_1.0") { sources = [ "buffer_handle_sequenceable.cpp" ] + all_dependent_configs = [ ":buffer_handle_sequenceable_config" ] + external_deps = [ "c_utils:utils", "hdf_core:libhdf_utils", diff --git a/camera/sequenceable/buffer_producer/BUILD.gn b/camera/sequenceable/buffer_producer/BUILD.gn index b70c1455..d0e11bad 100644 --- a/camera/sequenceable/buffer_producer/BUILD.gn +++ b/camera/sequenceable/buffer_producer/BUILD.gn @@ -25,6 +25,7 @@ config("camera_sequenceable_config") { ohos_shared_library("libbuffer_producer_sequenceable_1.0") { sources = [ "buffer_producer_sequenceable.cpp" ] + all_dependent_configs = [ ":camera_sequenceable_config" ] public_configs = [ ":camera_sequenceable_config" ] external_deps = [ diff --git a/camera/sequenceable/map_data/BUILD.gn b/camera/sequenceable/map_data/BUILD.gn index dd6a1071..b066264e 100644 --- a/camera/sequenceable/map_data/BUILD.gn +++ b/camera/sequenceable/map_data/BUILD.gn @@ -24,6 +24,7 @@ config("map_data_sequenceable_config") { ohos_shared_library("libmap_data_sequenceable_1.0") { sources = [ "map_data_sequenceable.cpp" ] + all_dependent_configs = [ ":map_data_sequenceable_config" ] public_configs = [ ":map_data_sequenceable_config" ] external_deps = [ -- Gitee From 8a654ea1d82cdc6fc11eb24f8ff94ef47c922ab4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E4=B8=B0?= Date: Mon, 15 Jul 2024 02:08:48 +0000 Subject: [PATCH 2/6] update camera/metadata/include/camera_metadata_item_info.h. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 刘丰 --- camera/metadata/include/camera_metadata_item_info.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/camera/metadata/include/camera_metadata_item_info.h b/camera/metadata/include/camera_metadata_item_info.h index d8ae181e..55f503ec 100644 --- a/camera/metadata/include/camera_metadata_item_info.h +++ b/camera/metadata/include/camera_metadata_item_info.h @@ -99,7 +99,7 @@ static item_info_t g_ohosCameraProperties[OHOS_CAMERA_PROPERTIES_END - OHOS_CAME [OHOS_ABILITY_CAMERA_FOLD_STATUS - OHOS_CAMERA_PROPERTIES_START] = {"cameraFoldStatus", META_TYPE_BYTE, 1}, [OHOS_STATUS_CAMERA_OCCLUSION_DETECTION - - OHOS_CAMERA_PROPERTIES_START] = {"cameraStatusOcclusionDetection", META_TYPE_BYTE, 1}, + OHOS_CAMERA_PROPERTIES_START] = {"cameraStatusOcclusionDetection", META_TYPE_UINT32, 1}, }; static item_info_t g_ohosCameraSensor[OHOS_CAMERA_SENSOR_END - OHOS_CAMERA_SENSOR_START] = { -- Gitee From d54abee6df5e026a85d6957a0abe4413e2580c0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E4=B8=B0?= Date: Mon, 15 Jul 2024 02:12:28 +0000 Subject: [PATCH 3/6] update camera/metadata/include/camera_device_ability_items.h. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 刘丰 --- 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 9887eef4..40a5ebe5 100644 --- a/camera/metadata/include/camera_device_ability_items.h +++ b/camera/metadata/include/camera_device_ability_items.h @@ -333,7 +333,7 @@ typedef enum camera_device_metadata_tag { * ohos.ability.muteModes [static, enum[], public] * * camera device property, report current camera mute modes - * (i.e. enum[]: OFF, solidColorBlack, ...) + * (i.e. enum[]: OFF, solidColorBlack ...) */ OHOS_ABILITY_MUTE_MODES, /** -- Gitee From 2fd2241d8f15aa94753a064f0db4f16af8499839 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E4=B8=B0?= Date: Mon, 15 Jul 2024 07:16:36 +0000 Subject: [PATCH 4/6] update camera/sequenceable/buffer_producer/BUILD.gn. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 刘丰 --- camera/sequenceable/buffer_producer/BUILD.gn | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/camera/sequenceable/buffer_producer/BUILD.gn b/camera/sequenceable/buffer_producer/BUILD.gn index d0e11bad..8c7479be 100644 --- a/camera/sequenceable/buffer_producer/BUILD.gn +++ b/camera/sequenceable/buffer_producer/BUILD.gn @@ -39,7 +39,6 @@ ohos_shared_library("libbuffer_producer_sequenceable_1.0") { ldflags = [ "--coverage" ] install_images = [ system_base_dir ] relative_install_dir = "chipset-sdk" - subsystem_name = "hdf" - innerapi_tags = [ "chipsetsdk" ] + subsystem_name = "hdf part_name = "drivers_interface_camera" } -- Gitee From d82dac3ad79d0e6471bd35a2434f6a58b43e2642 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E4=B8=B0?= Date: Mon, 15 Jul 2024 08:07:48 +0000 Subject: [PATCH 5/6] update camera/sequenceable/buffer_producer/BUILD.gn. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 刘丰 --- camera/sequenceable/buffer_producer/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/camera/sequenceable/buffer_producer/BUILD.gn b/camera/sequenceable/buffer_producer/BUILD.gn index 8c7479be..330d7f2a 100644 --- a/camera/sequenceable/buffer_producer/BUILD.gn +++ b/camera/sequenceable/buffer_producer/BUILD.gn @@ -39,6 +39,6 @@ ohos_shared_library("libbuffer_producer_sequenceable_1.0") { ldflags = [ "--coverage" ] install_images = [ system_base_dir ] relative_install_dir = "chipset-sdk" - subsystem_name = "hdf + subsystem_name = "hdf" part_name = "drivers_interface_camera" } -- Gitee From ad8cc990b59f0ce68f71036b0c5d409e75d9ecf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E4=B8=B0?= Date: Tue, 16 Jul 2024 09:29:42 +0000 Subject: [PATCH 6/6] update camera/metadata/include/camera_metadata_item_info.h. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 刘丰 --- camera/metadata/include/camera_metadata_item_info.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/camera/metadata/include/camera_metadata_item_info.h b/camera/metadata/include/camera_metadata_item_info.h index 55f503ec..48fa48fc 100644 --- a/camera/metadata/include/camera_metadata_item_info.h +++ b/camera/metadata/include/camera_metadata_item_info.h @@ -99,7 +99,7 @@ static item_info_t g_ohosCameraProperties[OHOS_CAMERA_PROPERTIES_END - OHOS_CAME [OHOS_ABILITY_CAMERA_FOLD_STATUS - OHOS_CAMERA_PROPERTIES_START] = {"cameraFoldStatus", META_TYPE_BYTE, 1}, [OHOS_STATUS_CAMERA_OCCLUSION_DETECTION - - OHOS_CAMERA_PROPERTIES_START] = {"cameraStatusOcclusionDetection", META_TYPE_UINT32, 1}, + OHOS_CAMERA_PROPERTIES_START] = {"cameraStatusOcclusionDetection", META_TYPE_INT32, 1}, }; static item_info_t g_ohosCameraSensor[OHOS_CAMERA_SENSOR_END - OHOS_CAMERA_SENSOR_START] = { -- Gitee