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

1.发送限制；2.rtsp配置调整

Browse Source
This commit is contained in:
payton 2023-11-22 18:02:54 +08:00
parent 2e274f4f7f
commit 13de078eaa
5 changed files with 49 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
code/application/source/cardv/SrcCode/UIApp/Movie/UIAppMovie_Exe.c
View File

@ -1455,7 +1455,7 @@ static void MovieExe_UserEventCb(UINT32 id, MOVIE_USER_CB_EVENT event_id, UINT32
#if HUNTING_CAMERA_MCU == ENABLE #if HUNTING_CAMERA_MCU == ENABLE
DBG_IND(" ===== MOVIE_USER_CB_EVENT_CLOSE_FILE_COMPLETED ===== id:%d \r\n", id); DBG_IND(" ===== MOVIE_USER_CB_EVENT_CLOSE_FILE_COMPLETED ===== id:%d \r\n", id);
UIMenuStoreInfo *puiPara = sf_ui_para_get(); UIMenuStoreInfo *puiPara = sf_ui_para_get();
if(((SF_CAM_MODE_VIDEO2 == puiPara->CamMode) || (SF_CAM_MODE_PHOTO_VIDEO == puiPara->CamMode)) && (id == _CFG_REC_ID_1)) if(((SF_CAM_MODE_VIDEO2 == puiPara->CamMode) || (SF_CAM_MODE_PHOTO_VIDEO == puiPara->CamMode)) && (id == _CFG_REC_ID_1) && (sf_cardv_get_cq_signal()))
{ {
if(SUCCESS == sf_share_mem_file_down(0, 0)){ if(SUCCESS == sf_share_mem_file_down(0, 0)){
sf_set_send_statu(TRUE); sf_set_send_statu(TRUE);
@ -3084,6 +3084,11 @@ INT32 MovieExe_OnStrmStart(VControl *pCtrl, UINT32 paramNum, UINT32 *paramArray)
if (UI_GetData(FL_MOVIE_DATEIMPRINT) == MOVIE_DATEIMPRINT_ON) { if (UI_GetData(FL_MOVIE_DATEIMPRINT) == MOVIE_DATEIMPRINT_ON) {
MovieExe_WifiMovieStamp(); MovieExe_WifiMovieStamp();
} }
#if HUNTING_CAMERA_MCU == ENABLE
sf_set_rtsp_flag(1);
#endif
return NVTEVT_CONSUME; return NVTEVT_CONSUME;
} }

17
code/application/source/cardv/SrcCode/UIApp/Network/UIAppNetwork.c
View File

@ -28,8 +28,10 @@
#include <cyg/infra/maincmd.h> #include <cyg/infra/maincmd.h>
//#NT#2018/03/21#Niven Cho -end //#NT#2018/03/21#Niven Cho -end
#endif #endif
#if HUNTING_CAMERA_MCU == ENABLE
#include <sf_wifi_svr.h> #include <sf_wifi_svr.h>
#include "sf_common.h"
#endif
#define _NETWORK_ON_CPU1_ ENABLE #define _NETWORK_ON_CPU1_ ENABLE
//local debug level: THIS_DBGLVL //local debug level: THIS_DBGLVL
@ -1619,6 +1621,7 @@ INT32 sf_net_wifi_init(UINT32 mode, UINT32 security)
{ {
UINT32 result = 0; UINT32 result = 0;
UINT32 i = 0;
nvt_wifi_settings *pwifi = &wifiConfig; nvt_wifi_settings *pwifi = &wifiConfig;
DBG_IND("set wifi %d %d \r\n", mode, security); DBG_IND("set wifi %d %d \r\n", mode, security);
@ -1648,6 +1651,18 @@ INT32 sf_net_wifi_init(UINT32 mode, UINT32 security)
UINet_RtspInit(); UINet_RtspInit();
sf_wifi_app_start(); sf_wifi_app_start();
for (i = 0; i < 50; i++)
{
if (1 == sf_get_rtsp_flag())
{
DBG_IND("wifi config ok\r\n");
break;
}
else
{
usleep(200*1000);
}
}
ImageApp_Common_RtspStart(0); ImageApp_Common_RtspStart(0);
return result; return result;

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

@ -1927,6 +1927,15 @@ static void PhotoExe_WifiCB(void)
HD_VIDEO_FRAME video_frame = {0}; HD_VIDEO_FRAME video_frame = {0};
HD_RESULT ret; HD_RESULT ret;
PHOTO_STRM_INFO *p_strm = NULL; PHOTO_STRM_INFO *p_strm = NULL;
#if HUNTING_CAMERA_MCU == ENABLE
static int tmp = 1;
if(tmp)//test log
{
tmp = 0;
sf_set_rtsp_flag(1);
printf("[%s:%d]s\n", __FUNCTION__, __LINE__);
}
#endif
p_strm = UIAppPhoto_get_StreamConfig(UIAPP_PHOTO_STRM_ID_1); p_strm = UIAppPhoto_get_StreamConfig(UIAPP_PHOTO_STRM_ID_1);
if(p_strm->enable != PHOTO_PORT_STATE_EN_RUN){ if(p_strm->enable != PHOTO_PORT_STATE_EN_RUN){
vos_util_delay_ms(50); vos_util_delay_ms(50);
@ -2132,6 +2141,7 @@ static void PhotoExe_InitNetworkStream(UINT32 dualCam, USIZE *pImageRatioSize)
} }
#endif #endif
#if 1 #if 1
//printf("\r\n[%s] enable:%d strm_type:%d width_ratio:%d height_ratio:%d width:%d\n", __FUNCTION__, __LINE__,p_strm->enable, p_strm->strm_type, p_strm->multi_view_type, p_strm->width_ratio,p_strm->height_ratio,p_strm->width);
for (i = 0; i < SENSOR_CAPS_COUNT; i++) { for (i = 0; i < SENSOR_CAPS_COUNT; i++) {
ImageApp_Photo_WiFiConfig(PHOTO_CFG_CBR_INFO, (UINT32)&(g_tStrmCbrInfo[i])); ImageApp_Photo_WiFiConfig(PHOTO_CFG_CBR_INFO, (UINT32)&(g_tStrmCbrInfo[i]));
} }
@ -6815,7 +6825,7 @@ INT32 PhotoExe_Preview_SliceEncode_CB3(void* user_data)
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 */
DBG_DUMP("PHOTO THUMB %s \n %s\n", tmp, tmp2); DBG_DUMP("PHOTO THUMB %s \n %s\n", tmp, tmp2);
sf_file_thumb_cfg_fill(tmp, tmp2, queue_ele_in->jpg_thumb_size, enFileType); sf_file_thumb_cfg_fill(tmp, tmp2, queue_ele_in->jpg_thumb_size, enFileType);
if((SF_CAM_MODE_PHOTO == puiPara->CamMode) || ((!sf_get_mode_flag()) && (puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO || puiPara->CamMode == SF_CAM_MODE_VIDEO2))) if(sf_cardv_get_cq_signal() && ((SF_CAM_MODE_PHOTO == puiPara->CamMode) || ((!sf_get_mode_flag()) && (puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO || puiPara->CamMode == SF_CAM_MODE_VIDEO2))))
{ {
if(SUCCESS == sf_share_mem_file_down(0, 0)){ if(SUCCESS == sf_share_mem_file_down(0, 0)){
sf_set_send_statu(TRUE); sf_set_send_statu(TRUE);

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

@ -1256,7 +1256,7 @@ static void UIFlowMovie_Key(lv_obj_t* obj, uint32_t key)
case LV_KEY_ENTER: case LV_KEY_ENTER:
{ {
#if HUNTING_CAMERA_MCU == ENABLE #if HUNTING_CAMERA_MCU == ENABLE
sf_rtsp_stop(); // sf_rtsp_stop();
if(TRUE == sf_get_send_statu()) if(TRUE == sf_get_send_statu())
{ {
printf("\r\n[%s] line:%d %d running\n", __FUNCTION__, __LINE__,key); printf("\r\n[%s] line:%d %d running\n", __FUNCTION__, __LINE__,key);
@ -1506,13 +1506,13 @@ void UIFlowMovieEventCallback(lv_obj_t* obj, lv_event_t event)
{ {
OpenPasswordScreen(); OpenPasswordScreen();
} }
#if HUNTING_CAMERA_MCU == ENABLE // #if HUNTING_CAMERA_MCU == ENABLE
UIMenuStoreInfo *puiPara = sf_ui_para_get(); // UIMenuStoreInfo *puiPara = sf_ui_para_get();
if((SF_CAM_MODE_VIDEO == puiPara->CamMode)) // if((SF_CAM_MODE_VIDEO == puiPara->CamMode))
{ // {
sf_rtsp_restart(); // sf_rtsp_restart();
} // }
#endif // #endif
break; break;
case LV_PLUGIN_EVENT_SCR_CLOSE: case LV_PLUGIN_EVENT_SCR_CLOSE:

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

@ -1572,7 +1572,7 @@ static void UIFlowPhoto_Key(lv_obj_t* obj, uint32_t key)
case LV_KEY_ENTER: case LV_KEY_ENTER:
{ {
#if HUNTING_CAMERA_MCU == ENABLE #if HUNTING_CAMERA_MCU == ENABLE
sf_rtsp_stop(); // sf_rtsp_stop();
if(TRUE == sf_get_send_statu()) if(TRUE == sf_get_send_statu())
{ {
printf("\r\n[%s] line:%d %d running\n", __FUNCTION__, __LINE__,key); printf("\r\n[%s] line:%d %d running\n", __FUNCTION__, __LINE__,key);
@ -1709,13 +1709,13 @@ void UIFlowPhotoEventCallback(lv_obj_t* obj, lv_event_t event)
OpenPasswordScreen(); OpenPasswordScreen();
ShutDownTime = PASSWORD_GO_TO_WORK_MODE_TIME_S; ShutDownTime = PASSWORD_GO_TO_WORK_MODE_TIME_S;
} }
#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) || (puiPara->CamMode == SF_CAM_MODE_VIDEO2)) // 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();
} // }
#endif // #endif
break; break;
case LV_PLUGIN_EVENT_SCR_CLOSE: case LV_PLUGIN_EVENT_SCR_CLOSE: