— a/android12/kernel-4.19/drivers/misc/mediatek/imgsensor/src/common/v1_1/imx686_mipi_raw/imx686mipiraw_Sensor.c
+++ b/android12/kernel-4.19/drivers/misc/mediatek/imgsensor/src/common/v1_1/imx686_mipi_raw/imx686mipiraw_Sensor.c
@@ -3969,7 +3969,11 @@ static kal_uint32 feature_control(MSDK_SENSOR_FEATURE_ENUM feature_id,
*(MUINT32 ) (uintptr_t) ((feature_data + 1)) = 0x2;
break;
case MSDK_SCENARIO_ID_CAMERA_CAPTURE_JPEG:
-
*(MUINT32 *) (uintptr_t) (*(feature_data + 1)) = 0x2;
-
break; case MSDK_SCENARIO_ID_VIDEO_PREVIEW:
-
*(MUINT32 *) (uintptr_t) (*(feature_data + 1)) = 0x2;
-
break; case MSDK_SCENARIO_ID_HIGH_SPEED_VIDEO: case MSDK_SCENARIO_ID_SLIM_VIDEO: case MSDK_SCENARIO_ID_CUSTOM1:
diff --git a/android12/vendor/mediatek/proprietary/custom/mt6877/hal/camera_af/af_flow_custom.cpp b/android12/vendor/mediatek/proprietary/custom/mt6877/hal/camera_af/af_flow_custom.cpp
old mode 100644
new mode 100755
index e0ae213cfeb…0f4f48d3456
— a/android12/vendor/mediatek/proprietary/custom/mt6877/hal/camera_af/af_flow_custom.cpp
+++ b/android12/vendor/mediatek/proprietary/custom/mt6877/hal/camera_af/af_flow_custom.cpp
@@ -122,7 +122,7 @@ MBOOL checkSendCallback(af_CheckCallBackInfo CBInfo)
// Callback rules: #7
isNeedSendCallback = MFALSE;
}
- isNeedSendCallback = MFALSE;
return isNeedSendCallback;
}
diff --git a/android12/vendor/mediatek/proprietary/custom/mt6877/hal/imgsensor/ver1/imx686_mipi_raw/Video_4k/AF.cpp b/android12/vendor/mediatek/proprietary/custom/mt6877/hal/imgsensor/ver1/imx686_mipi_raw/Video_4k/AF.cpp
index 771cd0f3ccf…f00be9dc08d 100755
— a/android12/vendor/mediatek/proprietary/custom/mt6877/hal/imgsensor/ver1/imx686_mipi_raw/Video_4k/AF.cpp
+++ b/android12/vendor/mediatek/proprietary/custom/mt6877/hal/imgsensor/ver1/imx686_mipi_raw/Video_4k/AF.cpp
@@ -112,23 +112,23 @@ const NVRAM_LENS_DATA_PARA_STRUCT AF_BASE[1] = {
//--------------------------------------------------------------------------------------------/
{//NVRAM_AF_COEF sAF_Coef
{
-
50, //af_table_offset
-
17, //af_table_num
-
17, //af_table_num2
-
223, //af_table_offset^M
-
20, //af_table_num^M
-
20, //af_table_num2^M 2, //af_table_inf_idx 2, //af_table_mac_idx //af_table {
-
0,25,50,75,100,130,160,200,240,280,
-
320,360,400,450,500,550,600,0,0,0,
-
0,15,30,45,60,80,100,125,150,180,^M
-
210,250,290,340,390,440,490,540,590,640,^M 0,0,0,0,0,0,0,0,0,0 } }, 12, //main_threshold 8, //sub_threshold
-
2, //afc_fail_count
-
0, //af_fail_position
-
1, //afc_fail_count^M
-
0, //af_fail_position^M 4, //Reserved {500, 500, 500, 500, 500}, //frame_wait_table 0, //Reserved
@@ -138,17 +138,18 @@ const NVRAM_LENS_DATA_PARA_STRUCT AF_BASE[1] = {
// Description: This section is af table for hybrid af use, check Auto Focus Table section above
//============================================================================================/
{//NVRAM_AF_TABLE_T sHBAF_table
-
50, //af_table_offset
-
17, //af_table_num
-
17, //af_table_num2
-
2, //af_table_inf_idx
-
2, //af_table_mac_idx
-
//af_table
-
{
-
0,25,50,75,100,130,160,200,240,280,
-
320,360,400,450,500,550,600,0,0,0,
-
0,0,0,0,0,0,0,0,0,0
-
}
-
223, //af_table_offset^M
-
20, //af_table_num^M
-
20, //af_table_num2^M
-
2, //af_table_inf_idx^M
-
2, //af_table_mac_idx^M
+^M
-
//af_table^M
-
{^M
-
0,15,30,45,60,80,100,125,150,180,^M
-
210,250,290,340,390,440,490,540,590,640,^M
-
0,0,0,0,0,0,0,0,0,0^M
-
},//NVRAM_AF_TABLE_T sHBAF_table}^M
//============================================================================================/
// Section: Focus Value Threshold
@@ -246,13 +247,13 @@ const NVRAM_LENS_DATA_PARA_STRUCT AF_BASE[1] = {
0, // [16] i4AfDoneDelay
0, // [17] i4ZoomInWinChg
1, // [18] i4SensorEnable
-
50, // [19] i4PostureComp
-
0, // [19] i4PostureComp^M 1, // [20] face_fv_extract_enable 30, // [21] face_fv_extract_thr 1, // [22] i4DirSelectEnable -1, // [23] i4InfDir -1, // [24] i4MidDir
-
-1, // [25] i4MacDir
-
26, // [25] i4MacDir^M 40, // [26] i4RatioInf 70, // [27] i4RatioMac 0, // [28] i4StartBoundEnable
@@ -439,7 +440,7 @@ const NVRAM_LENS_DATA_PARA_STRUCT AF_BASE[1] = {
100075, // [54] PD_TARGET_FIX_CONF_WEIGHT
1, // [55] PD_AbnormalCnt
4, // [56] PD_VarianceNum
-
10, // [57] PD_VarianceThr
-
10, // [57] PD_VarianceThr^M 0x1,// [58] Reserved }, // i4SceneMonitor[64]
/*
@@ -679,15 +680,15 @@ const NVRAM_LENS_DATA_PARA_STRUCT AF_BASE[1] = {
1, // [44] hbFsStbCntFV
2, // [45] hbFsStbCntGS
4, // [46] hbFsStbCntGH
-
3, // [44] hbFsStbCntFV
-
3, // [45] hbFsStbCntGS
-
3, // [47] hbFsStbCntAcce^M
-
3, // [48] hbFsStbCntGyro^M 1, // [49] Reserved 850, // [50] cusAntiHistCoefs 80, // [51] cusAntiChkFrmNum/cusAntiPosTblThr 1, // [52] aeStbEn 0, // [53] pdFastTriggerEnabled 0xE5F, // [54] cusAntiActBits
-
0x18, // [55] cusAntiExcludeBits
-
0x18, // [55] cusAntiExcludeBits ^M }, // i4SceneMonitor2[64]
/*
±---------±----------------------------------±-----±----------------±------------±----------------±--------------------±--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
@@ -899,7 +900,7 @@ const NVRAM_LENS_DATA_PARA_STRUCT AF_BASE[1] = {
| 38 | Reserved | | 123 | | | Default | Multi-source priority (Low) , keep default |
| 39 | Reserved | | 0 | | | | Reserved |
| 40 | fine_search_scene_stable_mask | | 0x11E | | | Default | Finesearch wait stable mask (0x1F = all, 0x18=tripod) |
-| 41 | Reserved | | 0 | | | | |
+| 41 | one_shot_scenne_stable_mask | | 0 | | | | |^M
| 42 | Reserved | | 0 | | | | |
| 43 | Reserved | | 0 | | | | |
| 44 | Reserved | | 0 | | | | |
@@ -1197,7 +1198,7 @@ const NVRAM_LENS_DATA_PARA_STRUCT AF_BASE[1] = {
150, // [32] merge_center_weight
0, // [33] PDmergechangeshiftbase
1, // [34] MergeFrame
-
4, // [36] pd_track_conv_var_thr
-
4, // [35] pd_track_conv_num^M 20, // [36] pd_track_conv_var_thr 60, // [37] pd_track_conv_dac_thr 0, // [38] pd_multi_win_spatial_w
@@ -1224,7 +1225,7 @@ const NVRAM_LENS_DATA_PARA_STRUCT AF_BASE[1] = {
30, // [59] pd_move_ext2
5, // [60] pd_move_ext3
40, // [61] pd_move_speed_conf_weighting
-
30, // [62] pd_first_step_conf
-
30, // [62] preparePosConf^M }, // i4PDAFCoefs[64]
/*
±---------±--------------------------±-----±----------------±------------±------------±--------------------±------------+
@@ -1389,7 +1390,7 @@ const NVRAM_LENS_DATA_PARA_STRUCT AF_BASE[1] = {
10, // [38] Unknown
30, // [39] Unknown
0, // [40] Unknown
-
25, // [41] Unknown
-
25, // [41] facepdwinext_size_ratio^M 80250, // [42] Unknown 50000, // [43] Unknown 0, // [44] Unknown
@@ -1402,7 +1403,7 @@ const NVRAM_LENS_DATA_PARA_STRUCT AF_BASE[1] = {
±---------±---------±-----±----------------±------------±------------±--------------------±------------+
*/
{ // i4TempErr[64]
-
1, //[0] Lens Thermal correction main On-Off switch
-
0, //[0] Lens Thermal correction main On-Off switch^M 2, //[1] Mode: 0=Use PLF TempError setting, 1=User frame rate based alpha blending, 2= Use LTC method. 0, //[2] frame rate based 30fps TempError 0, //[3] framte rate based 15fps TempError
@@ -1423,6 +1424,7 @@ const NVRAM_LENS_DATA_PARA_STRUCT AF_BASE[1] = {
1466963304, -1425972688 , -669555963 , -1049759652 , 383780295, 1975540644, 168146689, 1616830487, 94060917, 31052
}, // i4TempErr[64]
+^M
/*
±---------±-------------------±-----±----------------±------------±------------±--------------------±--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| Para_Num | Name | Unit | Default_Capture | Min_Capture | Max_Capture | Tuning_Type_Capture | Description |
@@ -1476,7 +1478,7 @@ const NVRAM_LENS_DATA_PARA_STRUCT AF_BASE[1] = {
0, // [23] fdOffPeakThr
0, // [24] apOffPeakThr
7, // [25] cenHbConfThr
-
5, // [25] cenHbConfThr
-
5, // [26] fdHbConfThr^M 10, // [27] apHbConfThr 0, // [28] cenSearchStbBit 0, // [29] fdSearchStbBit
@@ -1710,16 +1712,16 @@ const NVRAM_LENS_DATA_PARA_STRUCT AF_BASE[1] = {
6,//[21]
//--------------------------------------------------------------------------------/
// Section: Reject clipped pixels
-
//--------------------------------------------------------------------------------/
-
//--------------------------------------------------------------------------------/ ^M 8,0,0,//[22] to [24] 0,0,0,0,0, //[25] to [29]
-
0,0,0, //[30] to [32]
-
0,0,0, //[30] to [32] ^M //--------------------------------------------------------------------------------/ // Section: Thrsholds for Touch // Curv/Grad: cccccgggg //--------------------------------------------------------------------------------/ 50001, 250017, 600040, 700070, 900150, 1200300, //[33] to [38]
-
0, // [39]
-
0, // [39]^M 0,0,0,0,0,0,0,0,0,0, //[40] to [49] 0,0,100000,//[50] to [52] 0,//[53]