diff --git a/code/application/source/cardv/SrcCode/UIApp/Movie/UIAppMovie_Exe.c b/code/application/source/cardv/SrcCode/UIApp/Movie/UIAppMovie_Exe.c index 67342e644..5bfb97d9f 100755 --- a/code/application/source/cardv/SrcCode/UIApp/Movie/UIAppMovie_Exe.c +++ b/code/application/source/cardv/SrcCode/UIApp/Movie/UIAppMovie_Exe.c @@ -293,6 +293,34 @@ if (OnOff){ vos_util_delay_ms(20); return 0; } + +#if HUNTING_CAMERA_MCU == ENABLE +INT32 sf_get_cur_day_night_status(void) +{ + static AET_STATUS_INFO ae_status_info = {0}; + + HD_RESULT hd_ret; + + if ((hd_ret = vendor_isp_init()) != HD_OK) { + DBG_ERR("vendor_isp_init() fail(%d)\r\n", hd_ret); + } + + vendor_isp_get_ae(AET_ITEM_STATUS, &ae_status_info); + + if (((ae_status_info.status_info.lv / 1000000) < 7)) + { + sf_set_ae_night_mode(1); + return 1; + } + else + { + sf_set_ae_night_mode(0); + return 0; + + } +} +#endif + INT32 Set_Cur_Day_Night_Status(BOOL OnOff, UINT8 isSnapVideo) { static AET_STATUS_INFO ae_status_info = {0}; diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIMovieMapping.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIMovieMapping.c index 0a38d3093..b96aef78b 100644 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIMovieMapping.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIMovieMapping.c @@ -13,7 +13,7 @@ /////////////////////////////////////////////////////////////////////////////// UINT32 GetWiFiIndex(UINT32 singleIndex); - +extern INT32 sf_get_cur_day_night_status(void); typedef struct { UINT32 uiWidth; UINT32 uiHeight; @@ -561,12 +561,25 @@ UINT32 MovieMapping_GetHeight(UINT32 uiSizeIdx, UINT32 uiIplId) UINT32 movie_size = g_MovieRecMappingTable[uiSizeIdx].SizeIdx[uiIplId]; return g_MovieSizeTable[movie_size].SizeInfo.uiHeight; } +#if HUNTING_CAMERA_MCU == ENABLE +UINT32 sf_movie_mapping_get_gop(UINT32 uiSizeIdx) +{ + #if 0//HUNTING_CAMERA_MCU == ENABLE + if(sf_get_cur_day_night_status() == 1) + { + printf("[%s:%d] uiGOP 15\n", __FUNCTION__, __LINE__); + return 15; + } + #endif + return g_MovieSizeTable[uiSizeIdx].CbrInfo.uiGOP; +} +#endif UINT32 MovieMapping_GetFrameRate(UINT32 uiSizeIdx, UINT32 uiIplId) { UINT32 movie_size = g_MovieRecMappingTable[uiSizeIdx].SizeIdx[uiIplId]; #if 0//HUNTING_CAMERA_MCU == ENABLE - if(sf_is_night_mode(0) == TRUE) + if(sf_get_cur_day_night_status() == 1) { printf("[%s:%d] VidFrameRate 15\n", __FUNCTION__, __LINE__); return 15; @@ -628,7 +641,7 @@ UINT32 MovieMapping_GetCloneFrameRate(UINT32 uiSizeIdx, UINT32 uiIplId) { UINT32 movie_size = g_MovieRecMappingTable[uiSizeIdx].SizeIdxClone[uiIplId]; #if 0//HUNTING_CAMERA_MCU == ENABLE - if(sf_is_night_mode(0) == TRUE) + if(sf_get_cur_day_night_status() == 1) { printf("[%s:%d] VidFrameRate 15\n", __FUNCTION__, __LINE__); return 15; @@ -678,12 +691,12 @@ void MovieMapping_GetStreamInfo(UINT32 uiSizeIdx, UINT32 Value) { MOVIE_STRM_INFO* ptStreamInfo = (MOVIE_STRM_INFO*) Value; - uiSizeIdx = MOVIE_SIZE_WIFI_STREAMING; + // uiSizeIdx = MOVIE_SIZE_WIFI_STREAMING; if (ptStreamInfo) { ptStreamInfo->size.w = g_MovieSizeTable[uiSizeIdx].SizeInfo.uiWidth; ptStreamInfo->size.h = g_MovieSizeTable[uiSizeIdx].SizeInfo.uiHeight; - ptStreamInfo->frame_rate = g_MovieSizeTable[uiSizeIdx].SizeInfo.uiVidFrameRate; + ptStreamInfo->frame_rate = MovieMapping_GetFrameRate(uiSizeIdx, 0);//g_MovieSizeTable[uiSizeIdx].SizeInfo.uiVidFrameRate; memcpy(&ptStreamInfo->cbr_info, &g_MovieSizeTable[uiSizeIdx].CbrInfo, sizeof(MOVIE_CBR_PARAM)); ptStreamInfo->max_bit_rate = g_MovieSizeTable[uiSizeIdx].CbrInfo.uiByteRate;