From d089c583abd8de6dabdd36403585b602fa450366 Mon Sep 17 00:00:00 2001
From: kerongfeng <fengkerong@huawei.com>
Date: Wed, 28 May 2025 03:21:30 +0000
Subject: [PATCH] hdi for mechkit

Signed-off-by: kerongfeng <fengkerong@huawei.com>
---
 .../include/camera_device_ability_items.h     | 29 +++++++++++++++++++
 .../include/camera_metadata_item_info.h       |  4 +++
 camera/metadata/src/camera_metadata_info.cpp  |  3 ++
 3 files changed, 36 insertions(+)

diff --git a/camera/metadata/include/camera_device_ability_items.h b/camera/metadata/include/camera_device_ability_items.h
index 99a98d36..c4297e83 100644
--- a/camera/metadata/include/camera_device_ability_items.h
+++ b/camera/metadata/include/camera_device_ability_items.h
@@ -1333,6 +1333,28 @@ typedef enum camera_device_metadata_tag {
      * (i.e. enum: AUTO/FACE ...)
      */
     OHOS_CONTROL_FOCUS_DRIVEN_TYPE,
+    /**
+     * ohos.ability.focusTrackingMechAvailable [static, enum[], public]
+     *
+     * camera device property, report current camera mech modes
+     * (i.e. enum[]: OFF, not support mech ...)
+     */
+    OHOS_ABILITY_FOCUS_TRACKING_MECH_AVAILABLE,
+    /**
+     * ohos.control.focusTrackingMech [static, enum, public]
+     *
+     * camera device property, set current camera mech mode
+     * (i.e. enum: OFF/ON ...)
+     */
+    OHOS_CONTROL_FOCUS_TRACKING_MECH,
+
+    /**
+     * ohos.control.focusTrackingObjectId [static, enum, public]
+     *
+     * camera device property, report current camera support focus object id
+     * (i.e. enum: AUTO/FACE ...)
+     */
+    OHOS_CONTROL_FOCUS_TRACKING_OBJECT_ID,
     /**
      * ohos.device.focusEnd
      *
@@ -2671,6 +2693,12 @@ typedef enum camera_mute_mode {
     OHOS_CAMERA_MUTE_MODE_SOLID_COLOR_BLACK,
 } camera_mute_mode_t;
 
+// OHOS_ABILITY_MUTE_MODES and OHOS_CONTROL_MECH_MODE enumeration values
+typedef enum camera_mech_mode {
+    OHOS_CAMERA_MECH_MODE_OFF,
+    OHOS_CAMERA_MECH_MODE_ON,
+} camera_mech_mode_t;
+
 // OHOS_ABILITY_SCENE_FILTER_TYPES enumeration values
 typedef enum camera_filter_type {
     OHOS_CAMERA_FILTER_TYPE_OFF = 0,
@@ -2848,6 +2876,7 @@ enum StatisticsDetectType {
     OHOS_CAMERA_SALIENT_DETECT = 6,
     OHOS_CAMERA_BAR_CODE_DETECT = 7,
     OHOS_CAMERA_BASE_FACE_DETECT = 8,
+    OHOS_CAMERA_BASE_TRACKING_REGION = 9,
 };
 
 // OHOS_STATUS_TRIPOD_DETECTION_STATUS
diff --git a/camera/metadata/include/camera_metadata_item_info.h b/camera/metadata/include/camera_metadata_item_info.h
index 313e735a..7106368a 100644
--- a/camera/metadata/include/camera_metadata_item_info.h
+++ b/camera/metadata/include/camera_metadata_item_info.h
@@ -334,6 +334,10 @@ static item_info_t g_ohosDeviceFocus[OHOS_DEVICE_FOCUS_END - OHOS_DEVICE_FOCUS_S
     [OHOS_ABILITY_FOCUS_TRACKING_REGION - OHOS_DEVICE_FOCUS_START] = {"focusTrackingRegion", META_TYPE_INT32, -1},
     [OHOS_ABILITY_FOCUS_DRIVEN_TYPES - OHOS_DEVICE_FOCUS_START] = {"focusDrivenTypes", META_TYPE_BYTE, -1},
     [OHOS_CONTROL_FOCUS_DRIVEN_TYPE - OHOS_DEVICE_FOCUS_START] = {"focusDrivenType", META_TYPE_BYTE, 1},
+    [OHOS_ABILITY_FOCUS_TRACKING_MECH_AVAILABLE -
+        OHOS_DEVICE_FOCUS_START] = {"focusTrackingMechAvailable", META_TYPE_BYTE, 1},
+    [OHOS_CONTROL_FOCUS_TRACKING_MECH - OHOS_DEVICE_FOCUS_START] = {"focusTrackingMech", META_TYPE_BYTE, 1},
+    [OHOS_CONTROL_FOCUS_TRACKING_OBJECT_ID - OHOS_DEVICE_FOCUS_START] = {"focusTrackingObjectId", META_TYPE_INT32, 1},
 };
 
 static item_info_t g_ohosDeviceWhite[OHOS_DEVICE_WHITE_BLANCE_END - OHOS_DEVICE_WHITE_BLANCE_START] = {
diff --git a/camera/metadata/src/camera_metadata_info.cpp b/camera/metadata/src/camera_metadata_info.cpp
index 332db3e1..882f4997 100644
--- a/camera/metadata/src/camera_metadata_info.cpp
+++ b/camera/metadata/src/camera_metadata_info.cpp
@@ -209,6 +209,9 @@ const std::vector<uint32_t> g_metadataTags = {
     OHOS_ABILITY_FOCUS_TRACKING_REGION,
     OHOS_ABILITY_FOCUS_DRIVEN_TYPES,
     OHOS_CONTROL_FOCUS_DRIVEN_TYPE,
+    OHOS_ABILITY_FOCUS_TRACKING_MECH_AVAILABLE,
+    OHOS_CONTROL_FOCUS_TRACKING_MECH,
+    OHOS_CONTROL_FOCUS_TRACKING_OBJECT_ID,
 
     OHOS_ABILITY_DEVICE_AVAILABLE_AWBMODES,
     OHOS_ABILITY_AWB_MODES,
-- 
Gitee