Date: Fri, 07 Apr 2023 08:59:09 +0000
Subject: [PATCH] fix:修复三方相机调用camera1时候不能对焦的情况
Product:T2 MTK8768
Self Test:Pass
Change-Id: I6c9e94031f88d618580aee055b8ebb7d23d02f99
(cherry picked from commit 7cb47496d39f9ad88c4ab447b8d36be6aa9ea78e)
---
diff --git a/mt6765/hal/imgsensor_metadata/gc08a3_mipi_raw/config_static_metadata.lens.gc08a3mipiraw.h b/mt6765/hal/imgsensor_metadata/gc08a3_mipi_raw/config_static_metadata.lens.gc08a3mipiraw.h
index 598a1e7..141a4a9 100644
--- a/mt6765/hal/imgsensor_metadata/gc08a3_mipi_raw/config_static_metadata.lens.gc08a3mipiraw.h
+++ b/mt6765/hal/imgsensor_metadata/gc08a3_mipi_raw/config_static_metadata.lens.gc08a3mipiraw.h
@@ -35,42 +35,42 @@
* any receiver's applicable license agreements with MediaTek Inc.
*/
-
-/*******************************************************
-Author : 樊朋涛
-Version : 20190404Bate
-Run date : 20190628102051
-Mail : [email protected]
-
-0320 : 修复MTK_SENSOR_INFO_PHYSICAL_SIZE的表述及计算错误
-0327 : debug部分独立一个函数出来,
- 修复pixelsize单位错误问题
-
-0404 : 修改bug
- : 增加mt6765 [vivo case] metadata的差异项目.
- : 增加mt6739 [某客户] metadata的差异项目.
- : 增加判断metadata是否build 生效的判断.
-0408 :
- :
- : 增加mt6580 [某客户] metadata的差异项目.
- :
-0411 : 增加对isp30 系列 pca bypass的faq
- : 配置raw16 对应的full size, 防止拍raw 通信失败
- : 4-CELL FOV 1/4 issue patch 导致cam1_scene1_test_yuv_plus_raw-fail
-
-0603 : 增加shutter 要小于framelength的判断,防止shutter > framelength时的异常.
- : 兼容mt6761
- : 增加first pixel 配置.
-
-0619 : 不支援arbitrary crop
- : 修改該sensor的config_static_metadata_scaler.h
- : MTK_SCALER_CROPPING_TYPE_FREEFORM ==> MTK_SCALER_CROPPING_TYPE_CENTER_ONLY.
- : error key:ALPS04653202 ERROR: [0x0]:support no arbitrary cropping
-0621 : 精简提示信息到FAQ里面
-
-
-
-*******************************************************/
+
+/*******************************************************
+Author : 樊朋涛
+Version : 20190404Bate
+Run date : 20190628102051
+Mail : [email protected]
+
+0320 : 修复MTK_SENSOR_INFO_PHYSICAL_SIZE的表述及计算错误
+0327 : debug部分独立一个函数出来,
+ 修复pixelsize单位错误问题
+
+0404 : 修改bug
+ : 增加mt6765 [vivo case] metadata的差异项目.
+ : 增加mt6739 [某客户] metadata的差异项目.
+ : 增加判断metadata是否build 生效的判断.
+0408 :
+ :
+ : 增加mt6580 [某客户] metadata的差异项目.
+ :
+0411 : 增加对isp30 系列 pca bypass的faq
+ : 配置raw16 对应的full size, 防止拍raw 通信失败
+ : 4-CELL FOV 1/4 issue patch 导致cam1_scene1_test_yuv_plus_raw-fail
+
+0603 : 增加shutter 要小于framelength的判断,防止shutter > framelength时的异常.
+ : 兼容mt6761
+ : 增加first pixel 配置.
+
+0619 : 不支援arbitrary crop
+ : 修改該sensor的config_static_metadata_scaler.h
+ : MTK_SCALER_CROPPING_TYPE_FREEFORM ==> MTK_SCALER_CROPPING_TYPE_CENTER_ONLY.
+ : error key:ALPS04653202 ERROR: [0x0]:support no arbitrary cropping
+0621 : 精简提示信息到FAQ里面
+
+
+
+*******************************************************/
@@ -111,11 +111,11 @@
CONFIG_METADATA_END()
//==========================================================================
CONFIG_METADATA_BEGIN(MTK_LENS_INFO_HYPERFOCAL_DISTANCE)
- CONFIG_ENTRY_VALUE((0/5), MFLOAT) // // 5 m hyperfocal distance
+ CONFIG_ENTRY_VALUE((0/5), MFLOAT) // 5 m hyperfocal distance
CONFIG_METADATA_END()
//==========================================================================
CONFIG_METADATA_BEGIN(MTK_LENS_INFO_MINIMUM_FOCUS_DISTANCE)
- CONFIG_ENTRY_VALUE(0/5, MFLOAT) // 5 cm min focus distance
+ CONFIG_ENTRY_VALUE((1.0/0.05), MFLOAT) // 5 cm min focus distance
CONFIG_METADATA_END()
//==========================================================================
CONFIG_METADATA_BEGIN(MTK_LENS_INFO_FOCUS_DISTANCE_CALIBRATION)
diff --git a/mt6765/hal/imgsensor_metadata/gc08a3_mipi_raw/config_static_metadata.tuning_3a.gc08a3mipiraw.h b/mt6765/hal/imgsensor_metadata/gc08a3_mipi_raw/config_static_metadata.tuning_3a.gc08a3mipiraw.h
index 9032b9b..430d4b3 100644
--- a/mt6765/hal/imgsensor_metadata/gc08a3_mipi_raw/config_static_metadata.tuning_3a.gc08a3mipiraw.h
+++ b/mt6765/hal/imgsensor_metadata/gc08a3_mipi_raw/config_static_metadata.tuning_3a.gc08a3mipiraw.h
@@ -142,8 +142,8 @@
CONFIG_METADATA_BEGIN(MTK_CONTROL_AE_AVAILABLE_MODES)
CONFIG_ENTRY_VALUE(MTK_CONTROL_AE_MODE_OFF, MUINT8)
CONFIG_ENTRY_VALUE(MTK_CONTROL_AE_MODE_ON, MUINT8)
- CONFIG_ENTRY_VALUE(MTK_CONTROL_AE_MODE_ON_AUTO_FLASH, MUINT8)
- CONFIG_ENTRY_VALUE(MTK_CONTROL_AE_MODE_ON_ALWAYS_FLASH, MUINT8)
+ //CONFIG_ENTRY_VALUE(MTK_CONTROL_AE_MODE_ON_AUTO_FLASH, MUINT8)
+ //CONFIG_ENTRY_VALUE(MTK_CONTROL_AE_MODE_ON_ALWAYS_FLASH, MUINT8)
//CONFIG_ENTRY_VALUE(MTK_CONTROL_AE_MODE_ON_AUTO_FLASH_REDEYE, MUINT8)
CONFIG_METADATA_END()
//==========================================================================
@@ -226,94 +226,94 @@
CONFIG_METADATA_BEGIN(MTK_CONTROL_MAX_REGIONS)
CONFIG_ENTRY_VALUE(1, MINT32)
CONFIG_ENTRY_VALUE(1, MINT32)
- CONFIG_ENTRY_VALUE(0, MINT32)
+ CONFIG_ENTRY_VALUE(1, MINT32)
CONFIG_METADATA_END()
//==========================================================================
CONFIG_METADATA_BEGIN(MTK_CONTROL_SCENE_MODE_OVERRIDES)
// MTK_CONTROL_SCENE_MODE_FACE_PRIORITY
CONFIG_ENTRY_VALUE(MTK_CONTROL_AE_MODE_OFF, MUINT8)
CONFIG_ENTRY_VALUE(MTK_CONTROL_AWB_MODE_AUTO, MUINT8)
- CONFIG_ENTRY_VALUE(MTK_CONTROL_AF_MODE_OFF, MUINT8)
+ CONFIG_ENTRY_VALUE(MTK_CONTROL_AF_MODE_CONTINUOUS_PICTURE, MUINT8)
// MTK_CONTROL_SCENE_MODE_ACTION
CONFIG_ENTRY_VALUE(MTK_CONTROL_AE_MODE_ON, MUINT8)
CONFIG_ENTRY_VALUE(MTK_CONTROL_AWB_MODE_AUTO, MUINT8)
- CONFIG_ENTRY_VALUE(MTK_CONTROL_AF_MODE_OFF, MUINT8)
+ CONFIG_ENTRY_VALUE(MTK_CONTROL_AF_MODE_CONTINUOUS_PICTURE, MUINT8)
// MTK_CONTROL_SCENE_MODE_PORTRAIT
CONFIG_ENTRY_VALUE(MTK_CONTROL_AE_MODE_ON, MUINT8)
CONFIG_ENTRY_VALUE(MTK_CONTROL_AWB_MODE_AUTO, MUINT8)
- CONFIG_ENTRY_VALUE(MTK_CONTROL_AF_MODE_OFF, MUINT8)
+ CONFIG_ENTRY_VALUE(MTK_CONTROL_AF_MODE_CONTINUOUS_PICTURE, MUINT8)
// MTK_CONTROL_SCENE_MODE_LANDSCAPE
CONFIG_ENTRY_VALUE(MTK_CONTROL_AE_MODE_ON, MUINT8)
CONFIG_ENTRY_VALUE(MTK_CONTROL_AWB_MODE_DAYLIGHT, MUINT8)
- CONFIG_ENTRY_VALUE(MTK_CONTROL_AF_MODE_OFF, MUINT8)
+ CONFIG_ENTRY_VALUE(MTK_CONTROL_AF_MODE_CONTINUOUS_PICTURE, MUINT8)
// MTK_CONTROL_SCENE_MODE_NIGHT
CONFIG_ENTRY_VALUE(MTK_CONTROL_AE_MODE_ON, MUINT8)
CONFIG_ENTRY_VALUE(MTK_CONTROL_AWB_MODE_AUTO, MUINT8)
- CONFIG_ENTRY_VALUE(MTK_CONTROL_AF_MODE_OFF, MUINT8)
+ CONFIG_ENTRY_VALUE(MTK_CONTROL_AF_MODE_CONTINUOUS_PICTURE, MUINT8)
// MTK_CONTROL_SCENE_MODE_NIGHT_PORTRAIT
CONFIG_ENTRY_VALUE(MTK_CONTROL_AE_MODE_ON, MUINT8)
CONFIG_ENTRY_VALUE(MTK_CONTROL_AWB_MODE_AUTO, MUINT8)
- CONFIG_ENTRY_VALUE(MTK_CONTROL_AF_MODE_OFF, MUINT8)
+ CONFIG_ENTRY_VALUE(MTK_CONTROL_AF_MODE_CONTINUOUS_PICTURE, MUINT8)
// MTK_CONTROL_SCENE_MODE_THEATRE
CONFIG_ENTRY_VALUE(MTK_CONTROL_AE_MODE_ON, MUINT8)
CONFIG_ENTRY_VALUE(MTK_CONTROL_AWB_MODE_AUTO, MUINT8)
- CONFIG_ENTRY_VALUE(MTK_CONTROL_AF_MODE_OFF, MUINT8)
+ CONFIG_ENTRY_VALUE(MTK_CONTROL_AF_MODE_AUTO, MUINT8)
// MTK_CONTROL_SCENE_MODE_BEACH
CONFIG_ENTRY_VALUE(MTK_CONTROL_AE_MODE_ON, MUINT8)
CONFIG_ENTRY_VALUE(MTK_CONTROL_AWB_MODE_DAYLIGHT, MUINT8)
- CONFIG_ENTRY_VALUE(MTK_CONTROL_AF_MODE_OFF, MUINT8)
+ CONFIG_ENTRY_VALUE(MTK_CONTROL_AF_MODE_CONTINUOUS_PICTURE, MUINT8)
// MTK_CONTROL_SCENE_MODE_SNOW
CONFIG_ENTRY_VALUE(MTK_CONTROL_AE_MODE_ON, MUINT8)
CONFIG_ENTRY_VALUE(MTK_CONTROL_AWB_MODE_DAYLIGHT, MUINT8)
- CONFIG_ENTRY_VALUE(MTK_CONTROL_AF_MODE_OFF, MUINT8)
+ CONFIG_ENTRY_VALUE(MTK_CONTROL_AF_MODE_CONTINUOUS_PICTURE, MUINT8)
// MTK_CONTROL_SCENE_MODE_SUNSET
CONFIG_ENTRY_VALUE(MTK_CONTROL_AE_MODE_ON, MUINT8)
CONFIG_ENTRY_VALUE(MTK_CONTROL_AWB_MODE_DAYLIGHT, MUINT8)
- CONFIG_ENTRY_VALUE(MTK_CONTROL_AF_MODE_OFF, MUINT8)
+ CONFIG_ENTRY_VALUE(MTK_CONTROL_AF_MODE_CONTINUOUS_PICTURE, MUINT8)
// MTK_CONTROL_SCENE_MODE_STEADYPHOTO
CONFIG_ENTRY_VALUE(MTK_CONTROL_AE_MODE_ON, MUINT8)
CONFIG_ENTRY_VALUE(MTK_CONTROL_AWB_MODE_AUTO, MUINT8)
- CONFIG_ENTRY_VALUE(MTK_CONTROL_AF_MODE_OFF, MUINT8)
+ CONFIG_ENTRY_VALUE(MTK_CONTROL_AF_MODE_CONTINUOUS_PICTURE, MUINT8)
// MTK_CONTROL_SCENE_MODE_FIREWORKS
- CONFIG_ENTRY_VALUE(MTK_CONTROL_AE_MODE_OFF, MUINT8)
+ CONFIG_ENTRY_VALUE(MTK_CONTROL_AE_MODE_ON, MUINT8)
CONFIG_ENTRY_VALUE(MTK_CONTROL_AWB_MODE_DAYLIGHT, MUINT8)
- CONFIG_ENTRY_VALUE(MTK_CONTROL_AF_MODE_OFF, MUINT8)
+ CONFIG_ENTRY_VALUE(MTK_CONTROL_AF_MODE_AUTO, MUINT8)
// MTK_CONTROL_SCENE_MODE_SPORTS
CONFIG_ENTRY_VALUE(MTK_CONTROL_AE_MODE_ON, MUINT8)
CONFIG_ENTRY_VALUE(MTK_CONTROL_AWB_MODE_AUTO, MUINT8)
- CONFIG_ENTRY_VALUE(MTK_CONTROL_AF_MODE_OFF, MUINT8)
+ CONFIG_ENTRY_VALUE(MTK_CONTROL_AF_MODE_AUTO, MUINT8)
// MTK_CONTROL_SCENE_MODE_PARTY
CONFIG_ENTRY_VALUE(MTK_CONTROL_AE_MODE_ON, MUINT8)
CONFIG_ENTRY_VALUE(MTK_CONTROL_AWB_MODE_AUTO, MUINT8)
- CONFIG_ENTRY_VALUE(MTK_CONTROL_AF_MODE_OFF, MUINT8)
+ CONFIG_ENTRY_VALUE(MTK_CONTROL_AF_MODE_CONTINUOUS_PICTURE, MUINT8)
// MTK_CONTROL_SCENE_MODE_CANDLELIGHT
CONFIG_ENTRY_VALUE(MTK_CONTROL_AE_MODE_ON, MUINT8)
CONFIG_ENTRY_VALUE(MTK_CONTROL_AWB_MODE_INCANDESCENT, MUINT8)
- CONFIG_ENTRY_VALUE(MTK_CONTROL_AF_MODE_OFF, MUINT8)
+ CONFIG_ENTRY_VALUE(MTK_CONTROL_AF_MODE_CONTINUOUS_PICTURE, MUINT8)
// MTK_CONTROL_SCENE_MODE_BARCODE
CONFIG_ENTRY_VALUE(MTK_CONTROL_AE_MODE_ON, MUINT8)
CONFIG_ENTRY_VALUE(MTK_CONTROL_AWB_MODE_AUTO, MUINT8)
- CONFIG_ENTRY_VALUE(MTK_CONTROL_AF_MODE_OFF, MUINT8)
+ CONFIG_ENTRY_VALUE(MTK_CONTROL_AF_MODE_MACRO, MUINT8)
// MTK_CONTROL_SCENE_MODE_HDR
CONFIG_ENTRY_VALUE(MTK_CONTROL_AE_MODE_ON, MUINT8)
CONFIG_ENTRY_VALUE(MTK_CONTROL_AWB_MODE_AUTO, MUINT8)
- CONFIG_ENTRY_VALUE(MTK_CONTROL_AF_MODE_OFF, MUINT8)
+ CONFIG_ENTRY_VALUE(MTK_CONTROL_AF_MODE_AUTO, MUINT8)
CONFIG_METADATA_END()
//==========================================================================
//------------------------------------------------------------------------------
