diff --git a/camera/metadata/include/camera_device_ability_items.h b/camera/metadata/include/camera_device_ability_items.h index 2f3c26ebcbaa02e9a445b8f4523ba4be308ea3ea..6793ed0e261c87e2e4729d0a802156d6dac81fa7 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, uint8, public] + * + * camera device property, set current camera device system application capture + * (i.e. uint8: 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 babd8dd2cbd2afe5c9841390221a95d36182c12a..3a08cb40bb762fc1337510e08c07954c88cf1300 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 b5944047e29533e600c6150891482e8227d9e66e..ee8c3b583e844aeedc538b34da4d78c2d31f99dc 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,