From 7b1f2ea6cde31b551fbfab517aa03348dad588bc Mon Sep 17 00:00:00 2001
From: jango <wangjian422@huawei.com>
Date: Thu, 15 May 2025 14:49:39 +0800
Subject: [PATCH] New sketch adapt

Signed-off-by: jango <wangjian422@huawei.com>
---
 .../include/camera_device_ability_items.h     | 21 +++++++++++++++++++
 .../include/camera_metadata_item_info.h       |  4 ++++
 camera/metadata/src/camera_metadata_info.cpp  |  2 ++
 3 files changed, 27 insertions(+)

diff --git a/camera/metadata/include/camera_device_ability_items.h b/camera/metadata/include/camera_device_ability_items.h
index fe32ee4d..99a98d36 100644
--- a/camera/metadata/include/camera_device_ability_items.h
+++ b/camera/metadata/include/camera_device_ability_items.h
@@ -175,6 +175,13 @@ typedef enum camera_device_metadata_tag {
      * (i.e. float[]: mode, ratio, mode, ratio, ...)
      */
     OHOS_ABILITY_SKETCH_REFERENCE_FOV_RATIO,
+    /**
+     * ohos.ability.sketchInfoNotification [static, int[], public]
+     *
+     * camera device property, report all supported sketch info notify modes of the current camera device
+     * (i.e. int[]: mode1, mode2, ...)
+     */
+    OHOS_ABILITY_SKETCH_INFO_NOTIFICATION,
     /**
      * ohos.ability.cameraFoldScreen [static, enum, public]
      *
@@ -394,6 +401,13 @@ typedef enum camera_device_metadata_tag {
      * (i.e. float[]: [px, py] ...)
      */
     OHOS_STATUS_SKETCH_POINT,
+    /**
+     * ohos.status.sketchStreamInfo [static, float[], public]
+     *
+     * camera device property, query current camera sketch stream info
+     * (i.e. float[]: [OHOS_CAMERA_SKETCH_STREAM_UNSUPPORT/OHOS_CAMERA_SKETCH_STREAM_SUPPORT, zoom ratio])
+     */
+    OHOS_STATUS_SKETCH_STREAM_INFO,
     /**
      * ohos.ability.lowLightBoost [static, int32[], public]
      *
@@ -2983,4 +2997,11 @@ enum CameraConcurrentType {
     OHOS_CAMERA_COCURRENT_FULL = 0,
     OHOS_CAMERA_COCURRENT_LIIMITED,
 };
+
+// OHOS_STATUS_SKETCH_STREAM_INFO
+enum SketchStreamInfoStatus {
+    OHOS_CAMERA_SKETCH_STREAM_UNSUPPORT = 0,
+    OHOS_CAMERA_SKETCH_STREAM_SUPPORT
+};
+
 #endif
diff --git a/camera/metadata/include/camera_metadata_item_info.h b/camera/metadata/include/camera_metadata_item_info.h
index 784d67dc..313e735a 100644
--- a/camera/metadata/include/camera_metadata_item_info.h
+++ b/camera/metadata/include/camera_metadata_item_info.h
@@ -67,6 +67,8 @@ static item_info_t g_ohosCameraProperties[OHOS_CAMERA_PROPERTIES_END - OHOS_CAME
         OHOS_CAMERA_PROPERTIES_START] = {"sketchEnableRatio",       META_TYPE_FLOAT, -1},
     [OHOS_ABILITY_SKETCH_REFERENCE_FOV_RATIO -
         OHOS_CAMERA_PROPERTIES_START] = {"sketchReferenceFovRatio", META_TYPE_FLOAT, -1},
+    [OHOS_ABILITY_SKETCH_INFO_NOTIFICATION -
+        OHOS_CAMERA_PROPERTIES_START] = {"sketchInfoNotification", META_TYPE_INT32, -1},
     [OHOS_ABILITY_CAMERA_FOLDSCREEN_TYPE -
         OHOS_CAMERA_PROPERTIES_START] = {"cameraFoldscreenType", META_TYPE_BYTE, 1},
     [OHOS_ABILITY_AVAILABLE_COLOR_SPACES -
@@ -127,6 +129,8 @@ static item_info_t g_ohosCameraProperties[OHOS_CAMERA_PROPERTIES_END - OHOS_CAME
         OHOS_CAMERA_PROPERTIES_START] = {"tripodDetectionStatus", META_TYPE_BYTE, 1},
     [OHOS_STATUS_SKETCH_POINT -
         OHOS_CAMERA_PROPERTIES_START] = {"sketchPoint", META_TYPE_FLOAT, 1},
+    [OHOS_STATUS_SKETCH_STREAM_INFO -
+        OHOS_CAMERA_PROPERTIES_START] = {"sketchStreamInfo", META_TYPE_FLOAT, -1},
     [OHOS_ABILITY_LOW_LIGHT_BOOST -
         OHOS_CAMERA_PROPERTIES_START] = {"lowLightBoost", META_TYPE_INT32, -1},
     [OHOS_CONTROL_LOW_LIGHT_DETECT -
diff --git a/camera/metadata/src/camera_metadata_info.cpp b/camera/metadata/src/camera_metadata_info.cpp
index d781d953..332db3e1 100644
--- a/camera/metadata/src/camera_metadata_info.cpp
+++ b/camera/metadata/src/camera_metadata_info.cpp
@@ -45,6 +45,7 @@ const std::vector<uint32_t> g_metadataTags = {
     OHOS_ABILITY_CAMERA_MODES,
     OHOS_ABILITY_SKETCH_ENABLE_RATIO,
     OHOS_ABILITY_SKETCH_REFERENCE_FOV_RATIO,
+    OHOS_ABILITY_SKETCH_INFO_NOTIFICATION,
     OHOS_ABILITY_CAMERA_FOLDSCREEN_TYPE,
     OHOS_ABILITY_AVAILABLE_COLOR_SPACES,
     OHOS_ABILITY_NIGHT_MODE_SUPPORTED_EXPOSURE_TIME,
@@ -75,6 +76,7 @@ const std::vector<uint32_t> g_metadataTags = {
     OHOS_CONTROL_TRIPOD_STABLITATION,
     OHOS_STATUS_TRIPOD_DETECTION_STATUS,
     OHOS_STATUS_SKETCH_POINT,
+    OHOS_STATUS_SKETCH_STREAM_INFO,
     OHOS_ABILITY_LOW_LIGHT_BOOST,
     OHOS_CONTROL_LOW_LIGHT_DETECT,
     OHOS_CONTROL_LOW_LIGHT_BOOST,
-- 
Gitee