Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-02 03:00:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feat/jpeg_eco5_v5.4' into 'release/v5.4'

Browse Source 
feat(jpeg): Add yuv444 yuv420 format support for encoder on esp32p4 eco5 , Add check for jpeg marker parser in order to enhance safety (backport v5.4)

See merge request espressif/esp-idf!42669
This commit is contained in:
morris
2025-11-03 11:09:01 +08:00
parent 6b650ec950 c79cb4de46
commit 8673223c69
9 changed files with 101 additions and 1498 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/hal/esp32p4/include/hal/jpeg_ll.h
+19
View File
@@ -14,6 +14,7 @@
#include "soc/jpeg_struct.h"
#include "hal/jpeg_types.h"
#include "soc/hp_sys_clkrst_struct.h"
#include "hal/config.h"
#ifdef __cplusplus
extern "C" {
@@ -635,6 +636,11 @@ static inline uint32_t jpeg_ll_get_intr_status(jpeg_dev_t *hw)
static inline void jpeg_ll_config_picture_pixel_format(jpeg_dev_t *hw, jpeg_enc_src_type_t pixel_format)
{
uint8_t cs = 0;
#if HAL_CONFIG(CHIP_SUPPORT_MIN_REV) >= 300
uint8_t ecs = 0;
// Default, we disable extend color space
hw->extd_config.extd_color_space_en = 0;
#endif
switch (pixel_format) {
case JPEG_ENC_SRC_RGB888:
cs = 0;
@@ -648,10 +654,23 @@ static inline void jpeg_ll_config_picture_pixel_format(jpeg_dev_t *hw, jpeg_enc_
case JPEG_ENC_SRC_GRAY:
cs = 3;
break;
#if HAL_CONFIG(CHIP_SUPPORT_MIN_REV) >= 300
case JPEG_ENC_SRC_YUV444:
hw->extd_config.extd_color_space_en = 1;
ecs = 0;
break;
case JPEG_ENC_SRC_YUV420:
hw->extd_config.extd_color_space_en = 1;
ecs = 1;
break;
#endif
default:
abort();
}
hw->config.color_space = cs;
#if HAL_CONFIG(CHIP_SUPPORT_MIN_REV) >= 300
hw->extd_config.extd_color_space = ecs;
#endif
}
#ifdef __cplusplus