From 0cfcf307cee9de758441aa4d80890db45b762a56 Mon Sep 17 00:00:00 2001 From: payton Date: Tue, 16 Jan 2024 17:22:50 +0800 Subject: [PATCH] =?UTF-8?q?1.=E8=A7=86=E9=A2=91=E6=B0=B4=E5=8D=B0=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0camid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cardv/SrcCode/UIApp/MovieStamp/MovieStamp.c | 11 +++++++++++ .../cardv/SrcCode/UIApp/MovieStamp/MovieStamp.c | 10 ++++++++++ 2 files changed, 21 insertions(+) diff --git a/code/application/source/cardv/SrcCode/UIApp/MovieStamp/MovieStamp.c b/code/application/source/cardv/SrcCode/UIApp/MovieStamp/MovieStamp.c index 28dc0d4c4..56f75ee17 100755 --- a/code/application/source/cardv/SrcCode/UIApp/MovieStamp/MovieStamp.c +++ b/code/application/source/cardv/SrcCode/UIApp/MovieStamp/MovieStamp.c @@ -1285,6 +1285,8 @@ void MovieStamp_CombineStamp(UINT32 vid_in, UINT32 bg_color) UINT32 lineoff[HD_VIDEO_MAX_PLANE] = {0}; UINT32 addr[HD_VIDEO_MAX_PLANE] = {0}; + UIMenuStoreInfo *puiPara = sf_ui_para_get(); + char name[16]; INT16 cTemper = 0; INT16 fTemper = 0; @@ -1419,6 +1421,15 @@ void MovieStamp_CombineStamp(UINT32 vid_in, UINT32 bg_color) padding, &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__, (LV_PLUGIN_IMG_ID_ICON_10200_MOON + moonday), (LV_PLUGIN_IMG_ID_ICON_10230_BATTERT + batValue));*/ diff --git a/rtos/code/application/source/cardv/SrcCode/UIApp/MovieStamp/MovieStamp.c b/rtos/code/application/source/cardv/SrcCode/UIApp/MovieStamp/MovieStamp.c index dc8c8a853..77fcb0793 100755 --- a/rtos/code/application/source/cardv/SrcCode/UIApp/MovieStamp/MovieStamp.c +++ b/rtos/code/application/source/cardv/SrcCode/UIApp/MovieStamp/MovieStamp.c @@ -1271,6 +1271,7 @@ void MovieStamp_CombineStamp(UINT32 vid_in, UINT32 bg_color) HD_VIDEO_FRAME Img = {0}; UINT32 lineoff[HD_VIDEO_MAX_PLANE] = {0}; UINT32 addr[HD_VIDEO_MAX_PLANE] = {0}; + UIMenuStoreInfo *puiPara = sf_ui_para_get(); char name[16]; INT16 cTemper = 0; @@ -1413,6 +1414,15 @@ void MovieStamp_CombineStamp(UINT32 vid_in, UINT32 bg_color) padding, &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__, (LV_PLUGIN_IMG_ID_ICON_10200_MOON + moonday), (LV_PLUGIN_IMG_ID_ICON_10230_BATTERT + batValue));*/