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

1.同步DS05 水印bug；2.去掉IQ test升级调试；3.同步DS05 IQ参数修改

Browse Source
This commit is contained in:
payton 2023-12-04 14:32:58 +08:00
parent 6809f6646a
commit c794f5903a
7 changed files with 34 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1910,14 +1910,6 @@ INT32 MovieExe_OnOpen(VControl *pCtrl, UINT32 paramNum, UINT32 *paramArray)
Movie_CommPoolInit(); Movie_CommPoolInit();
gMovie_InitCommonMemFinish=1; gMovie_InitCommonMemFinish=1;
#if SF_IQ_TEST == ENABLE
if((0 == access("/mnt/sd/FW98565A.bin", F_OK))){
system("rm -rf /mnt/sd/LD96565A.bin");
system("rm -rf /mnt/sd/FW98565A.bin");
system("sync");
usleep(100*1000);
}
#endif
MovieExe_SetRecInfoByUISetting(); MovieExe_SetRecInfoByUISetting();
gMovie_Disp_Info.vout_ctrl = GxVideo_GetDeviceCtrl(DOUT1,DISPLAY_DEVCTRL_CTRLPATH); gMovie_Disp_Info.vout_ctrl = GxVideo_GetDeviceCtrl(DOUT1,DISPLAY_DEVCTRL_CTRLPATH);

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

@ -2603,14 +2603,6 @@ INT32 PhotoExe_OnOpen(VControl *pCtrl, UINT32 paramNum, UINT32 *paramArray)
GOIO_Turn_Onoff_IRCUT(1); GOIO_Turn_Onoff_IRCUT(1);
//sf_ir_led_set(((2 == puiPara->NightMode) ? 2 : 1),puiPara->FlashLed, puiPara->NightMode,0); //sf_ir_led_set(((2 == puiPara->NightMode) ? 2 : 1),puiPara->FlashLed, puiPara->NightMode,0);
#if SF_IQ_TEST == ENABLE
if((0 == access("/mnt/sd/FW98565A.bin", F_OK))){
system("rm -rf /mnt/sd/LD96565A.bin");
system("rm -rf /mnt/sd/FW98565A.bin");
system("sync");
usleep(100*1000);
}
#endif
PhotoExe_CommPoolInit(); PhotoExe_CommPoolInit();
dualCam =PhotoExe_InitSensorCount(); dualCam =PhotoExe_InitSensorCount();
@ -2877,6 +2869,12 @@ INT32 PhotoExe_OnEV(VControl *pCtrl, UINT32 paramNum, UINT32 *paramArray)
uhSelect = paramArray[0]; uhSelect = paramArray[0];
} }
if(uhSelect != SF_DEFAULT_EV)
{
DBG_ERR("FL_EV Error,uiSelect=%d\r\n", uhSelect);
}
uhSelect = SF_DEFAULT_EV;
UI_SetData(FL_EV, uhSelect); UI_SetData(FL_EV, uhSelect);
Photo_SetUserIndex(PHOTO_USR_EV, uhSelect); Photo_SetUserIndex(PHOTO_USR_EV, uhSelect);
PhotoExe_AE_SetUIInfo(AET_ITEM_EV, Get_EVValue(uhSelect)); PhotoExe_AE_SetUIInfo(AET_ITEM_EV, Get_EVValue(uhSelect));
@ -3903,6 +3901,12 @@ INT32 PhotoExe_OnSharpness(VControl *pCtrl, UINT32 paramNum, UINT32 *paramArray)
uhSelect = paramArray[0]; uhSelect = paramArray[0];
} }
if(uhSelect != SF_DEFAULT_SHARPNESS)
{
DBG_ERR("FL_SHARPNESS Error,uiSelect=%d\r\n", uhSelect);
}
uhSelect = SF_DEFAULT_SHARPNESS;
DBG_IND("%d \r\n", uhSelect); DBG_IND("%d \r\n", uhSelect);
UI_SetData(FL_SHARPNESS, uhSelect); UI_SetData(FL_SHARPNESS, uhSelect);
PhotoExe_IQ_SetUIInfo(IQT_ITEM_SHARPNESS_LV, Get_SharpnessValue(uhSelect)); PhotoExe_IQ_SetUIInfo(IQT_ITEM_SHARPNESS_LV, Get_SharpnessValue(uhSelect));

15
code/application/source/cardv/SrcCode/UIApp/Photo/UIDateImprint.c
View File

@ -303,7 +303,7 @@ void UiDateImprint_InitBuff(void)
#if defined(_UI_STYLE_LVGL_) #if defined(_UI_STYLE_LVGL_)
pInfo->MemSize = UIDateImprint_GetStampMemSize_LVGL((const lv_font_t *)pFont, UiDateImprint_InitStrBuf()); pInfo->MemSize = UIDateImprint_GetStampMemSize_LVGL((const lv_font_t *)pFont, UiDateImprint_InitStrBuf());
pInfo->MemSize = pInfo->MemSize/4*5; //pInfo->MemSize = pInfo->MemSize/4*5; //add alloc buff.
#else #else
GxGfx_SetTextStroke((const FONT *)pFont, FONTSTYLE_NORMAL, SCALE_1X); GxGfx_SetTextStroke((const FONT *)pFont, FONTSTYLE_NORMAL, SCALE_1X);
GxGfx_Text(0, 0, 0, UiDateImprint_InitStrBuf()); //not really draw GxGfx_Text(0, 0, 0, UiDateImprint_InitStrBuf()); //not really draw
@ -344,7 +344,7 @@ void UiDateImprint_InitBuff(void)
#if defined(_UI_STYLE_LVGL_) #if defined(_UI_STYLE_LVGL_)
pInfo->MemSize = UIDateImprint_GetStampMemSize_LVGL((const lv_font_t *)pFont, UiDateImprint_InitStrBuf()); pInfo->MemSize = UIDateImprint_GetStampMemSize_LVGL((const lv_font_t *)pFont, UiDateImprint_InitStrBuf());
pInfo->MemSize = pInfo->MemSize/4*5; //pInfo->MemSize = pInfo->MemSize/4*5; //add alloc buff.
#else #else
GxGfx_SetTextStroke((const FONT *)pFont, FONTSTYLE_NORMAL, SCALE_1X); GxGfx_SetTextStroke((const FONT *)pFont, FONTSTYLE_NORMAL, SCALE_1X);
GxGfx_Text(0, 0, 0, UiDateImprint_InitStrBuf()); //not really draw GxGfx_Text(0, 0, 0, UiDateImprint_InitStrBuf()); //not really draw
@ -381,7 +381,7 @@ void UiDateImprint_InitBuff(void)
#if defined(_UI_STYLE_LVGL_) #if defined(_UI_STYLE_LVGL_)
pInfo->MemSize = UIDateImprint_GetStampMemSize_LVGL((const lv_font_t *)pFont, UiDateImprint_InitStrBuf()); pInfo->MemSize = UIDateImprint_GetStampMemSize_LVGL((const lv_font_t *)pFont, UiDateImprint_InitStrBuf());
pInfo->MemSize = pInfo->MemSize/4*5; //pInfo->MemSize = pInfo->MemSize/4*5; //add alloc buff.
#else #else
GxGfx_SetTextStroke((const FONT *)pFont, FONTSTYLE_NORMAL, SCALE_1X); GxGfx_SetTextStroke((const FONT *)pFont, FONTSTYLE_NORMAL, SCALE_1X);
GxGfx_Text(0, 0, 0, UiDateImprint_InitStrBuf()); //not really draw GxGfx_Text(0, 0, 0, UiDateImprint_InitStrBuf()); //not really draw
@ -911,7 +911,14 @@ void UiDateImprint_DrawBG(DS_STAMP_INFOR *stampInfo, HD_VIDEO_FRAME* Img)
param.color = LV_USER_CFG_STAMP_COLOR_BACKGROUND; /* ARGB format */ param.color = LV_USER_CFG_STAMP_COLOR_BACKGROUND; /* ARGB format */
param.thickness = 10; param.thickness = 10;
param.rect.w = Img->dim.w; param.rect.w = Img->dim.w;
param.rect.h = (stampInfo->Img.dim.h/10)*12; if((Img->dim.w == 1920) || (Img->dim.w == 2560)) //bigger or 5M
{
param.rect.h = stampInfo->Img.dim.h;
}
else
{
param.rect.h = stampInfo->Img.dim.h*11/10; /*add heigt*/
}
param.rect.x = 0; param.rect.x = 0;
//param.rect.y = stampInfo->PosY; //param.rect.y = stampInfo->PosY;
param.rect.y = Img->dim.h - param.rect.h; param.rect.y = Img->dim.h - param.rect.h;

1
code/application/source/cardv/SrcCode/UIApp/Photo/UIDateImprint.h
View File

@ -10,4 +10,5 @@ extern void UiDateImprint_SetEnable(BOOL bEnable);
extern BOOL UiDateImprint_GenData(IMG_CAP_DATASTAMP_INFO *pInfo); extern BOOL UiDateImprint_GenData(IMG_CAP_DATASTAMP_INFO *pInfo);
extern void UiDateImprint_InitBuff(void); extern void UiDateImprint_InitBuff(void);
extern void UiDateImprint_DestroyBuff(void); extern void UiDateImprint_DestroyBuff(void);
UINT8 sf_solar_to_Lunar(UINT16 Year,UINT8 Month, UINT8 Day);
#endif #endif

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

@ -51,7 +51,8 @@ UISysInfo;
//PStore //PStore
#define VER_STR_MAX 32 #define VER_STR_MAX 32
#define SF_DEFAULT_EV 6
#define SF_DEFAULT_SHARPNESS 1
typedef enum { typedef enum {
// << system setting flags region (should be stored in PStore and read back while system initial) >> // << system setting flags region (should be stored in PStore and read back while system initial) >>

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

@ -4176,6 +4176,12 @@ INT32 MovieExe_OnEV(VControl *pCtrl, UINT32 paramNum, UINT32 *paramArray)
uiSelect = paramArray[0]; uiSelect = paramArray[0];
} }
if(uiSelect != SF_DEFAULT_EV)
{
DBG_ERR("FL_EV Error,uiSelect=%d\r\n", uiSelect);
}
uiSelect = SF_DEFAULT_EV;
UI_SetData(FL_EV, uiSelect); UI_SetData(FL_EV, uiSelect);
//photo and movie use the same EV value,should syncronize photo EV setting //photo and movie use the same EV value,should syncronize photo EV setting
Photo_SetUserIndex(PHOTO_USR_EV, uiSelect); Photo_SetUserIndex(PHOTO_USR_EV, uiSelect);

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

@ -51,7 +51,8 @@ UISysInfo;
//PStore //PStore
#define VER_STR_MAX 32 #define VER_STR_MAX 32
#define SF_DEFAULT_EV 6
#define SF_DEFAULT_SHARPNESS 1
typedef enum { typedef enum {
// << system setting flags region (should be stored in PStore and read back while system initial) >> // << system setting flags region (should be stored in PStore and read back while system initial) >>