diff --git a/camera/metadata/include/camera_device_ability_items.h b/camera/metadata/include/camera_device_ability_items.h index 2f3c26ebcbaa02e9a445b8f4523ba4be308ea3ea..786c640468e62299f736863a7436addc1fef765d 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] * @@ -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..811e15fedb3c37472cff8c4f0ac46f53225ce7e0 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 - @@ -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 d7dc536a3eeda098d842870ffe084faff254f27f..7e9df120e2a64543ce82f1377254eeef88679828 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, @@ -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,