diff --git a/rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFast.c b/rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFast.c index df90f31d8..3695fd40a 100644 --- a/rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFast.c +++ b/rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFast.c @@ -1468,7 +1468,7 @@ THREAD_RETTYPE PhotoFast_FlowPreviewThread(void *arg) while(g_bPreViewPullFlag) { if(TRUE == flow_preview_get_stop_flag()){ - DBG_ERR("Stop!!!!!!!!!!!!!!!!!\n"); + DBG_WRN("detected stop signal, power off ...\n"); stop_flag = TRUE; hd_ret = HD_ERR_ABORT; goto exit; @@ -1547,7 +1547,7 @@ THREAD_RETTYPE PhotoFast_FlowPreviewThread(void *arg) ++g_vprc_frm_cnt; - if(duration >= period){ + if(duration >= (period - 17)){ break; } else{ @@ -1993,6 +1993,9 @@ void Set_AEMODE(UINT32 id) AWBT_STATUS status = {0}; ISPT_C_GAIN c_gain = {0}; HD_RESULT hd_ret; +#if HUNTING_CAMERA_MCU == ENABLE + UIMenuStoreInfo *puiPara = sf_ui_para_get(); +#endif memset(&ae_status, 0, sizeof(AET_STATUS_INFO)); @@ -2009,13 +2012,29 @@ void Set_AEMODE(UINT32 id) //DBG_ERR(">> aet manual exp %d iso %d\r\n",ae_manual.manual.expotime,ae_manual.manual.iso_gain); if (id == 1){ ae_manual.manual.mode = 1; + #if HUNTING_CAMERA_MCU == ENABLE + if (puiPara->NightMode == 0) { + ae_manual.manual.expotime = 125000;//ae_status.status_info.expotime[0]; + ae_manual.manual.iso_gain = ae_status.status_info.iso_gain[0]*ae_status.status_info.expotime[0]/125000; + } + else if (puiPara->NightMode == 1) { + ae_manual.manual.expotime = 66666;//ae_status.status_info.expotime[0]; + ae_manual.manual.iso_gain = ae_status.status_info.iso_gain[0]*ae_status.status_info.expotime[0]/66666; + } + else { + ae_manual.manual.expotime = ae_status.status_info.expotime[0]; + ae_manual.manual.iso_gain = ae_status.status_info.iso_gain[0]; + } + + #else ae_manual.manual.expotime = ae_status.status_info.expotime[0]; ae_manual.manual.iso_gain = ae_status.status_info.iso_gain[0]; - ISPT_TOTAL_GAIN total; + #endif + /*ISPT_TOTAL_GAIN total; total.id = 0; total.gain = 1600; - vendor_isp_set_common(ISPT_ITEM_TOTAL_GAIN, &total); + vendor_isp_set_common(ISPT_ITEM_TOTAL_GAIN, &total);*/ nvt_cmdsys_runcmd("ae dbg 0 0 0 "); } else { @@ -2074,6 +2093,11 @@ BOOL PhotoFast_SetTriggerFrmCnt(UINT32 cnt) return TRUE; } +UINT32 PhotoFast_GetTriggerFrmCnt(VOID) +{ + return g_vcap_trigger_frm_count; +} + BOOL PhotoFast_SetTick(UINT32 cnt, VOS_TICK tick) { if(cnt > VD_TICK_BUF_SIZE){