1.合并光敏更新的修改

This commit is contained in:
payton 2023-08-11 10:36:15 +08:00
parent 0afde0141c
commit 6de736a2a6
7 changed files with 70 additions and 70 deletions

View File

@ -1095,7 +1095,7 @@ void flow_preview_uninit_module(void)
#if 1 //for pre set ae #if 1 //for pre set ae
static UINT32 ae_adc_tbl[57][3] = { static UINT32 ae_adc_tbl[57][3] = {
#if 1 //for S530 200K RSS photodie #if 0 //for S530 200K RSS photodie OK
{980, 44, 1000}, {980, 44, 1000},
{970, 73, 1000}, {970, 73, 1000},
{960, 88, 1000}, {960, 88, 1000},
@ -1105,7 +1105,7 @@ static UINT32 ae_adc_tbl[57][3] = {
{900, 203, 1020}, {900, 203, 1020},
{885, 267, 1000}, {885, 267, 1000},
{870, 320, 1010}, {870, 320, 1010},
{859, 524, 1000}, {859, 468, 1000},// 524
{854, 826, 1000}, {854, 826, 1000},
{849, 1128, 1000}, {849, 1128, 1000},
{845, 1372, 1000}, {845, 1372, 1000},
@ -1155,64 +1155,64 @@ static UINT32 ae_adc_tbl[57][3] = {
//{1, 33333, 3500}, //{1, 33333, 3500},
{0, 16666, 16000}, {0, 16666, 16000},
#else // 1K RSS #else // 100K RSS new phototransistor
{980, 120, 1000}, {710, 44, 1000},
{970, 120, 1000}, {708, 73, 1000},
{960, 120, 1000}, {707, 88, 1000},
{945, 120, 1000}, {705, 99, 1130},
{930, 120, 1000}, {704, 103, 1130},
{910, 120, 1000}, {703, 126, 1000},
{900, 120, 1000}, {702, 203, 1070},
{885, 120, 1000}, {701, 267, 1070},
{870, 200, 1000}, {700, 301, 1010},
{850, 200, 1000}, {699, 403, 1020},
{840, 200, 1000}, {698, 760, 1000},
{832, 200, 1000}, {697, 1085, 1000},// 524
{820, 200, 1000}, {696, 1516, 1000},
{816, 200, 1000}, {695, 1802, 1000},
{810, 200, 1000}, {694, 2333, 1000},
{805, 200, 1000}, {693, 3630, 1000},
{800, 200, 1000}, {691, 4668, 1000},
{787, 200, 1000}, {689, 7009, 1000},
{750, 200, 1000}, {687, 8333, 1600},
{723, 200, 1000}, {684, 8333, 2150},
{671, 200, 1000}, {681, 8333, 2550},
{641, 200, 1000}, {679, 8333, 2760},
{600, 200, 1000}, {669, 8333, 3030},
{538, 300, 1000}, {645, 8333, 3160},
{503, 300, 1000}, {617, 8333, 3400},
{484, 300, 1000}, {591, 8333, 3600},
{466, 300, 1000}, {566, 8333, 3890},
{414, 400, 1000}, {546, 16666, 2050},
{347, 400, 1000}, {526, 16666, 2270},
{353, 400, 1000}, {507, 16666, 2310},
{330, 500, 1000}, {488, 16666, 2350},//night
{324, 500, 1000}, {468, 16666, 2510},
{314, 500, 1000}, {446, 16666, 2720},
{306, 600, 1000}, {422, 16666, 2890},
{277, 600, 1000}, {399, 16666, 3000},
{257, 800, 1000}, {376, 16666, 3300},
{109, 900, 1000}, {353, 16666, 3500},
{84, 1000, 1000}, {330, 16666, 4740},
{76, 1200, 1000},// night {308, 16666, 3950},// 12190},
{60, 2700, 1000}, {286, 16666, 4210},// 26600},
{49, 4201, 1000}, {264, 16666, 4500}, //45770},
{36, 5801, 1000}, {242, 16666, 4740},
{31, 7332, 1000}, {220, 16666, 5100},
{26, 7332, 1000}, {161, 16666, 6280},
{19, 8333, 1000}, {142, 16666, 6860},
{17, 8333, 1000}, {126, 16666, 7060},
{15, 8333, 1000}, {113, 16666, 7200},
{13, 8333, 1000}, {96, 16666, 8000},
{12, 8333, 1000}, {80, 16666, 10000},
{11, 8333, 1000}, {62, 16666, 12000},
{10, 8333, 1000}, {48, 16666, 14000},
{9, 8333, 1000}, {35, 16666, 16000},
{8, 8333, 1000}, {26, 16666, 16000},
{6, 8333, 1000}, {19, 16666, 16000},
{5, 8333, 1000}, {13, 16666, 16000},
{1, 16666, 1000}, {10, 16666, 16000},
{0, 33333, 4000}, {8, 16666, 16000},
#endif #endif
}; };
@ -1247,7 +1247,7 @@ void ae_adc_get_exp_photo(UINT16 adc_value, UINT32 *exptime, UINT32 *isogain)
//adc_ev = ((ev1 - ev0) * (ae_adc_tbl[idx1][0]-adc_value))/(ae_adc_tbl[idx1][0]-ae_adc_tbl[idx0][0]) + ev0; //adc_ev = ((ev1 - ev0) * (ae_adc_tbl[idx1][0]-adc_value))/(ae_adc_tbl[idx1][0]-ae_adc_tbl[idx0][0]) + ev0;
adc_ev = ((ev1 - ev0) * (adc_value - ae_adc_tbl[idx1][0]))/(ae_adc_tbl[idx0][0] - ae_adc_tbl[idx1][0]) + ev0; adc_ev = ((ev1 - ev0) * (adc_value - ae_adc_tbl[idx1][0]))/(ae_adc_tbl[idx0][0] - ae_adc_tbl[idx1][0]) + ev0;
if(adc_value>200) if(adc_value>35)// 200 for old phototransistor
{ {
*exptime = exptime0; *exptime = exptime0;
*isogain = (adc_ev / exptime0); *isogain = (adc_ev / exptime0);

View File

@ -1640,7 +1640,7 @@ THREAD_RETTYPE PhotoFast_FlowPreviewThread(void *arg)
* *
* 2. third frame since ae preset * 2. third frame since ae preset
******************************************************************************************/ ******************************************************************************************/
if(((g_vcap_frm_cnt >= PHOTOFAST_START_CAP_FRAME_CNT) || (g_ae_preset_flag == TRUE && g_vprc_frm_cnt >= (g_vprc_frm_cnt_ae_preset + 3))) && (start_cap == FALSE)){ if(((g_vcap_frm_cnt >= PHOTOFAST_START_CAP_FRAME_CNT) || (g_ae_preset_flag == TRUE && g_vprc_frm_cnt >= (g_vprc_frm_cnt_ae_preset + 4))) && (start_cap == FALSE)){
if(g_vcap_frm_cnt >= PHOTOFAST_START_CAP_FRAME_CNT){ if(g_vcap_frm_cnt >= PHOTOFAST_START_CAP_FRAME_CNT){
DBG_DUMP("triggered by PHOTOFAST_START_CAP_FRAME_CNT\n"); DBG_DUMP("triggered by PHOTOFAST_START_CAP_FRAME_CNT\n");

View File

@ -9,8 +9,8 @@
#define FLGPHOTOFAST_SHUTDOWN 0x00000002 #define FLGPHOTOFAST_SHUTDOWN 0x00000002
#define FLGPHOTOFAST_MASK FLGPTN_BIT_ALL #define FLGPHOTOFAST_MASK FLGPTN_BIT_ALL
#define PHOTOFAST_AE_PRESET_FRAME_CNT 11 /* lock AE */ #define PHOTOFAST_AE_PRESET_FRAME_CNT 21 /* lock AE */
#define PHOTOFAST_START_CAP_FRAME_CNT (PHOTOFAST_AE_PRESET_FRAME_CNT + 3*2) /* capture frame, it should be larger than PHOTOFAST_AE_PRESET_FRAME_CNT by 3 */ #define PHOTOFAST_START_CAP_FRAME_CNT (PHOTOFAST_AE_PRESET_FRAME_CNT + 4*2) /* capture frame, it should be larger than PHOTOFAST_AE_PRESET_FRAME_CNT by 3 */
#define PHOTOFAST_HD_PUSH_PULL_TIMEOUT_MS 3000 #define PHOTOFAST_HD_PUSH_PULL_TIMEOUT_MS 3000
// Naming rule & FileDB // Naming rule & FileDB

2
rtos/code/driver/na51089/include/sf_mcu.h Normal file → Executable file
View File

@ -28,7 +28,7 @@
#define SF_SEND_LIST_ITEM_LENGTH 15 #define SF_SEND_LIST_ITEM_LENGTH 15
#define SF_MCU_NIGHT_MODE_LUMINANCE 600 #define SF_MCU_NIGHT_MODE_LUMINANCE 100// old phototransistor:600
#define DIGITAL_PIR 1 #define DIGITAL_PIR 1

2
rtos/code/hdal/vendor/isp/configs/dtsi/os05b10_awb_0.dtsi vendored Normal file → Executable file
View File

@ -7,7 +7,7 @@
version-info = [00 00 00 01]; version-info = [00 00 00 01];
awb_th { awb_th {
size = [30 00 00 00]; size = [30 00 00 00];
data = [05 00 00 00 f5 00 00 00 39 00 00 00 fd 00 00 00 b7 ff ff ff 6a 00 00 00 21 00 00 00 8f 00 00 00 18 00 00 00 6e 00 00 00 1a 00 00 00 2f 00 00 00]; data = [05 00 00 00 f5 00 00 00 39 00 00 00 fd 00 00 00 b7 ff ff ff 6a 00 00 00 21 00 00 00 8f 00 00 00 18 00 00 00 6e 00 00 00 19 00 00 00 2f 00 00 00];
}; };
awb_lv { awb_lv {
size = [18 00 00 00]; size = [18 00 00 00];

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long