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

1.P+V优化后Linux下的调整

Browse Source
This commit is contained in:
payton 2023-11-02 10:22:08 +08:00
parent 299feee950
commit 09e2e5a948
9 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
code/application/source/cardv/SrcCode/UIApp/Photo/UIAppPhoto_Exe.c
View File

@ -6785,6 +6785,9 @@ INT32 PhotoExe_Preview_SliceEncode_CB3(void* user_data)
enFileType = SF_FILE_TYPE_PIC_SMALL; enFileType = SF_FILE_TYPE_PIC_SMALL;
}else if(SF_CAM_MODE_PHOTO_VIDEO == puiPara->CamMode){ }else if(SF_CAM_MODE_PHOTO_VIDEO == puiPara->CamMode){
enFileType = SF_FILE_TYPE_PIC_VIDEO; enFileType = SF_FILE_TYPE_PIC_VIDEO;
}
else if(SF_CAM_MODE_VIDEO2 == puiPara->CamMode){
enFileType = SF_FILE_TYPE_PIC_VIDEO;
} }
snprintf(tmp, sizeof(tmp), "%sW%s%s.JPG", SF_SEND_LIST_DIR, folder, number); /* DCF 8.3 naming rule */ snprintf(tmp, sizeof(tmp), "%sW%s%s.JPG", SF_SEND_LIST_DIR, folder, number); /* DCF 8.3 naming rule */
snprintf(tmp2, sizeof(tmp2), "W%s%s.JPG", folder, number); /* DCF 8.3 naming rule */ snprintf(tmp2, sizeof(tmp2), "W%s%s.JPG", folder, number); /* DCF 8.3 naming rule */

4
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovieEventCallback.c
View File

@ -729,7 +729,7 @@ static void UIFlowMovie_ScrOpen(lv_obj_t* obj)
} }
//#NT#2018/08/10#KCHong -end //#NT#2018/08/10#KCHong -end
#if HUNTING_CAMERA_MCU == ENABLE #if HUNTING_CAMERA_MCU == ENABLE
if(puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO) if(puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO || puiPara->CamMode == SF_CAM_MODE_VIDEO2)
#else #else
if(SysGetFlag(CamMode) == SF_CAM_MODE_PHOTO_VIDEO) if(SysGetFlag(CamMode) == SF_CAM_MODE_PHOTO_VIDEO)
#endif #endif
@ -1378,7 +1378,7 @@ static void UIFlowMovie_NVTMSG(lv_obj_t* obj, const LV_USER_EVENT_NVTMSG_DATA* m
UIFlowMovie_REC_FINISH(obj,msg); UIFlowMovie_REC_FINISH(obj,msg);
#if HUNTING_CAMERA_MCU == ENABLE #if HUNTING_CAMERA_MCU == ENABLE
if(puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO){ if(puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO || puiPara->CamMode == SF_CAM_MODE_VIDEO2){
#else #else
if(SysGetFlag(CamMode) == SF_CAM_MODE_PHOTO_VIDEO){ if(SysGetFlag(CamMode) == SF_CAM_MODE_PHOTO_VIDEO){
#endif #endif

4
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c
View File

@ -1357,7 +1357,7 @@ void UIFlowPhoto_UpdateInfo(lv_obj_t* obj, const LV_USER_EVENT_NVTMSG_DATA* msg)
UIFlowPhoto_BackPreviewHandle(); UIFlowPhoto_BackPreviewHandle();
#if HUNTING_CAMERA_MCU == ENABLE #if HUNTING_CAMERA_MCU == ENABLE
if(puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO){ if(puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO || puiPara->CamMode == SF_CAM_MODE_VIDEO2){
#else #else
if(SysGetFlag(CamMode) == SF_CAM_MODE_PHOTO_VIDEO){ if(SysGetFlag(CamMode) == SF_CAM_MODE_PHOTO_VIDEO){
#endif #endif
@ -1567,7 +1567,7 @@ void UIFlowPhotoEventCallback(lv_obj_t* obj, lv_event_t event)
} }
#if HUNTING_CAMERA_MCU == ENABLE #if HUNTING_CAMERA_MCU == ENABLE
UIMenuStoreInfo *puiPara = sf_ui_para_get(); UIMenuStoreInfo *puiPara = sf_ui_para_get();
if((puiPara->CamMode == SF_CAM_MODE_PHOTO) || (puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO)) if((puiPara->CamMode == SF_CAM_MODE_PHOTO) || (puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO) || (puiPara->CamMode == SF_CAM_MODE_VIDEO2))
{ {
sf_rtsp_restart(); sf_rtsp_restart();
} }

1
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h
View File

@ -1866,6 +1866,7 @@ typedef enum {
SF_CAM_MODE_PHOTO = 0x00, SF_CAM_MODE_PHOTO = 0x00,
SF_CAM_MODE_VIDEO, SF_CAM_MODE_VIDEO,
SF_CAM_MODE_PHOTO_VIDEO, SF_CAM_MODE_PHOTO_VIDEO,
SF_CAM_MODE_VIDEO2,
SF_CAM_MODE_MAX, SF_CAM_MODE_MAX,
}SF_BOOT_WORK_MODE; }SF_BOOT_WORK_MODE;

2
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIPhotoMapping.c
View File

@ -30,7 +30,7 @@ typedef struct {
static PHOTO_SIZE_PARAM g_PhotoCapSizeTable[PHOTO_SIZE_ID_MAX + 2] = { static PHOTO_SIZE_PARAM g_PhotoCapSizeTable[PHOTO_SIZE_ID_MAX + 2] = {
#if PHOTO_PREVIEW_SLICE_ENC_FUNC || POWERON_FAST_SLICE_ENC #if PHOTO_PREVIEW_SLICE_ENC_FUNC || POWERON_FAST_SLICE_ENC
{7296, 5472, IMAGERATIO_4_3, "40M"}, /* 40M */ {7296, 5760, IMAGERATIO_4_3, "40M"}, /* 40M */
#endif #endif
{6528, 4896, IMAGERATIO_4_3, "32M"}, /* 32M */ {6528, 4896, IMAGERATIO_4_3, "32M"}, /* 32M */
{5664, 4248, IMAGERATIO_4_3, "24M"}, //16M {5664, 4248, IMAGERATIO_4_3, "24M"}, //16M

14
code/application/source/sf_app/code/source/4gMng/sf_ftp.c
View File

@ -1148,7 +1148,7 @@ SINT32 sf_check_ftp_send(UINT8 mode)
else else
{ {
if(((puiPara->CamMode == SF_CAM_MODE_PHOTO) && (puiPara->SendPhotoSwitch == 1)) || ((puiPara->CamMode == SF_CAM_MODE_VIDEO) && (puiPara->SendVideoSwitch == 1)) if(((puiPara->CamMode == SF_CAM_MODE_PHOTO) && (puiPara->SendPhotoSwitch == 1)) || ((puiPara->CamMode == SF_CAM_MODE_VIDEO) && (puiPara->SendVideoSwitch == 1))
|| ((puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO) && ((puiPara->SendPhotoSwitch == 1) || (puiPara->SendVideoSwitch == 1)))) || (((puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO) || (puiPara->CamMode == SF_CAM_MODE_VIDEO2)) && ((puiPara->SendPhotoSwitch == 1) || (puiPara->SendVideoSwitch == 1))))
{ {
if((puiPara->FtpSwitch != 1) && (puiPara->Sim4gApn[0] != '\0')) if((puiPara->FtpSwitch != 1) && (puiPara->Sim4gApn[0] != '\0'))
{ {
@ -1206,11 +1206,11 @@ SINT32 sf_send_file_to_ftp(UINT8 mode)
if(mode == 1 ) //send Original+video if(mode == 1 ) //send Original+video
{ {
if(((puiPara->CamMode == SF_CAM_MODE_VIDEO) || (puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO)) && (puiPara->SendVideoSwitch == 1) && (puiPara->NetGeneration == 4)) //video if(((puiPara->CamMode == SF_CAM_MODE_VIDEO) || (puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO) || (puiPara->CamMode == SF_CAM_MODE_VIDEO2)) && (puiPara->SendVideoSwitch == 1) && (puiPara->NetGeneration == 4)) //video
{ {
timeout = 120000; timeout = 120000;
} }
else if((2 == puiPara->SendPicSize) && (((puiPara->CamMode == SF_CAM_MODE_PHOTO) || (puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO)) && (puiPara->SendPhotoSwitch == 1))) //pic(+video) else if((2 == puiPara->SendPicSize) && (((puiPara->CamMode == SF_CAM_MODE_PHOTO) || (puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO) || (puiPara->CamMode == SF_CAM_MODE_VIDEO2)) && (puiPara->SendPhotoSwitch == 1))) //pic(+video)
{ {
timeout = 120000; timeout = 120000;
} }
@ -1222,7 +1222,7 @@ SINT32 sf_send_file_to_ftp(UINT8 mode)
{ {
if(mode == 1) if(mode == 1)
{ {
if(((puiPara->CamMode == SF_CAM_MODE_PHOTO) || (puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO)) && (puiPara->SendPhotoSwitch == 1)) //pic(+video) if(((puiPara->CamMode == SF_CAM_MODE_PHOTO) || (puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO) || (puiPara->CamMode == SF_CAM_MODE_VIDEO2)) && (puiPara->SendPhotoSwitch == 1)) //pic(+video)
{ {
if(smtpUploadPicFlag == 0) if(smtpUploadPicFlag == 0)
{ {
@ -1248,7 +1248,7 @@ SINT32 sf_send_file_to_ftp(UINT8 mode)
printf("[%s:%d]puiPara->NetGeneration=%d\n", __FUNCTION__, __LINE__, puiPara->NetGeneration); printf("[%s:%d]puiPara->NetGeneration=%d\n", __FUNCTION__, __LINE__, puiPara->NetGeneration);
if(((puiPara->CamMode == SF_CAM_MODE_VIDEO) || (puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO)) && (puiPara->SendVideoSwitch == 1) && (puiPara->NetGeneration == 4)) //video if(((puiPara->CamMode == SF_CAM_MODE_VIDEO) || (puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO) || (puiPara->CamMode == SF_CAM_MODE_VIDEO2)) && (puiPara->SendVideoSwitch == 1) && (puiPara->NetGeneration == 4)) //video
{ {
if(smtpUploadVideoFlag == 0) if(smtpUploadVideoFlag == 0)
{ {
@ -1388,11 +1388,11 @@ SINT32 sf_connect_ftps_server(void)
gprsMode = 0;//puiPara->GprsMode; gprsMode = 0;//puiPara->GprsMode;
printf("[%s:%d] ssl:%d,GprsMode:%d\n", __FUNCTION__, __LINE__, ssl, gprsMode); printf("[%s:%d] ssl:%d,GprsMode:%d\n", __FUNCTION__, __LINE__, ssl, gprsMode);
if(((puiPara->CamMode == SF_CAM_MODE_VIDEO) || (puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO)) && (puiPara->SendVideoSwitch == 1) && (puiPara->NetGeneration == 4)) //video if(((puiPara->CamMode == SF_CAM_MODE_VIDEO) || (puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO) || (puiPara->CamMode == SF_CAM_MODE_VIDEO2)) && (puiPara->SendVideoSwitch == 1) && (puiPara->NetGeneration == 4)) //video
{ {
timeout = 120000; timeout = 120000;
} }
else if((2 == puiPara->SendPicSize) && (((puiPara->CamMode == SF_CAM_MODE_PHOTO) || (puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO)) && (puiPara->SendPhotoSwitch == 1))) //pic(+video) else if((2 == puiPara->SendPicSize) && (((puiPara->CamMode == SF_CAM_MODE_PHOTO) || (puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO) || (puiPara->CamMode == SF_CAM_MODE_VIDEO2)) && (puiPara->SendPhotoSwitch == 1))) //pic(+video)
{ {
timeout = 120000; timeout = 120000;
} }

2
code/application/source/sf_app/code/source/4gMng/sf_sms.c
View File

@ -204,7 +204,7 @@ UINT8 sf_message_data_processing(UINT8 strValue[30][32], UINT16 mm, UINT8 *sms_s
} }
else if(strValue[i][4] == '2') else if(strValue[i][4] == '2')
{ {
pPara_sms_saved->CamMode = SF_CAM_MODE_PHOTO_VIDEO; pPara_sms_saved->CamMode = SF_CAM_MODE_VIDEO2;
} }
else else
{ {

2
code/application/source/sf_app/code/source/fileMng/sf_file.c
View File

@ -1538,7 +1538,7 @@ BOOL sf_check_auto_thumb_file(VOID)
fileCfg->filecnt = SendFileTotal; fileCfg->filecnt = SendFileTotal;
for(fileIndex = 0; fileIndex < SendFileTotal; fileIndex++) for(fileIndex = 0; fileIndex < SendFileTotal; fileIndex++)
{ {
if(SF_CAM_MODE_PHOTO_VIDEO == (SendFileList[fileIndex][0] - '0')){ if((SF_CAM_MODE_PHOTO_VIDEO == (SendFileList[fileIndex][0] - '0')) || (SF_CAM_MODE_VIDEO2 == (SendFileList[fileIndex][0] - '0'))){
fileCfg->stfileattr[fileIndex].enFileTye = SF_FILE_TYPE_PIC_VIDEO; fileCfg->stfileattr[fileIndex].enFileTye = SF_FILE_TYPE_PIC_VIDEO;
}else if(SF_CAM_MODE_PHOTO == (SendFileList[fileIndex][0] - '0')){ }else if(SF_CAM_MODE_PHOTO == (SendFileList[fileIndex][0] - '0')){
fileCfg->stfileattr[fileIndex].enFileTye = SF_FILE_TYPE_PIC_SMALL; fileCfg->stfileattr[fileIndex].enFileTye = SF_FILE_TYPE_PIC_SMALL;

7
code/application/source/sf_app/code/source/wifi/sf_wifi_svr.c
View File

@ -1348,7 +1348,7 @@ SINT32 sf_svr_packet_proc(SINT32 fd, UINT8 *pAppData, UINT16 dataLen)
} }
else if (tmpMode == 1) else if (tmpMode == 1)
{ {
puiPara->CamMode = SF_CAM_MODE_PHOTO_VIDEO; puiPara->CamMode = SF_CAM_MODE_VIDEO2;
} }
else if (tmpMode == 2) else if (tmpMode == 2)
{ {
@ -1362,7 +1362,7 @@ SINT32 sf_svr_packet_proc(SINT32 fd, UINT8 *pAppData, UINT16 dataLen)
int iCurrMode = System_GetState(SYS_STATE_CURRMODE); int iCurrMode = System_GetState(SYS_STATE_CURRMODE);
int iNextMode = PRIMARY_MODE_PHOTO; int iNextMode = PRIMARY_MODE_PHOTO;
if((puiPara->CamMode == SF_CAM_MODE_PHOTO) || (puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO)) if((puiPara->CamMode == SF_CAM_MODE_PHOTO) || (puiPara->CamMode == SF_CAM_MODE_VIDEO2))
{ {
iNextMode = PRIMARY_MODE_PHOTO; iNextMode = PRIMARY_MODE_PHOTO;
} }
@ -2652,7 +2652,7 @@ void sf_wifi_hw_init(void)
sprintf(sSSID,"REVEAL_%02X%02X%02X",smac[3],smac[4],smac[5]); sprintf(sSSID,"REVEAL_%02X%02X%02X",smac[3],smac[4],smac[5]);
strcpy(SSID_STR, sSSID); strcpy(SSID_STR, sSSID);
snprintf((char *)puiPara->strSSID, sizeof(puiPara->strSSID), "%s", (char *)SSID_STR);
ret = system("ifconfig wlan0 192.168.1.1 netmask 255.255.255.0 up"); ret = system("ifconfig wlan0 192.168.1.1 netmask 255.255.255.0 up");
//ret = system("hostapd -ddd /appfs/etc/hostapd/hostapd-8189.conf &"); //ret = system("hostapd -ddd /appfs/etc/hostapd/hostapd-8189.conf &");
//ret = system("udhcpd /appfs/etc/udhcpd-8189.conf"); //ret = system("udhcpd /appfs/etc/udhcpd-8189.conf");
@ -2685,6 +2685,7 @@ void sf_wifi_hw_init(void)
sprintf(sSSID,"REVEAL_%02X%02X%02X",smac[3],smac[4],smac[5]); sprintf(sSSID,"REVEAL_%02X%02X%02X",smac[3],smac[4],smac[5]);
strcpy(SSID_STR, sSSID); strcpy(SSID_STR, sSSID);
snprintf((char *)puiPara->strSSID, sizeof(puiPara->strSSID), "%s", (char *)SSID_STR);
sprintf(scmd,"echo \"ap0 alg_cfg tpc_mode 0\" >/sys/hisys/hipriv "); sprintf(scmd,"echo \"ap0 alg_cfg tpc_mode 0\" >/sys/hisys/hipriv ");
ret =system(scmd); ret =system(scmd);
sprintf(scmd,"echo \"ap0 intrf_mode 0 0 0 0 0\" >/sys/hisys/hipriv "); sprintf(scmd,"echo \"ap0 intrf_mode 0 0 0 0 0\" >/sys/hisys/hipriv ");