From 0af3c84901902d02b6f065183492b4f0ff1f29ee Mon Sep 17 00:00:00 2001 From: zhanglei Date: Tue, 2 Sep 2025 15:13:06 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=B8=E6=9C=BA=E6=A1=86=E6=9E=B6=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E9=AB=98=E6=80=A7=E8=83=BD=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhanglei --- .../include/camera_device_ability_items.h | 20 +++++++++++++++++++ .../include/camera_metadata_item_info.h | 4 ++++ camera/metadata/src/camera_metadata_info.cpp | 2 ++ 3 files changed, 26 insertions(+) diff --git a/camera/metadata/include/camera_device_ability_items.h b/camera/metadata/include/camera_device_ability_items.h index 6793ed0e..b851d910 100644 --- a/camera/metadata/include/camera_device_ability_items.h +++ b/camera/metadata/include/camera_device_ability_items.h @@ -1156,6 +1156,20 @@ typedef enum camera_device_metadata_tag { * (i.e. uint8: 0-false/1-true ...) */ OHOS_CONTROL_SYSTEM_CAPTURE, + /** + * ohos.ability.photoQualityPrioritization [static, int32_t[], public] + * + * camera device property, report current camera support photo quality prioritization + * (i.e. int32_t[] ...) + */ + OHOS_ABILITY_PHOTO_QUALITY_PRIORITIZATION, + /** + * ohos.control.photoQualityPrioritization [static, byte, public] + * + * camera device property, set current camera photo quality prioritization + * (i.e. byte ...) + */ + OHOS_CONTROL_PHOTO_QUALITY_PRIORITIZATION, /** * ohos.device.controlEnd * @@ -3102,4 +3116,10 @@ enum SketchStreamInfoStatus { OHOS_CAMERA_SKETCH_STREAM_SUPPORT }; +// OHOS_ABILITY_PHOTO_QUALITY_PRIORITIZATION +// OHOS_CONTROL_PHOTO_QUALITY_PRIORITIZATION +typedef enum camera_photo_quality_prioritization { + OHOS_CAMERA_PHOTO_QUALITY_PRIORITIZATION_HIGH_QUALITY = 0, + OHOS_CAMERA_PHOTO_QUALITY_PRIORITIZATION_SPEED, +} camera_photo_quality_prioritization_t; #endif diff --git a/camera/metadata/include/camera_metadata_item_info.h b/camera/metadata/include/camera_metadata_item_info.h index 3a08cb40..b47560a2 100644 --- a/camera/metadata/include/camera_metadata_item_info.h +++ b/camera/metadata/include/camera_metadata_item_info.h @@ -301,6 +301,10 @@ static item_info_t g_ohosCameraControl[OHOS_DEVICE_CONTROL_END - OHOS_DEVICE_CON OHOS_DEVICE_CONTROL_START] = {"qualityPrioritization", META_TYPE_BYTE, 1}, [OHOS_CONTROL_SYSTEM_CAPTURE - OHOS_DEVICE_CONTROL_START] = {"cameraControlSystemCapture", META_TYPE_BYTE, 1}, + [OHOS_ABILITY_PHOTO_QUALITY_PRIORITIZATION - + OHOS_DEVICE_CONTROL_START] = {"supportedPhotoQualityPrioritizationValues", META_TYPE_INT32, -1}, + [OHOS_CONTROL_PHOTO_QUALITY_PRIORITIZATION - + OHOS_DEVICE_CONTROL_START] = {"photoQualityPrioritization", META_TYPE_BYTE, 1}, }; static item_info_t g_ohosDeviceExposure[OHOS_DEVICE_EXPOSURE_END - OHOS_DEVICE_EXPOSURE_START] = { diff --git a/camera/metadata/src/camera_metadata_info.cpp b/camera/metadata/src/camera_metadata_info.cpp index ee8c3b58..558d789b 100644 --- a/camera/metadata/src/camera_metadata_info.cpp +++ b/camera/metadata/src/camera_metadata_info.cpp @@ -184,6 +184,8 @@ const std::vector g_metadataTags = { OHOS_CONTROL_SYSTEM_CAPTURE, OHOS_CONTROL_AUTO_VIDEO_FRAME_RATE, OHOS_ABILITY_AUTO_VIDEO_FRAME_RATE, + OHOS_ABILITY_PHOTO_QUALITY_PRIORITIZATION, + OHOS_CONTROL_PHOTO_QUALITY_PRIORITIZATION, // Camera device image acquisition related OHOS_ABILITY_DEVICE_AVAILABLE_EXPOSUREMODES, -- Gitee