diff --git a/camera/metadata/include/camera_device_ability_items.h b/camera/metadata/include/camera_device_ability_items.h index 9887eef4b40a32e166f3fd41b8704eeba41d1813..40a5ebe5018a086f1383be22afb27037b544620f 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, /** diff --git a/camera/metadata/include/camera_metadata_item_info.h b/camera/metadata/include/camera_metadata_item_info.h index d8ae181e63fe415cfcc9df2562390ba2804511e2..48fa48fc7a24e1da5f5343bc00867c6a47853e2a 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_INT32, 1}, }; static item_info_t g_ohosCameraSensor[OHOS_CAMERA_SENSOR_END - OHOS_CAMERA_SENSOR_START] = { diff --git a/camera/sequenceable/buffer_handle/BUILD.gn b/camera/sequenceable/buffer_handle/BUILD.gn index c53b2f22a60568a5316f594c5183ff007324ab6c..429fd18b4a4d9dda18120fb159009701de823d67 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 b70c1455aa336703514bd98196d4d553691fcd05..330d7f2a6246d91f4a5288faa605e00d629b3277 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 = [ @@ -39,6 +40,5 @@ ohos_shared_library("libbuffer_producer_sequenceable_1.0") { install_images = [ system_base_dir ] relative_install_dir = "chipset-sdk" subsystem_name = "hdf" - innerapi_tags = [ "chipsetsdk" ] part_name = "drivers_interface_camera" } diff --git a/camera/sequenceable/map_data/BUILD.gn b/camera/sequenceable/map_data/BUILD.gn index dd6a107179c5d8ca4cc5ed52a4bfe4fcc3245a9b..b066264e5de9bc34eb5c3a41a75d1d1dd00740e4 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 = [