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

1.视频水印增加camid

Browse Source
This commit is contained in:
payton 2024-01-16 17:22:50 +08:00
parent f112b33866
commit 0cfcf307ce
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
code/application/source/cardv/SrcCode/UIApp/MovieStamp/MovieStamp.c
View File

@ -1285,6 +1285,8 @@ void MovieStamp_CombineStamp(UINT32 vid_in, UINT32 bg_color)
UINT32 lineoff[HD_VIDEO_MAX_PLANE] = {0}; UINT32 lineoff[HD_VIDEO_MAX_PLANE] = {0};
UINT32 addr[HD_VIDEO_MAX_PLANE] = {0}; UINT32 addr[HD_VIDEO_MAX_PLANE] = {0};
UIMenuStoreInfo *puiPara = sf_ui_para_get();
char name[16]; char name[16];
INT16 cTemper = 0; INT16 cTemper = 0;
INT16 fTemper = 0; INT16 fTemper = 0;
@ -1419,6 +1421,15 @@ void MovieStamp_CombineStamp(UINT32 vid_in, UINT32 bg_color)
padding, padding,
&x_curr_ofs); &x_curr_ofs);
//camid stamp
if((puiPara->CamNameSwitch == SF_CAMID_ON) && (puiPara->CamNameStr[0] != '\0'))
{
snprintf((char *)customString, sizeof(customString), "%s", puiPara->CamNameStr);
DBG_IND("[%s:%d]customString=%s\n", __FUNCTION__, __LINE__, customString);
//sprintf(customString, "Cam1");
MovieStamp_AttachString(combined_stamp_h, &Img, customString, font, false, padding, &x_curr_ofs);
}
/*printf("[%s:%d]moon id=%d,battery id=%d\n", __FUNCTION__, __LINE__, /*printf("[%s:%d]moon id=%d,battery id=%d\n", __FUNCTION__, __LINE__,
(LV_PLUGIN_IMG_ID_ICON_10200_MOON + moonday), (LV_PLUGIN_IMG_ID_ICON_10230_BATTERT + batValue));*/ (LV_PLUGIN_IMG_ID_ICON_10200_MOON + moonday), (LV_PLUGIN_IMG_ID_ICON_10230_BATTERT + batValue));*/

10
rtos/code/application/source/cardv/SrcCode/UIApp/MovieStamp/MovieStamp.c
View File

@ -1271,6 +1271,7 @@ void MovieStamp_CombineStamp(UINT32 vid_in, UINT32 bg_color)
HD_VIDEO_FRAME Img = {0}; HD_VIDEO_FRAME Img = {0};
UINT32 lineoff[HD_VIDEO_MAX_PLANE] = {0}; UINT32 lineoff[HD_VIDEO_MAX_PLANE] = {0};
UINT32 addr[HD_VIDEO_MAX_PLANE] = {0}; UINT32 addr[HD_VIDEO_MAX_PLANE] = {0};
UIMenuStoreInfo *puiPara = sf_ui_para_get();
char name[16]; char name[16];
INT16 cTemper = 0; INT16 cTemper = 0;
@ -1413,6 +1414,15 @@ void MovieStamp_CombineStamp(UINT32 vid_in, UINT32 bg_color)
padding, padding,
&x_curr_ofs); &x_curr_ofs);
//camid stamp
if((puiPara->CamNameSwitch == SF_CAMID_ON) && (puiPara->CamNameStr[0] != '\0'))
{
snprintf((char *)customString, sizeof(customString), "%s", puiPara->CamNameStr);
DBG_IND("[%s:%d]customString=%s\n", __FUNCTION__, __LINE__, customString);
//sprintf(customString, "Cam1");
MovieStamp_AttachString(combined_stamp_h, &Img, customString, font, false, padding, &x_curr_ofs);
}
/*printf("[%s:%d]moon id=%d,battery id=%d\n", __FUNCTION__, __LINE__, /*printf("[%s:%d]moon id=%d,battery id=%d\n", __FUNCTION__, __LINE__,
(LV_PLUGIN_IMG_ID_ICON_10200_MOON + moonday), (LV_PLUGIN_IMG_ID_ICON_10230_BATTERT + batValue));*/ (LV_PLUGIN_IMG_ID_ICON_10200_MOON + moonday), (LV_PLUGIN_IMG_ID_ICON_10230_BATTERT + batValue));*/