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

1.修改第二路视频;2.修改默认参数

Browse Source
This commit is contained in:
payton 2023-05-29 15:09:45 +08:00
parent 6af2a77189
commit b813069787
17 changed files with 1354 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2404,7 +2404,7 @@ INT32 MovieExe_OnCyclicRec(VControl *pCtrl, UINT32 paramNum, UINT32 *paramArray)
} }
if (clone_rec_mask & mask) { if (clone_rec_mask & mask) {
ImageApp_MovieMulti_SetParam(gMovie_Clone_Info[i].rec_id, MOVIEMULTI_PARAM_FILE_SEAMLESSSEC, (gMovie_Rec_Option.seamless_sec + 10)); ImageApp_MovieMulti_SetParam(gMovie_Clone_Info[i].rec_id, MOVIEMULTI_PARAM_FILE_SEAMLESSSEC, (gMovie_Rec_Option.seamless_sec));
ImageApp_MovieMulti_SetParam(gMovie_Clone_Info[i].rec_id, MOVIEMULTI_PARAM_FILE_ENDTYPE, (uiSelect == MOVIE_CYCLICREC_OFF) ? MOVREC_ENDTYPE_CUT_TILLCARDFULL : MOVREC_ENDTYPE_CUTOVERLAP); ImageApp_MovieMulti_SetParam(gMovie_Clone_Info[i].rec_id, MOVIEMULTI_PARAM_FILE_ENDTYPE, (uiSelect == MOVIE_CYCLICREC_OFF) ? MOVREC_ENDTYPE_CUT_TILLCARDFULL : MOVREC_ENDTYPE_CUTOVERLAP);
} }

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

@ -65,6 +65,9 @@ static CHAR *resolution_Buf[MOVIE_SIZE_ID_MAX] = {
[MOVIE_SIZE_CLONE_1920x1080P30_640x360P30] = "FHD P60+VGA P30", [MOVIE_SIZE_CLONE_1920x1080P30_640x360P30] = "FHD P60+VGA P30",
[MOVIE_SIZE_CLONE_1920x1080P30_848x480P30] = "FHD P30+WVGA P30", [MOVIE_SIZE_CLONE_1920x1080P30_848x480P30] = "FHD P30+WVGA P30",
[MOVIE_SIZE_CLONE_2048x2048P30_480x480P30] = "2048x2048 P30 + 480x480 P30", [MOVIE_SIZE_CLONE_2048x2048P30_480x480P30] = "2048x2048 P30 + 480x480 P30",
[MOVIE_SIZE_CLONE_1920x1080P30_1920x1080P25] = "FHD P30+FHD P25",
[MOVIE_SIZE_CLONE_1280x720P30_1280x720P25] = "HD P30+HD P25",
[MOVIE_SIZE_CLONE_848x480P30_848x480P25] = "WVGA P30+WVGA P25",
}; };
/**************************************************************** /****************************************************************

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

@ -63,7 +63,7 @@
#define DEFAULT_MOVIE_SIZE MOVIE_SIZE_DUAL_1920x1080P30_848x480P30//MOVIE_SIZE_FRONT_1920x1080P30 #define DEFAULT_MOVIE_SIZE MOVIE_SIZE_DUAL_1920x1080P30_848x480P30//MOVIE_SIZE_FRONT_1920x1080P30
#else #else
#if (MOVIE_AI_DEMO == DISABLE) #if (MOVIE_AI_DEMO == DISABLE)
#define DEFAULT_MOVIE_SIZE MOVIE_SIZE_CLONE_1920x1080P30_640x360P30 #define DEFAULT_MOVIE_SIZE MOVIE_SIZE_CLONE_1920x1080P30_1920x1080P25
#else #else
#define DEFAULT_MOVIE_SIZE MOVIE_SIZE_DUAL_1920x1080P30_848x480P30//MOVIE_SIZE_FRONT_1920x1080P30 #define DEFAULT_MOVIE_SIZE MOVIE_SIZE_DUAL_1920x1080P30_848x480P30//MOVIE_SIZE_FRONT_1920x1080P30
#endif #endif

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

@ -1167,13 +1167,16 @@ enum _MOVIE_MENU_SIZE {
MOVIE_SIZE_CLONE_1920x1080P60_640x360P30, /// FHD VGA MOVIE_SIZE_CLONE_1920x1080P60_640x360P30, /// FHD VGA
MOVIE_SIZE_CLONE_1920x1080P30_640x360P30, /// FHD VGA MOVIE_SIZE_CLONE_1920x1080P30_640x360P30, /// FHD VGA
MOVIE_SIZE_CLONE_1920x1080P30_848x480P30, /// FHD WVGA MOVIE_SIZE_CLONE_1920x1080P30_848x480P30, /// FHD WVGA
MOVIE_SIZE_CLONE_1920x1080P30_1920x1080P25, /// FHD30 FHD25
MOVIE_SIZE_CLONE_2048x2048P30_480x480P30, MOVIE_SIZE_CLONE_2048x2048P30_480x480P30,
MOVIE_SIZE_CLONE_1280x720P60_1280x720P60, /// HD HD p60 MOVIE_SIZE_CLONE_1280x720P60_1280x720P60, /// HD HD p60
MOVIE_SIZE_CLONE_1280x720P30_1280x720P30, /// HD HD p30 MOVIE_SIZE_CLONE_1280x720P30_1280x720P30, /// HD HD p30
MOVIE_SIZE_CLONE_1280x720P30_1280x720P25, /// HD30 HD p25
MOVIE_SIZE_CLONE_1280x720P120_848x480P30, /// HD WVGA MOVIE_SIZE_CLONE_1280x720P120_848x480P30, /// HD WVGA
MOVIE_SIZE_CLONE_1280x720P60_848x480P30, /// HD WVGA MOVIE_SIZE_CLONE_1280x720P60_848x480P30, /// HD WVGA
MOVIE_SIZE_CLONE_1280x720P30_848x480P30, /// HD WVGA MOVIE_SIZE_CLONE_1280x720P30_848x480P30, /// HD WVGA
MOVIE_SIZE_CLONE_848x480P30_848x480P30, /// WVGA WVGA MOVIE_SIZE_CLONE_848x480P30_848x480P30, /// WVGA WVGA
MOVIE_SIZE_CLONE_848x480P30_848x480P25, /// WVGA30 WVGA25
MOVIE_SIZE_CLONE_640x480P30_640x480P30, /// VGA VGA MOVIE_SIZE_CLONE_640x480P30_640x480P30, /// VGA VGA
MOVIE_SIZE_CLONE_320x240P30_320x240P30, /// QVGA QVGA MOVIE_SIZE_CLONE_320x240P30_320x240P30, /// QVGA QVGA
MOVIE_SIZE_ID_MAX, MOVIE_SIZE_ID_MAX,
@ -1205,6 +1208,9 @@ enum _MOVIE_SIZE {
MOVIE_SIZE_320x240P30, /// QVGA P30 MOVIE_SIZE_320x240P30, /// QVGA P30
MOVIE_SIZE_2048x2048P30, /// 2048x2048 P30 MOVIE_SIZE_2048x2048P30, /// 2048x2048 P30
MOVIE_SIZE_480x480P30, /// 480x480 P30 MOVIE_SIZE_480x480P30, /// 480x480 P30
MOVIE_SIZE_1920x1080P25, /// FHD P25
MOVIE_SIZE_1280x720P25, /// HD P25
MOVIE_SIZE_848x480P25, /// WVGA P25
}; };
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

47
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIMovieMapping.c
View File

@ -147,9 +147,9 @@ static MOVIE_SIZE_ITEM g_MovieSizeTable[] = {
}, },
[MOVIE_SIZE_1920x1080P30] = { [MOVIE_SIZE_1920x1080P30] = {
{1920, 1080, 30, 104857/*262144 2M = 2*1024*1024/8 */, MEDIAREC_DAR_DEFAULT, IMAGERATIO_16_9}, {1920, 1080, 30, /*104857*/262144 /*2M = 2*1024*1024/8 */, MEDIAREC_DAR_DEFAULT, IMAGERATIO_16_9},
{1, 3, 36, 8, -8, 0}, {1, 3, 36, 8, -8, 0},
{1, 4, 30, 104857/*262144 2M = 2*1024*1024/8 */, 30, 26, 15, 50, 26, 15, 50, 0, 1, 8, 4}, {1, 4, 30, /*104857*/262144 /*2M = 2*1024*1024/8 */, 30, 26, 15, 50, 26, 15, 50, 0, 1, 8, 4},
}, },
[MOVIE_SIZE_1280x720P240] = { [MOVIE_SIZE_1280x720P240] = {
@ -171,15 +171,15 @@ static MOVIE_SIZE_ITEM g_MovieSizeTable[] = {
}, },
[MOVIE_SIZE_1280x720P30] = { [MOVIE_SIZE_1280x720P30] = {
{1280, 720, 30, 58982/*131072 1M = 1*1024*1024/8 */, MEDIAREC_DAR_DEFAULT, IMAGERATIO_16_9}, {1280, 720, 30, /*58982*/131072 /* 1M = 1*1024*1024/8 */, MEDIAREC_DAR_DEFAULT, IMAGERATIO_16_9},
{1, 3, 36, 8, -8, 0}, {1, 3, 36, 8, -8, 0},
{1, 4, 30, 58982/*131072 1M = 1*1024*1024/8 */, 30, 26, 15, 50, 26, 15, 50, 0, 1, 8, 4}, {1, 4, 30, /*58982*/131072 /* 1M = 1*1024*1024/8 */, 30, 26, 15, 50, 26, 15, 50, 0, 1, 8, 4},
}, },
[MOVIE_SIZE_848x480P30] = { [MOVIE_SIZE_848x480P30] = {
{848, 480, 30, 32768/*110100*/, MEDIAREC_DAR_DEFAULT, IMAGERATIO_16_9}, {848, 480, 30, /*32768*/110100/**/, MEDIAREC_DAR_DEFAULT, IMAGERATIO_16_9},
{1, 3, 36, 8, -8, 0}, {1, 3, 36, 8, -8, 0},
{1, 4, 30, 32768/*110100*/, 30, 26, 15, 50, 26, 15, 50, 0, 1, 8, 4}, {1, 4, 30, /*32768*/110100/**/, 30, 26, 15, 50, 26, 15, 50, 0, 1, 8, 4},
}, },
[MOVIE_SIZE_848x480P30_WIFI] = { [MOVIE_SIZE_848x480P30_WIFI] = {
@ -229,7 +229,24 @@ static MOVIE_SIZE_ITEM g_MovieSizeTable[] = {
{1, 3, 36, 8, -8, 0}, {1, 3, 36, 8, -8, 0},
{1, 4, 30, 100 * 1024, 15, 26, 15, 45, 26, 15, 45, 0, 1, 8, 4}, {1, 4, 30, 100 * 1024, 15, 26, 15, 45, 26, 15, 45, 0, 1, 8, 4},
}, },
[MOVIE_SIZE_1920x1080P25] = {
{1920, 1080, 25, 104857/*262144 2M = 2*1024*1024/8 */, MEDIAREC_DAR_DEFAULT, IMAGERATIO_16_9},
{1, 3, 36, 8, -8, 0},
{1, 4, 25, 104857/*262144 2M = 2*1024*1024/8 */, 25, 26, 15, 50, 26, 15, 50, 40, 1, 8, 4},
},
[MOVIE_SIZE_1280x720P25] = {
{1280, 720, 25, 58982/*131072 1M = 1*1024*1024/8 */, MEDIAREC_DAR_DEFAULT, IMAGERATIO_16_9},
{1, 3, 36, 8, -8, 0},
{1, 4, 25, 58982/*131072 1M = 1*1024*1024/8 */, 25, 26, 15, 50, 26, 15, 50, 40, 1, 8, 4},
},
[MOVIE_SIZE_848x480P25] = {
{848, 480, 25, 32768/*110100*/, MEDIAREC_DAR_DEFAULT, IMAGERATIO_16_9},
{1, 3, 36, 8, -8, 0},
{1, 4, 25, 32768/*110100*/, 25, 26, 15, 50, 26, 15, 50, 40, 1, 8, 4},
},
}; };
// movie recording table, mapping to movie menu // movie recording table, mapping to movie menu
@ -457,6 +474,12 @@ static MOVIE_SIZE_MAPPING g_MovieRecMappingTable[MOVIE_SIZE_ID_MAX] = {
{MOVIE_SIZE_848x480P30, 0}, {MOVIE_SIZE_848x480P30, 0},
}, },
[MOVIE_SIZE_CLONE_1920x1080P30_1920x1080P25] = {
MOVIE_REC_TYPE_CLONE,
{MOVIE_SIZE_1920x1080P30, 0, 0},
{MOVIE_SIZE_1920x1080P25, 0, 0},
},
[MOVIE_SIZE_CLONE_2048x2048P30_480x480P30] = { [MOVIE_SIZE_CLONE_2048x2048P30_480x480P30] = {
MOVIE_REC_TYPE_CLONE, MOVIE_REC_TYPE_CLONE,
{MOVIE_SIZE_2048x2048P30, 0}, {MOVIE_SIZE_2048x2048P30, 0},
@ -469,6 +492,12 @@ static MOVIE_SIZE_MAPPING g_MovieRecMappingTable[MOVIE_SIZE_ID_MAX] = {
{MOVIE_SIZE_1280x720P30, 0}, {MOVIE_SIZE_1280x720P30, 0},
}, },
[MOVIE_SIZE_CLONE_1280x720P30_1280x720P25] = {
MOVIE_REC_TYPE_CLONE,
{MOVIE_SIZE_1280x720P30, 0, 0},
{MOVIE_SIZE_1280x720P25, 0, 0},
},
[MOVIE_SIZE_CLONE_1280x720P120_848x480P30] = { [MOVIE_SIZE_CLONE_1280x720P120_848x480P30] = {
MOVIE_REC_TYPE_CLONE, MOVIE_REC_TYPE_CLONE,
{MOVIE_SIZE_1280x720P120, 0}, {MOVIE_SIZE_1280x720P120, 0},
@ -493,6 +522,12 @@ static MOVIE_SIZE_MAPPING g_MovieRecMappingTable[MOVIE_SIZE_ID_MAX] = {
{MOVIE_SIZE_848x480P30, 0}, {MOVIE_SIZE_848x480P30, 0},
}, },
[MOVIE_SIZE_CLONE_848x480P30_848x480P25] = {
MOVIE_REC_TYPE_CLONE,
{MOVIE_SIZE_848x480P30, 0, 0},
{MOVIE_SIZE_848x480P25, 0, 0},
},
[MOVIE_SIZE_CLONE_640x480P30_640x480P30] = { [MOVIE_SIZE_CLONE_640x480P30_640x480P30] = {
MOVIE_REC_TYPE_CLONE, MOVIE_REC_TYPE_CLONE,
{MOVIE_SIZE_640x480P30, 0}, {MOVIE_SIZE_640x480P30, 0},

BIN
code/hdal/vendor/output/libvendor_ai2_pub.a vendored
View File

Binary file not shown.

BIN
code/hdal/vendor/output/libvendor_ai2_pub2.a vendored
View File

Binary file not shown.

6
code/lib/source/sifar/code/source/common/sf_common.c
View File

@ -1121,14 +1121,14 @@ UINT32 sf_set_pir_sensitivity(UINT8 pirs)
puiPara->DigitPirCnt = digPirCount[pirs]; puiPara->DigitPirCnt = digPirCount[pirs];
puiPara->DigitPirWindowTime = 0; puiPara->DigitPirWindowTime = 0;
/*if(puiPara->PirSensitivity)) if(puiPara->PirSensitivity)
{ {
puiPara->TimelapseSwitch, SF_OFF); puiPara->TimelapseSwitch = SF_OFF;
puiPara->TimelapseTime.Hour = 0; puiPara->TimelapseTime.Hour = 0;
puiPara->TimelapseTime.Min = 0; puiPara->TimelapseTime.Min = 0;
puiPara->TimelapseTime.Sec = 0; puiPara->TimelapseTime.Sec = 0;
//Save_MenuInfo(); //Save_MenuInfo();
}*/ }
return SUCCESS; return SUCCESS;
} }

63
configs/Linux/cfg_565_HUNTING_EVB_LINUX_4G_S530/ModelConfig.mk Normal file
View File

@ -0,0 +1,63 @@
#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
#!automatically-generated file. do not edit!!
#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
BOARD_DRAM_ADDR = 0x00000000
BOARD_DRAM_SIZE = 0x08000000
BOARD_SHMEM_ADDR = 0x00007E00
BOARD_SHMEM_SIZE = 0x00000200
BOARD_LOADER_ADDR = 0x01000000
BOARD_LOADER_SIZE = 0x00080000
BOARD_FDT_ADDR = 0x01800000
BOARD_FDT_SIZE = 0x00040000
BOARD_RTOS_ADDR = 0x01840000
BOARD_RTOS_SIZE = 0x00FC0000
BOARD_LINUXTMP_ADDR = 0x02800000
BOARD_LINUXTMP_SIZE = 0x04000000
BOARD_UBOOT_ADDR = 0x06800000
BOARD_UBOOT_SIZE = 0x01640000
BOARD_LOGO-FB_ADDR = 0x07E40000
BOARD_LOGO-FB_SIZE = 0x001C0000
BOARD_LINUX_ADDR = 0x00000000
BOARD_LINUX_SIZE = 0x01800000
BOARD_LINUX_MAXBLK_ADDR = 0x00000000
BOARD_LINUX_MAXBLK_SIZE = 0x01800000
BOARD_MEDIA_ADDR = 0x03600000
BOARD_MEDIA_SIZE = 0x04A00000
BIN_NAME = FW98565A
BIN_NAME_T = FW98565T
RTOS_APP_MAIN = cardv
EMBMEM_BLK_SIZE = 0x10000
EMBMEM = EMBMEM_SPI_NOR
FW_TYPE = FW_TYPE_PARTIAL
UI_STYLE = UI_STYLE_LVGL
NVT_CFG_APP_EXTERNAL = hostapd wireless_tool iperf-3 wpa_supplicant dhd_priv
NVT_CFG_APP = mem cardv memcpy isp_demon sf_app
NVT_ROOTFS_ETC =
NVT_BINARY_FILE_STRIP = yes
NVT_CFG_KERNEL_CFG = na51089_evb_cardv_defconfig_release
NVT_MAKE_POST = make_post.sh
NVT_SAMPLES_INSTALL = DISABLE
NVT_CFG_UBOOT_CFG =
NVT_LINUX_SMP = NVT_LINUX_SMP_OFF
NVT_CHIP_ID = CHIP_NA51089
NVT_LINUX_COMPRESS = NVT_LINUX_COMPRESS_GZ
NVT_DEFAULT_NETWORK_BOOT_PROTOCOL = NVT_DEFAULT_NETWORK_BOOT_PROTOCOL_STATIC_IP
NVT_ROOTFS_TYPE = NVT_ROOTFS_TYPE_RAMDISK
LCD1 = disp_if8b_lcd1_psd200_st7789v
SENSOR1 = sen_os05b10
SENSOR1_CFG = sen_os05b10_565
SENSOR2 = sen_off
SENSOR2_CFG = sen_off
NVT_ROOTFS_RW_PART_EN = NVT_ROOTFS_RW_PART_EN_ON
NVT_ETHERNET = NVT_ETHERNET_NONE
NVT_SDIO_WIFI = NVT_SDIO_WIFI_RTK
NVT_USB_WIFI = NVT_USB_WIFI_NONE
NVT_USB_4G = NVT_USB_4G_NONE
WIFI_RTK_MDL = WIFI_RTK_MDL_8189
WIFI_BRCM_MDL = WIFI_BRCM_MDL_43456c5_ampk6256c5
WIFI_NVT_MDL = WIFI_NVT_MDL_18211
NVT_CURL_SSL = NVT_CURL_SSL_OPENSSL
NVT_UBOOT_ENV_IN_STORG_SUPPORT = NVT_UBOOT_ENV_IN_STORG_SUPPORT_OFF
TOUCH = TOUCH_OFF
UBOOT_ONLY_LOAD_LINUX = UBOOT_ONLY_LOAD_LINUX_ON

BIN
configs/Linux/cfg_565_HUNTING_EVB_LINUX_4G_S530/nvt-evb.dtb Normal file
View File

Binary file not shown.

1181
configs/Linux/cfg_565_HUNTING_EVB_LINUX_4G_S530/nvt-evb.tmp.dts Normal file
View File

File diff suppressed because it is too large Load Diff

1
configs/cfg_gen Symbolic link
View File

@ -0,0 +1 @@
Linux/cfg_565_HUNTING_EVB_LINUX_4G_S530

2
rtos/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S530.h
View File

@ -98,7 +98,7 @@
#define POWERON_TRACE DISABLE //stop and wait for user enter cmd: "dsc boot" #define POWERON_TRACE DISABLE //stop and wait for user enter cmd: "dsc boot"
#define POWERON_BOOT_REPORT ENABLE #define POWERON_BOOT_REPORT ENABLE
#define POWERON_FAST_BOOT DISABLE #define POWERON_FAST_BOOT DISABLE
#define POWERON_FAST_BOOT_MSG DISABLE//ENABLE // disable boot msg for fast boot, but hard to debug #define POWERON_FAST_BOOT_MSG ENABLE // disable boot msg for fast boot, but hard to debug
#define POWERON_FAST_CPU2_BOOT DISABLE #define POWERON_FAST_CPU2_BOOT DISABLE
#define POWERON_FAST_RECORD DISABLE #define POWERON_FAST_RECORD DISABLE
#define POWERON_FAST_WIFI DISABLE //NOTE: need to enable POWERON_FAST_CPU2_BOOT too #define POWERON_FAST_WIFI DISABLE //NOTE: need to enable POWERON_FAST_CPU2_BOOT too

5
rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFast.c
View File

@ -1581,7 +1581,10 @@ exit:
{ {
vos_flag_set(PHOTOFAST_FLG_ID, FLGPHOTOFAST_SHUTDOWN); vos_flag_set(PHOTOFAST_FLG_ID, FLGPHOTOFAST_SHUTDOWN);
} }
sf_file_thumb_cfg_sava(); else {
sf_file_thumb_cfg_sava();
}
/*UINT32 uiSelect = UI_GetData(FL_PHOTO_SIZE)+1; /*UINT32 uiSelect = UI_GetData(FL_PHOTO_SIZE)+1;
if(UI_GetData(FL_PHOTO_SIZE) >= PHOTO_SIZE_8M) if(UI_GetData(FL_PHOTO_SIZE) >= PHOTO_SIZE_8M)
{ {

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

@ -63,7 +63,7 @@
#define DEFAULT_MOVIE_SIZE MOVIE_SIZE_DUAL_1920x1080P30_848x480P30//MOVIE_SIZE_FRONT_1920x1080P30 #define DEFAULT_MOVIE_SIZE MOVIE_SIZE_DUAL_1920x1080P30_848x480P30//MOVIE_SIZE_FRONT_1920x1080P30
#else #else
#if (MOVIE_AI_DEMO == DISABLE) #if (MOVIE_AI_DEMO == DISABLE)
#define DEFAULT_MOVIE_SIZE MOVIE_SIZE_CLONE_1920x1080P30_640x360P30 #define DEFAULT_MOVIE_SIZE MOVIE_SIZE_CLONE_1920x1080P30_1920x1080P25
#else #else
#define DEFAULT_MOVIE_SIZE MOVIE_SIZE_DUAL_1920x1080P30_848x480P30//MOVIE_SIZE_FRONT_1920x1080P30 #define DEFAULT_MOVIE_SIZE MOVIE_SIZE_DUAL_1920x1080P30_848x480P30//MOVIE_SIZE_FRONT_1920x1080P30
#endif #endif

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

@ -1167,13 +1167,16 @@ enum _MOVIE_MENU_SIZE {
MOVIE_SIZE_CLONE_1920x1080P60_640x360P30, /// FHD VGA MOVIE_SIZE_CLONE_1920x1080P60_640x360P30, /// FHD VGA
MOVIE_SIZE_CLONE_1920x1080P30_640x360P30, /// FHD VGA MOVIE_SIZE_CLONE_1920x1080P30_640x360P30, /// FHD VGA
MOVIE_SIZE_CLONE_1920x1080P30_848x480P30, /// FHD WVGA MOVIE_SIZE_CLONE_1920x1080P30_848x480P30, /// FHD WVGA
MOVIE_SIZE_CLONE_1920x1080P30_1920x1080P25, /// FHD30 FHD25
MOVIE_SIZE_CLONE_2048x2048P30_480x480P30, MOVIE_SIZE_CLONE_2048x2048P30_480x480P30,
MOVIE_SIZE_CLONE_1280x720P60_1280x720P60, /// HD HD p60 MOVIE_SIZE_CLONE_1280x720P60_1280x720P60, /// HD HD p60
MOVIE_SIZE_CLONE_1280x720P30_1280x720P30, /// HD HD p30 MOVIE_SIZE_CLONE_1280x720P30_1280x720P30, /// HD HD p30
MOVIE_SIZE_CLONE_1280x720P30_1280x720P25, /// HD30 HD p25
MOVIE_SIZE_CLONE_1280x720P120_848x480P30, /// HD WVGA MOVIE_SIZE_CLONE_1280x720P120_848x480P30, /// HD WVGA
MOVIE_SIZE_CLONE_1280x720P60_848x480P30, /// HD WVGA MOVIE_SIZE_CLONE_1280x720P60_848x480P30, /// HD WVGA
MOVIE_SIZE_CLONE_1280x720P30_848x480P30, /// HD WVGA MOVIE_SIZE_CLONE_1280x720P30_848x480P30, /// HD WVGA
MOVIE_SIZE_CLONE_848x480P30_848x480P30, /// WVGA WVGA MOVIE_SIZE_CLONE_848x480P30_848x480P30, /// WVGA WVGA
MOVIE_SIZE_CLONE_848x480P30_848x480P25, /// WVGA30 WVGA25
MOVIE_SIZE_CLONE_640x480P30_640x480P30, /// VGA VGA MOVIE_SIZE_CLONE_640x480P30_640x480P30, /// VGA VGA
MOVIE_SIZE_CLONE_320x240P30_320x240P30, /// QVGA QVGA MOVIE_SIZE_CLONE_320x240P30_320x240P30, /// QVGA QVGA
MOVIE_SIZE_ID_MAX, MOVIE_SIZE_ID_MAX,
@ -1205,6 +1208,9 @@ enum _MOVIE_SIZE {
MOVIE_SIZE_320x240P30, /// QVGA P30 MOVIE_SIZE_320x240P30, /// QVGA P30
MOVIE_SIZE_2048x2048P30, /// 2048x2048 P30 MOVIE_SIZE_2048x2048P30, /// 2048x2048 P30
MOVIE_SIZE_480x480P30, /// 480x480 P30 MOVIE_SIZE_480x480P30, /// 480x480 P30
MOVIE_SIZE_1920x1080P25, /// FHD P25
MOVIE_SIZE_1280x720P25, /// HD P25
MOVIE_SIZE_848x480P25, /// WVGA P25
}; };
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

48
rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIMovieMapping.c
View File

@ -164,9 +164,9 @@ static MOVIE_SIZE_ITEM g_MovieSizeTable[] = {
{1, 3, 36, 8, -8, 0}, {1, 3, 36, 8, -8, 0},
{1, 4, 30, 200 * 1024, 30, 26, 10, 40, 26, 10, 40, -40, 1, 8, 4}, {1, 4, 30, 200 * 1024, 30, 26, 10, 40, 26, 10, 40, -40, 1, 8, 4},
#else #else
{1920, 1080, 30, 104857/*262144 2M = 2*1024*1024/8 */, MEDIAREC_DAR_DEFAULT, IMAGERATIO_16_9}, {1920, 1080, 30, /*104857*/262144 /*2M = 2*1024*1024/8 */, MEDIAREC_DAR_DEFAULT, IMAGERATIO_16_9},
{1, 3, 36, 8, -8, 0}, {1, 3, 36, 8, -8, 0},
{1, 4, 30, 104857/*262144 2M = 2*1024*1024/8 */, 30, 26, 15, 50, 26, 15, 50, 40, 1, 8, 4}, {1, 4, 30, /*104857*/262144 /*2M = 2*1024*1024/8 */, 30, 26, 15, 50, 26, 15, 50, 40, 1, 8, 4},
#endif #endif
}, },
@ -194,9 +194,9 @@ static MOVIE_SIZE_ITEM g_MovieSizeTable[] = {
{1, 2, 36, 6, -6, 0}, {1, 2, 36, 6, -6, 0},
{1, 4, 30, 100 * 1024, 1800, 26, 10, 50, 26, 10, 50, -40, 1, 8, 4}, {1, 4, 30, 100 * 1024, 1800, 26, 10, 50, 26, 10, 50, -40, 1, 8, 4},
#else #else
{1280, 720, 30, 58982/*131072 1M = 1*1024*1024/8 */, MEDIAREC_DAR_DEFAULT, IMAGERATIO_16_9}, {1280, 720, 30, /*58982*/131072 /* 1M = 1*1024*1024/8 */, MEDIAREC_DAR_DEFAULT, IMAGERATIO_16_9},
{1, 3, 36, 8, -8, 0}, {1, 3, 36, 8, -8, 0},
{1, 4, 30, 58982/*131072 1M = 1*1024*1024/8 */, 30, 26, 15, 50, 26, 15, 50, 40, 1, 8, 4}, {1, 4, 30, /*58982*/131072 /* 1M = 1*1024*1024/8 */, 30, 26, 15, 50, 26, 15, 50, 40, 1, 8, 4},
#endif #endif
}, },
@ -218,9 +218,9 @@ static MOVIE_SIZE_ITEM g_MovieSizeTable[] = {
{1, 3, 36, 8, -8, 0}, {1, 3, 36, 8, -8, 0},
{1, 4, 30, 84 * 1024, 1800, 26, 10, 50, 26, 10, 50, -40, 1, 8, 4}, {1, 4, 30, 84 * 1024, 1800, 26, 10, 50, 26, 10, 50, -40, 1, 8, 4},
#else #else
{848, 480, 30, 32768/*110100*/, MEDIAREC_DAR_DEFAULT, IMAGERATIO_16_9}, {848, 480, 30, /*32768*/110100/**/, MEDIAREC_DAR_DEFAULT, IMAGERATIO_16_9},
{1, 3, 36, 8, -8, 0}, {1, 3, 36, 8, -8, 0},
{1, 4, 30, 32768/*110100*/, 30, 26, 15, 50, 26, 15, 50, 40, 1, 8, 4}, {1, 4, 30, /*32768*/110100/**/, 30, 26, 15, 50, 26, 15, 50, 40, 1, 8, 4},
#endif #endif
}, },
@ -272,6 +272,24 @@ static MOVIE_SIZE_ITEM g_MovieSizeTable[] = {
{1, 4, 30, 100 * 1024, 15, 26, 10, 40, 26, 10, 40, 0, 1, 8, 4}, {1, 4, 30, 100 * 1024, 15, 26, 10, 40, 26, 10, 40, 0, 1, 8, 4},
}, },
[MOVIE_SIZE_1920x1080P25] = {
{1920, 1080, 25, 104857/*262144 2M = 2*1024*1024/8 */, MEDIAREC_DAR_DEFAULT, IMAGERATIO_16_9},
{1, 3, 36, 8, -8, 0},
{1, 4, 25, 104857/*262144 2M = 2*1024*1024/8 */, 25, 26, 15, 50, 26, 15, 50, 40, 1, 8, 4},
},
[MOVIE_SIZE_1280x720P25] = {
{1280, 720, 25, 58982/*131072 1M = 1*1024*1024/8 */, MEDIAREC_DAR_DEFAULT, IMAGERATIO_16_9},
{1, 3, 36, 8, -8, 0},
{1, 4, 25, 58982/*131072 1M = 1*1024*1024/8 */, 25, 26, 15, 50, 26, 15, 50, 40, 1, 8, 4},
},
[MOVIE_SIZE_848x480P25] = {
{848, 480, 25, 32768/*110100*/, MEDIAREC_DAR_DEFAULT, IMAGERATIO_16_9},
{1, 3, 36, 8, -8, 0},
{1, 4, 25, 32768/*110100*/, 25, 26, 15, 50, 26, 15, 50, 40, 1, 8, 4},
},
}; };
// movie recording table, mapping to movie menu // movie recording table, mapping to movie menu
@ -511,6 +529,12 @@ static MOVIE_SIZE_MAPPING g_MovieRecMappingTable[MOVIE_SIZE_ID_MAX] = {
{MOVIE_SIZE_848x480P30, 0, 0}, {MOVIE_SIZE_848x480P30, 0, 0},
}, },
[MOVIE_SIZE_CLONE_1920x1080P30_1920x1080P25] = {
MOVIE_REC_TYPE_CLONE,
{MOVIE_SIZE_1920x1080P30, 0, 0},
{MOVIE_SIZE_1920x1080P25, 0, 0},
},
[MOVIE_SIZE_CLONE_2048x2048P30_480x480P30] = { [MOVIE_SIZE_CLONE_2048x2048P30_480x480P30] = {
MOVIE_REC_TYPE_CLONE, MOVIE_REC_TYPE_CLONE,
{MOVIE_SIZE_2048x2048P30, 0, 0}, {MOVIE_SIZE_2048x2048P30, 0, 0},
@ -523,6 +547,12 @@ static MOVIE_SIZE_MAPPING g_MovieRecMappingTable[MOVIE_SIZE_ID_MAX] = {
{MOVIE_SIZE_1280x720P30, 0, 0}, {MOVIE_SIZE_1280x720P30, 0, 0},
}, },
[MOVIE_SIZE_CLONE_1280x720P30_1280x720P25] = {
MOVIE_REC_TYPE_CLONE,
{MOVIE_SIZE_1280x720P30, 0, 0},
{MOVIE_SIZE_1280x720P25, 0, 0},
},
[MOVIE_SIZE_CLONE_1280x720P120_848x480P30] = { [MOVIE_SIZE_CLONE_1280x720P120_848x480P30] = {
MOVIE_REC_TYPE_CLONE, MOVIE_REC_TYPE_CLONE,
{MOVIE_SIZE_1280x720P120, 0, 0}, {MOVIE_SIZE_1280x720P120, 0, 0},
@ -547,6 +577,12 @@ static MOVIE_SIZE_MAPPING g_MovieRecMappingTable[MOVIE_SIZE_ID_MAX] = {
{MOVIE_SIZE_848x480P30, 0, 0}, {MOVIE_SIZE_848x480P30, 0, 0},
}, },
[MOVIE_SIZE_CLONE_848x480P30_848x480P25] = {
MOVIE_REC_TYPE_CLONE,
{MOVIE_SIZE_848x480P30, 0, 0},
{MOVIE_SIZE_848x480P25, 0, 0},
},
[MOVIE_SIZE_CLONE_640x480P30_640x480P30] = { [MOVIE_SIZE_CLONE_640x480P30_640x480P30] = {
MOVIE_REC_TYPE_CLONE, MOVIE_REC_TYPE_CLONE,
{MOVIE_SIZE_640x480P30, 0, 0}, {MOVIE_SIZE_640x480P30, 0, 0},