1.增加16M;2.修复图片尺寸问题;3.修改视频1440p码率;4.修复mcu读数据问题

This commit is contained in:
payton 2023-03-31 17:38:39 +08:00
parent d4fb492edd
commit 0f54bc7a7c
19 changed files with 41 additions and 39 deletions

BIN
application.bin Normal file

Binary file not shown.

View File

@ -43,14 +43,15 @@
#if PHOTO_PREVIEW_SLICE_ENC_FUNC #if PHOTO_PREVIEW_SLICE_ENC_FUNC
#define UIAPP_PHOTO_SIZE_40M 0 #define UIAPP_PHOTO_SIZE_40M 0
#define UIAPP_PHOTO_SIZE_12M 1 #define UIAPP_PHOTO_SIZE_16M 1
#define UIAPP_PHOTO_SIZE_10M 2 #define UIAPP_PHOTO_SIZE_12M 2
#define UIAPP_PHOTO_SIZE_8M 3 #define UIAPP_PHOTO_SIZE_10M 3
#define UIAPP_PHOTO_SIZE_5M 4 #define UIAPP_PHOTO_SIZE_8M 4
#define UIAPP_PHOTO_SIZE_3M 5 #define UIAPP_PHOTO_SIZE_5M 5
#define UIAPP_PHOTO_SIZE_VGA 6 #define UIAPP_PHOTO_SIZE_3M 6
#define UIAPP_PHOTO_SIZE_1_3M 7 #define UIAPP_PHOTO_SIZE_VGA 7
#define UIAPP_PHOTO_SIZE_2M 8 #define UIAPP_PHOTO_SIZE_1_3M 8
#define UIAPP_PHOTO_SIZE_2M 9
#else #else
#define UIAPP_PHOTO_SIZE_12M 0 #define UIAPP_PHOTO_SIZE_12M 0
@ -65,7 +66,6 @@
#endif #endif
#if (SENSOR_CAPS_COUNT >= 2) #if (SENSOR_CAPS_COUNT >= 2)
#define PHOTO_MAX_CAP_SIZE UIAPP_PHOTO_SIZE_10M #define PHOTO_MAX_CAP_SIZE UIAPP_PHOTO_SIZE_10M
#else #else

View File

@ -11,7 +11,7 @@
#if (SENSOR_CAPS_COUNT == 1) #if (SENSOR_CAPS_COUNT == 1)
static UIAPP_PHOTO_SENSOR_INFO g_UIAppPhotoSensorInfo[UIAPP_PHOTO_SENSOR_ID_MAX] = { static UIAPP_PHOTO_SENSOR_INFO g_UIAppPhotoSensorInfo[UIAPP_PHOTO_SENSOR_ID_MAX] = {
//sensor ID, IPL fps, IPL size , IPL ratio, flip type, IME 3DNR , video format[ime_out], video compress, crop enable[ime_out] //sensor ID, IPL fps, IPL size , IPL ratio, flip type, IME 3DNR , video format[ime_out], video compress, crop enable[ime_out]
{UIAPP_PHOTO_SENSOR_ID_1, 30, {2592, 1944}, {16, 9}, FLIP_NONE, FALSE, {PHOTO_FMT_420, PHOTO_FMT_420, PHOTO_FMT_420, PHOTO_FMT_Y, PHOTO_FMT_422}, FALSE, {FALSE,FALSE,FALSE,FALSE,FALSE}}, {UIAPP_PHOTO_SENSOR_ID_1, 30, {2560, 1920/*2592, 1944*/}, {4, 3}, FLIP_NONE, FALSE, {PHOTO_FMT_420, PHOTO_FMT_420, PHOTO_FMT_420, PHOTO_FMT_Y, PHOTO_FMT_422}, FALSE, {FALSE,FALSE,FALSE,FALSE,FALSE}},
}; };
static PHOTO_DISP_INFO g_UIAppPhotoDispConfig[UIAPP_PHOTO_DISP_ID_MAX] = { static PHOTO_DISP_INFO g_UIAppPhotoDispConfig[UIAPP_PHOTO_DISP_ID_MAX] = {

View File

@ -5,7 +5,7 @@
// Photo // Photo
#define DEFAULT_PHOTO_CAPTURE SELFTIMER_OFF #define DEFAULT_PHOTO_CAPTURE SELFTIMER_OFF
#define DEFAULT_PHOTO_SIZE UIAPP_PHOTO_SIZE_5M//PHOTO_MAX_CAP_SIZE #define DEFAULT_PHOTO_SIZE PHOTO_SIZE_5M//PHOTO_MAX_CAP_SIZE
#define DEFAULT_PHOTO_QUALITY QUALITY_FINE #define DEFAULT_PHOTO_QUALITY QUALITY_FINE
#define DEFAULT_PHOTO_COLOR COLOR_EFFECT_STANDARD #define DEFAULT_PHOTO_COLOR COLOR_EFFECT_STANDARD
#define DEFAULT_SCENE SCENE_AUTO #define DEFAULT_SCENE SCENE_AUTO

View File

@ -662,7 +662,7 @@ enum _PHOTO_SIZE {
#if PHOTO_PREVIEW_SLICE_ENC_FUNC #if PHOTO_PREVIEW_SLICE_ENC_FUNC
PHOTO_SIZE_40M, PHOTO_SIZE_40M,
#endif #endif
PHOTO_SIZE_16M,
PHOTO_SIZE_12M, PHOTO_SIZE_12M,
PHOTO_SIZE_10M, PHOTO_SIZE_10M,
PHOTO_SIZE_8M, PHOTO_SIZE_8M,

View File

@ -117,9 +117,9 @@ static MOVIE_SIZE_ITEM g_MovieSizeTable[] = {
}, },
[MOVIE_SIZE_2560x1440P30] = { [MOVIE_SIZE_2560x1440P30] = {
{2560, 1440, 30, 1750 * 1024, MEDIAREC_DAR_DEFAULT, IMAGERATIO_16_9}, {2560, 1440, 30, 800 * 1024, MEDIAREC_DAR_DEFAULT, IMAGERATIO_16_9},
{1, 3, 36, 8, -8, 0}, {1, 3, 36, 8, -8, 0},
{1, 4, 30, 1750 * 1024, 15, 26, 15, 45, 26, 15, 45, 0, 1, 8, 4}, {1, 4, 30, 800 * 1024, 15, 26, 15, 45, 26, 15, 45, 0, 1, 8, 4},
}, },
[MOVIE_SIZE_2304x1296P30] = { [MOVIE_SIZE_2304x1296P30] = {

View File

@ -30,13 +30,14 @@ static PHOTO_SIZE_PARAM g_PhotoCapSizeTable[PHOTO_SIZE_ID_MAX + 2] = {
#if PHOTO_PREVIEW_SLICE_ENC_FUNC || POWERON_FAST_SLICE_ENC #if PHOTO_PREVIEW_SLICE_ENC_FUNC || POWERON_FAST_SLICE_ENC
{7552, 4248, IMAGERATIO_4_3, "40M"}, /* 40M */ {7552, 4248, IMAGERATIO_4_3, "40M"}, /* 40M */
#endif #endif
{4608, 3456, IMAGERATIO_4_3, "16M"}, //16M
{4032, 3024, IMAGERATIO_4_3, "12M"}, //12M {4032, 3024, IMAGERATIO_4_3, "12M"}, //12M
{3648, 2736, IMAGERATIO_4_3, "10M"}, //10M {3648, 2736, IMAGERATIO_4_3, "10M"}, //10M
{3264, 2448, IMAGERATIO_4_3, "8M"}, // 8M {3264, 2448, IMAGERATIO_4_3, "8M"}, // 8M
#if defined(_MODEL_565_HUNTING_EVB_LINUX_4G_68CS_) #if defined(_MODEL_565_HUNTING_EVB_LINUX_4G_68CS_)
{2960, 1666, IMAGERATIO_16_9, "5M"}, // 5M {2960, 1666, IMAGERATIO_16_9, "5M"}, // 5M
#elif defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_) #elif defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_)
{2592, 1944, IMAGERATIO_16_9, "5M"}, // 5M {2592, 1944, IMAGERATIO_4_3, "5M"}, // 5M
#endif #endif
{2048, 1536, IMAGERATIO_4_3, "3M"}, // 3M {2048, 1536, IMAGERATIO_4_3, "3M"}, // 3M
{640, 480, IMAGERATIO_4_3, "VGA"}, // VGA {640, 480, IMAGERATIO_4_3, "VGA"}, // VGA

Binary file not shown.

Binary file not shown.

View File

@ -437,7 +437,7 @@ UINT8 sf_mcu_power_on_para_get(MCUParam_t attrId)
return startMode; return startMode;
} }
mcuReg[i] = MCU_SUB_VER; mcuReg[i++] = MCU_SUB_VER;
mcuReg[i++] = MCU_VER_L; mcuReg[i++] = MCU_VER_L;
mcuReg[i++] = MCU_VER_H; mcuReg[i++] = MCU_VER_H;
mcuReg[i++] = MCU_PRODUCT_INFO; mcuReg[i++] = MCU_PRODUCT_INFO;
@ -446,7 +446,7 @@ UINT8 sf_mcu_power_on_para_get(MCUParam_t attrId)
mcuReg[i++] = LUMINANCE_H; mcuReg[i++] = LUMINANCE_H;
sf_mcu_read_multi(mcuReg, mcuData, i); sf_mcu_read_multi(mcuReg, mcuData, i);
i = 0; i = 0;
McuSubVersion = mcuData[i]; McuSubVersion = mcuData[i++];
McuVersion = mcuData[i++]; McuVersion = mcuData[i++];
McuVersion = (UINT16)mcuData[i++] << 8 | McuVersion; McuVersion = (UINT16)mcuData[i++] << 8 | McuVersion;

BIN
rtos-main.bin Executable file

Binary file not shown.

View File

@ -43,14 +43,15 @@
#if PHOTO_PREVIEW_SLICE_ENC_FUNC || POWERON_FAST_SLICE_ENC #if PHOTO_PREVIEW_SLICE_ENC_FUNC || POWERON_FAST_SLICE_ENC
#define UIAPP_PHOTO_SIZE_40M 0 #define UIAPP_PHOTO_SIZE_40M 0
#define UIAPP_PHOTO_SIZE_12M 1 #define UIAPP_PHOTO_SIZE_16M 1
#define UIAPP_PHOTO_SIZE_10M 2 #define UIAPP_PHOTO_SIZE_12M 2
#define UIAPP_PHOTO_SIZE_8M 3 #define UIAPP_PHOTO_SIZE_10M 3
#define UIAPP_PHOTO_SIZE_5M 4 #define UIAPP_PHOTO_SIZE_8M 4
#define UIAPP_PHOTO_SIZE_3M 5 #define UIAPP_PHOTO_SIZE_5M 5
#define UIAPP_PHOTO_SIZE_VGA 6 #define UIAPP_PHOTO_SIZE_3M 6
#define UIAPP_PHOTO_SIZE_1_3M 7 #define UIAPP_PHOTO_SIZE_VGA 7
#define UIAPP_PHOTO_SIZE_2M 8 #define UIAPP_PHOTO_SIZE_1_3M 8
#define UIAPP_PHOTO_SIZE_2M 9
#else #else
#define UIAPP_PHOTO_SIZE_12M 0 #define UIAPP_PHOTO_SIZE_12M 0
@ -64,8 +65,6 @@
#endif #endif
#if (SENSOR_CAPS_COUNT >= 2) #if (SENSOR_CAPS_COUNT >= 2)
#define PHOTO_MAX_CAP_SIZE UIAPP_PHOTO_SIZE_10M #define PHOTO_MAX_CAP_SIZE UIAPP_PHOTO_SIZE_10M
#else #else

View File

@ -14,7 +14,7 @@ static UIAPP_PHOTO_SENSOR_INFO g_UIAppPhotoSensorInfo[UIAPP_PHOTO_SENSOR_ID_MAX]
#if defined (_sen_gc5603_) #if defined (_sen_gc5603_)
{UIAPP_PHOTO_SENSOR_ID_1, 30, {2960, 1664}, {16, 9}, FLIP_NONE, FALSE, {PHOTO_FMT_420, PHOTO_FMT_420, PHOTO_FMT_420, PHOTO_FMT_Y, PHOTO_FMT_422}, FALSE, {FALSE,FALSE,FALSE,FALSE,FALSE}}, {UIAPP_PHOTO_SENSOR_ID_1, 30, {2960, 1664}, {16, 9}, FLIP_NONE, FALSE, {PHOTO_FMT_420, PHOTO_FMT_420, PHOTO_FMT_420, PHOTO_FMT_Y, PHOTO_FMT_422}, FALSE, {FALSE,FALSE,FALSE,FALSE,FALSE}},
#elif defined (_sen_os05b10_) #elif defined (_sen_os05b10_)
{UIAPP_PHOTO_SENSOR_ID_1, 30, {2592, 1944}, {16, 9}, FLIP_NONE, FALSE, {PHOTO_FMT_420, PHOTO_FMT_420, PHOTO_FMT_420, PHOTO_FMT_Y, PHOTO_FMT_422}, FALSE, {FALSE,FALSE,FALSE,FALSE,FALSE}}, {UIAPP_PHOTO_SENSOR_ID_1, 30, {2592, 1944}, {4, 3}, FLIP_NONE, FALSE, {PHOTO_FMT_420, PHOTO_FMT_420, PHOTO_FMT_420, PHOTO_FMT_Y, PHOTO_FMT_422}, FALSE, {FALSE,FALSE,FALSE,FALSE,FALSE}},
#else #else
{UIAPP_PHOTO_SENSOR_ID_1, 30, {2592, 1664}, {16, 9}, FLIP_NONE, FALSE, {PHOTO_FMT_420, PHOTO_FMT_420, PHOTO_FMT_420, PHOTO_FMT_Y, PHOTO_FMT_422}, FALSE, {FALSE,FALSE,FALSE,FALSE,FALSE}}, {UIAPP_PHOTO_SENSOR_ID_1, 30, {2592, 1664}, {16, 9}, FLIP_NONE, FALSE, {PHOTO_FMT_420, PHOTO_FMT_420, PHOTO_FMT_420, PHOTO_FMT_Y, PHOTO_FMT_422}, FALSE, {FALSE,FALSE,FALSE,FALSE,FALSE}},
#endif #endif

View File

@ -5,7 +5,7 @@
// Photo // Photo
#define DEFAULT_PHOTO_CAPTURE SELFTIMER_OFF #define DEFAULT_PHOTO_CAPTURE SELFTIMER_OFF
#define DEFAULT_PHOTO_SIZE UIAPP_PHOTO_SIZE_5M//PHOTO_MAX_CAP_SIZE #define DEFAULT_PHOTO_SIZE PHOTO_SIZE_5M//PHOTO_MAX_CAP_SIZE
#define DEFAULT_PHOTO_QUALITY QUALITY_FINE #define DEFAULT_PHOTO_QUALITY QUALITY_FINE
#define DEFAULT_PHOTO_COLOR COLOR_EFFECT_STANDARD #define DEFAULT_PHOTO_COLOR COLOR_EFFECT_STANDARD
#define DEFAULT_SCENE SCENE_AUTO #define DEFAULT_SCENE SCENE_AUTO
@ -118,7 +118,7 @@
#define DEFAULT_MOVIE_URGENT_PROTECT_MANUAL MOVIE_URGENT_PROTECT_MANUAL_OFF #define DEFAULT_MOVIE_URGENT_PROTECT_MANUAL MOVIE_URGENT_PROTECT_MANUAL_OFF
#define DEFAULT_MOVIE_DDD MOVIE_DDD_OFF #define DEFAULT_MOVIE_DDD MOVIE_DDD_OFF
#define DEFAULT_MOVIE_ADAS_CAL MOVIE_ADAS_CAL_OFF #define DEFAULT_MOVIE_ADAS_CAL MOVIE_ADAS_CAL_OFF
#define DEFAULT_MOVIE_CODEC MOVIE_CODEC_H264 #define DEFAULT_MOVIE_CODEC MOVIE_CODEC_H265
// Playback // Playback
#define DEFAULT_PROTECT PROTECT_ONE #define DEFAULT_PROTECT PROTECT_ONE
#define DEFAULT_MOVIE_PLAY_VOLUME (MOVIE_AUDIO_VOL_SETTING_MAX-1) #define DEFAULT_MOVIE_PLAY_VOLUME (MOVIE_AUDIO_VOL_SETTING_MAX-1)

View File

@ -662,7 +662,7 @@ enum _PHOTO_SIZE {
#if PHOTO_PREVIEW_SLICE_ENC_FUNC || POWERON_FAST_SLICE_ENC #if PHOTO_PREVIEW_SLICE_ENC_FUNC || POWERON_FAST_SLICE_ENC
PHOTO_SIZE_40M, PHOTO_SIZE_40M,
#endif #endif
PHOTO_SIZE_16M,
PHOTO_SIZE_12M, PHOTO_SIZE_12M,
PHOTO_SIZE_10M, PHOTO_SIZE_10M,
PHOTO_SIZE_8M, PHOTO_SIZE_8M,

View File

@ -118,13 +118,13 @@ static MOVIE_SIZE_ITEM g_MovieSizeTable[] = {
[MOVIE_SIZE_2560x1440P30] = { [MOVIE_SIZE_2560x1440P30] = {
#if (defined(_NVT_ETHREARCAM_TX_)) #if (defined(_NVT_ETHREARCAM_TX_))
{2560, 1440, 30, 1750 * 1024, MEDIAREC_DAR_DEFAULT, IMAGERATIO_16_9}, {2560, 1440, 30, 800 * 1024, MEDIAREC_DAR_DEFAULT, IMAGERATIO_16_9},
{1, 3, 36, 8, -8, 0}, {1, 3, 36, 8, -8, 0},
{1, 4, 30, 1750 * 1024, 30, 26, 10, 50, 26, 10, 50, -40, 1, 8, 4}, {1, 4, 30, 800 * 1024, 30, 26, 10, 50, 26, 10, 50, -40, 1, 8, 4},
#else #else
{2560, 1440, 30, 1750 * 1024, MEDIAREC_DAR_DEFAULT, IMAGERATIO_16_9}, {2560, 1440, 30, 800 * 1024, MEDIAREC_DAR_DEFAULT, IMAGERATIO_16_9},
{1, 3, 36, 8, -8, 0}, {1, 3, 36, 8, -8, 0},
{1, 4, 30, 1750 * 1024, 15, 26, 10, 40, 26, 10, 40, 0, 1, 8, 4}, {1, 4, 30, 800 * 1024, 15, 26, 10, 40, 26, 10, 40, 0, 1, 8, 4},
#endif #endif
}, },

View File

@ -30,6 +30,7 @@ static PHOTO_SIZE_PARAM g_PhotoCapSizeTable[PHOTO_SIZE_ID_MAX + 2] = {
#if PHOTO_PREVIEW_SLICE_ENC_FUNC || POWERON_FAST_SLICE_ENC #if PHOTO_PREVIEW_SLICE_ENC_FUNC || POWERON_FAST_SLICE_ENC
{7552, 4248, IMAGERATIO_4_3, "40M"}, /* 40M */ {7552, 4248, IMAGERATIO_4_3, "40M"}, /* 40M */
#endif #endif
{4608, 3456, IMAGERATIO_4_3, "16M"}, //16M
{4032, 3024, IMAGERATIO_4_3, "12M"}, //12M {4032, 3024, IMAGERATIO_4_3, "12M"}, //12M
{3648, 2736, IMAGERATIO_4_3, "10M"}, //10M {3648, 2736, IMAGERATIO_4_3, "10M"}, //10M
{3264, 2448, IMAGERATIO_4_3, "8M"}, // 8M {3264, 2448, IMAGERATIO_4_3, "8M"}, // 8M
@ -37,7 +38,7 @@ static PHOTO_SIZE_PARAM g_PhotoCapSizeTable[PHOTO_SIZE_ID_MAX + 2] = {
#if defined(_MODEL_565_HUNTING_EVB_LINUX_4G_68CS_) #if defined(_MODEL_565_HUNTING_EVB_LINUX_4G_68CS_)
{2960, 1666, IMAGERATIO_16_9, "5M"}, // 5M {2960, 1666, IMAGERATIO_16_9, "5M"}, // 5M
#elif defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_) #elif defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_)
{2592, 1944, IMAGERATIO_16_9, "5M"}, // 5M {2592, 1944, IMAGERATIO_4_3, "5M"}, // 5M
#endif #endif
{2048, 1536, IMAGERATIO_4_3, "3M"}, // 3M {2048, 1536, IMAGERATIO_4_3, "3M"}, // 3M
{640, 480, IMAGERATIO_4_3, "VGA"}, // VGA {640, 480, IMAGERATIO_4_3, "VGA"}, // VGA

View File

@ -856,7 +856,7 @@ int sf_commu_mcu_task_start(void)
printf("%s:%d %d\r\n", __FUNCTION__, __LINE__,rt); printf("%s:%d %d\r\n", __FUNCTION__, __LINE__,rt);
} }
sfCommuMcuThread = vos_task_create(sf_commu_mcu_task, NULL, "sf_mcu_task", 25, 2048); sfCommuMcuThread = vos_task_create(sf_commu_mcu_task, NULL, "sf_commu_mcu_task", 10, 2048);
if(!sfCommuMcuThread) if(!sfCommuMcuThread)
{ {
DBG_ERR("[ERROR] sf_commu_mcu_task thread creat failed!\r\n"); DBG_ERR("[ERROR] sf_commu_mcu_task thread creat failed!\r\n");

View File

@ -385,16 +385,17 @@ UINT8 sf_mcu_power_on_para_get(MCUParam_t attrId)
return startMode; return startMode;
} }
mcuReg[i] = MCU_SUB_VER; mcuReg[i++] = MCU_SUB_VER;
mcuReg[i++] = MCU_VER_L; mcuReg[i++] = MCU_VER_L;
mcuReg[i++] = MCU_VER_H; mcuReg[i++] = MCU_VER_H;
mcuReg[i++] = MCU_PRODUCT_INFO; mcuReg[i++] = MCU_PRODUCT_INFO;
mcuReg[i++] = START_MODE; mcuReg[i++] = START_MODE;
mcuReg[i++] = LUMINANCE_L; mcuReg[i++] = LUMINANCE_L;
mcuReg[i++] = LUMINANCE_H; mcuReg[i++] = LUMINANCE_H;
sf_mcu_read_multi(mcuReg, mcuData, i); sf_mcu_read_multi(mcuReg, mcuData, i);
i = 0; i = 0;
McuSubVersion = mcuData[i]; McuSubVersion = mcuData[i++];
McuVersion = mcuData[i++]; McuVersion = mcuData[i++];
McuVersion = (UINT16)mcuData[i++] << 8 | McuVersion; McuVersion = (UINT16)mcuData[i++] << 8 | McuVersion;