payton/nt9856x
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.超时退出；2.卡相关的宏修改

Browse Source
This commit is contained in:
payton 2024-01-09 16:28:05 +08:00
parent 75e392a48d
commit 5e9709552a
3 changed files with 35 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rtos/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S550.h
View File

@ -948,6 +948,10 @@
#define SF_BASE_VERSION "7MR5RCwE101" #define SF_BASE_VERSION "7MR5RCwE101"
#define DCF_DIR_NAME "MEDIA" /* 100MEDIA */ #define DCF_DIR_NAME "MEDIA" /* 100MEDIA */
#define DCF_FILE_NAME "SYGW" /* SYFW0001.JPG */ #define DCF_FILE_NAME "SYGW" /* SYFW0001.JPG */
#define SF_EMMC_DCF_FILE_NAME "SYBX" /* SYBX0001.JPG */
#define SF_SD_DCF_FILE_NAME "SYEX" /* SYEX0001.JPG */
#define SF_EMMC_DCF_HANDLE 'B'
#define SF_SD_DCF_HANDLE 'E'
#define PHOTO_THUMB_PATH ":\\THUMB\\" #define PHOTO_THUMB_PATH ":\\THUMB\\"
#define MOVIE_THUMB_PATH ":\\THUMB\\" #define MOVIE_THUMB_PATH ":\\THUMB\\"
#define SF_SEND_LIST_DIR "/mnt/sd/THUMB" #define SF_SEND_LIST_DIR "/mnt/sd/THUMB"

23
rtos/code/application/source/cardv/SrcCode/UIApp/MovieFast/MovieFast.c
View File

@ -966,7 +966,7 @@ static void MovieFast_FileNamingCB(MOVIE_CFG_REC_ID id, char *pFileName)
} else { } else {
DBG_DUMP("%s\n", __FUNCTION__); DBG_DUMP("%s\n", __FUNCTION__);
DCF_HANDLE handle = MovieFast_Get_DCF_Handle(); DCF_HANDLE handle = MovieFast_Get_DCF_Handle();
char font = mmc_dev->dev_type == MMC_DEV_EMMC ? 'B' : 'E'; char font = mmc_dev->dev_type == MMC_DEV_EMMC ? SF_EMMC_DCF_HANDLE : SF_SD_DCF_HANDLE;
DCF_GetNextIDEx(handle, &nextFolderID,&nextFileID); DCF_GetNextIDEx(handle, &nextFolderID,&nextFileID);
if(DrvGPIO_GetPhotoMovieModeFromMonitor() == DX_HUNTING_MODE_MOVIE2) if(DrvGPIO_GetPhotoMovieModeFromMonitor() == DX_HUNTING_MODE_MOVIE2)
{ {
@ -1004,7 +1004,7 @@ static void MovieFast_FileNamingCB(MOVIE_CFG_REC_ID id, char *pFileName)
} }
} }
} }
char *dcf_file = mmc_dev->dev_type == MMC_DEV_EMMC ? "SYBX" : "SYEX"; char *dcf_file = mmc_dev->dev_type == MMC_DEV_EMMC ? SF_EMMC_DCF_FILE_NAME : SF_SD_DCF_FILE_NAME;
DCF_SetFileFreeChars(DCF_FILE_TYPE_ANYFORMAT, dcf_file); DCF_SetFileFreeChars(DCF_FILE_TYPE_ANYFORMAT, dcf_file);
DCF_MakeObjPathEx(handle, nextFolderID, nextFileID, DCF_FILE_TYPE_MP4, pFileName); DCF_MakeObjPathEx(handle, nextFolderID, nextFileID, DCF_FILE_TYPE_MP4, pFileName);
DCF_AddDBfileEx(handle, pFileName); DCF_AddDBfileEx(handle, pFileName);
@ -1952,7 +1952,13 @@ THREAD_RETTYPE MovieFast_InitMovieModeThread(void *arg)
sf_set_date_time_make_ymdhms(); sf_set_date_time_make_ymdhms();
if(++cnt >= max_cnt) if(++cnt >= max_cnt)
break; break;
vos_perf_mark(&t2);
if((vos_perf_duration(t1, t2) / 1000) > (20*1000))
{
fastboot_msg_en(ENABLE);
DBG_ERR("failed timeout\n");
goto EXIT;
}
vos_util_delay_ms(duration); vos_util_delay_ms(duration);
} while(1); } while(1);
@ -1980,7 +1986,7 @@ EXIT:
static void MovieFast_Close(void) static void MovieFast_Close(void)
{ {
VOS_TICK t1, t2;
if(g_moviefast_raw_tsk_id){ if(g_moviefast_raw_tsk_id){
UINT32 delay_cnt; UINT32 delay_cnt;
@ -2001,7 +2007,7 @@ static void MovieFast_Close(void)
g_moviefast_raw_tsk_id = 0; g_moviefast_raw_tsk_id = 0;
} }
vos_perf_mark(&t1);
MovieFast_OnRecStop(); MovieFast_OnRecStop();
MovieStamp_Disable(); MovieStamp_Disable();
@ -2084,6 +2090,13 @@ static void MovieFast_Close(void)
else{ else{
vos_util_delay_ms(1); vos_util_delay_ms(1);
} }
vos_perf_mark(&t2);
if((vos_perf_duration(t1, t2) / 1000) > (20*1000))
{
fastboot_msg_en(ENABLE);
DBG_ERR("failed timeout\n");
goto EXIT;
}
} }
} }

17
rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFast.c
View File

@ -1071,7 +1071,7 @@ INT32 PhotoFast_WriteFile(UINT32 Addr, UINT32 Size, UINT32 Fmt, UINT32 uiPathId,
} }
} }
} }
char *dcf_file = mmc_dev->dev_type == MMC_DEV_EMMC ? "SYBX" : "SYEX"; char *dcf_file = mmc_dev->dev_type == MMC_DEV_EMMC ? SF_EMMC_DCF_FILE_NAME : SF_SD_DCF_FILE_NAME;
DCF_SetFileFreeChars(DCF_FILE_TYPE_ANYFORMAT, dcf_file); DCF_SetFileFreeChars(DCF_FILE_TYPE_ANYFORMAT, dcf_file);
DCF_MakeObjPathEx(handle, nextFolderID, nextFileID, fileType, FilePath); DCF_MakeObjPathEx(handle, nextFolderID, nextFileID, fileType, FilePath);
DCF_AddDBfileEx(handle, FilePath); DCF_AddDBfileEx(handle, FilePath);
@ -1086,8 +1086,8 @@ INT32 PhotoFast_WriteFile(UINT32 Addr, UINT32 Size, UINT32 Fmt, UINT32 uiPathId,
char tmp[NMC_TOTALFILEPATH_MAX_LEN] = {'\0'}; char tmp[NMC_TOTALFILEPATH_MAX_LEN] = {'\0'};
char str1[5] = { 0 }; char str1[5] = { 0 };
char str2[5] = { 0 }; char str2[5] = { 0 };
char font = mmc_dev->dev_type == MMC_DEV_EMMC ? 'B' : 'E'; char font = mmc_dev->dev_type == MMC_DEV_EMMC ? SF_EMMC_DCF_HANDLE : SF_SD_DCF_HANDLE;
memcpy(str1, FilePath + 8, 3); memcpy(str1, FilePath + 9, 2);
memcpy(str2, FilePath + 21, 4); memcpy(str2, FilePath + 21, 4);
sprintf(tmp, "W%c%s%s.JPG", font, str1, str2); sprintf(tmp, "W%c%s%s.JPG", font, str1, str2);
//sprintf(tmp, "W%03ld%04ld.JPG", nextFolderID, nextFileID); //sprintf(tmp, "W%03ld%04ld.JPG", nextFolderID, nextFileID);
@ -1642,7 +1642,8 @@ THREAD_RETTYPE PhotoFast_FlowPreviewThread(void *arg)
BOOL start_cap = FALSE; BOOL start_cap = FALSE;
BOOL stop_flag = FALSE; BOOL stop_flag = FALSE;
BOOL led_flag = FALSE; BOOL led_flag = FALSE;
VOS_TICK t1timeout;
vos_perf_mark(&t1timeout);
#if HUNTING_CAMERA_MCU == ENABLE #if HUNTING_CAMERA_MCU == ENABLE
UIMenuStoreInfo *puiPara = sf_ui_para_get(); UIMenuStoreInfo *puiPara = sf_ui_para_get();
// IQT_SHARPNESS_LV sharpness_lv = {0}; // IQT_SHARPNESS_LV sharpness_lv = {0};
@ -1787,6 +1788,14 @@ THREAD_RETTYPE PhotoFast_FlowPreviewThread(void *arg)
} }
} }
if((vos_perf_duration(t1timeout, t2) / 1000) > (15*1000))
{
fastboot_msg_en(ENABLE);
g_bPreViewPullFlag = FALSE;
DBG_ERR("failed timeout\n");
goto exit;
}
#endif #endif
if((hd_ret = PhotoFast_VideoCap_Pull_Out_Buf(vcap_path, &video_cap_frame, PHOTOFAST_HD_PUSH_PULL_TIMEOUT_MS)) != HD_OK){ if((hd_ret = PhotoFast_VideoCap_Pull_Out_Buf(vcap_path, &video_cap_frame, PHOTOFAST_HD_PUSH_PULL_TIMEOUT_MS)) != HD_OK){