diff --git a/components/esp_driver_cam/csi/src/esp_cam_ctlr_csi.c b/components/esp_driver_cam/csi/src/esp_cam_ctlr_csi.c index c96f459eb79..63b170b668d 100644 --- a/components/esp_driver_cam/csi/src/esp_cam_ctlr_csi.c +++ b/components/esp_driver_cam/csi/src/esp_cam_ctlr_csi.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2023-2025 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2023-2026 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -100,6 +100,8 @@ esp_err_t esp_cam_new_csi_ctlr(const esp_cam_ctlr_csi_config_t *config, esp_cam_ esp_err_t ret = ESP_FAIL; ESP_RETURN_ON_FALSE(config && ret_handle, ESP_ERR_INVALID_ARG, TAG, "invalid argument: null pointer"); ESP_RETURN_ON_FALSE(config->data_lane_num <= MIPI_CSI_HOST_LL_LANE_NUM_MAX, ESP_ERR_INVALID_ARG, TAG, "lane num should be equal or smaller than %d", MIPI_CSI_HOST_LL_LANE_NUM_MAX); + ESP_RETURN_ON_FALSE(config->input_data_color_type != 0, ESP_ERR_INVALID_ARG, TAG, "input_data_color_type must be specified"); + ESP_RETURN_ON_FALSE(config->output_data_color_type != 0, ESP_ERR_INVALID_ARG, TAG, "output_data_color_type must be specified"); csi_controller_t *ctlr = heap_caps_calloc(1, sizeof(csi_controller_t), CSI_MEM_ALLOC_CAPS); ESP_RETURN_ON_FALSE(ctlr, ESP_ERR_NO_MEM, TAG, "no mem for csi controller context"); @@ -136,19 +138,17 @@ esp_err_t esp_cam_new_csi_ctlr(const esp_cam_ctlr_csi_config_t *config, esp_cam_ ESP_LOGD(TAG, "ctlr->v_res: 0d %"PRId32, ctlr->v_res); //in color type - color_space_pixel_format_t in_color_format = { - .color_type_id = config->input_data_color_type, - }; - int in_bits_per_pixel = color_hal_pixel_format_get_bit_depth(in_color_format); - ctlr->in_color_format = in_color_format; + int in_bits_per_pixel = color_hal_pixel_format_fourcc_get_bit_depth(config->input_data_color_type); + ESP_GOTO_ON_FALSE(in_bits_per_pixel != 0, ESP_ERR_INVALID_ARG, err, TAG, "unsupported input color format"); + ctlr->in_color_format = config->input_data_color_type; ctlr->in_bpp = in_bits_per_pixel; ESP_LOGD(TAG, "ctlr->in_bpp: 0d %d", ctlr->in_bpp); //out color type - color_space_pixel_format_t out_color_format = { - .color_type_id = config->output_data_color_type, - }; - int out_bits_per_pixel = color_hal_pixel_format_get_bit_depth(out_color_format); + int out_bits_per_pixel = color_hal_pixel_format_fourcc_get_bit_depth(config->output_data_color_type); + + ESP_GOTO_ON_FALSE(out_bits_per_pixel != 0, ESP_ERR_INVALID_ARG, err, TAG, "unsupported output color format"); + ctlr->out_color_format = config->output_data_color_type; ctlr->out_bpp = out_bits_per_pixel; ESP_LOGD(TAG, "ctlr->out_bpp: 0d %d", ctlr->out_bpp); diff --git a/components/esp_driver_cam/csi/src/esp_cam_ctlr_csi_internal.h b/components/esp_driver_cam/csi/src/esp_cam_ctlr_csi_internal.h index 0baf6d55960..7c15c81f82c 100644 --- a/components/esp_driver_cam/csi/src/esp_cam_ctlr_csi_internal.h +++ b/components/esp_driver_cam/csi/src/esp_cam_ctlr_csi_internal.h @@ -50,8 +50,8 @@ struct csi_controller_t { mipi_csi_hal_context_t hal; //hal context csi_fsm_t csi_fsm; //driver fsm portMUX_TYPE spinlock; //spinlock - color_space_pixel_format_t in_color_format; //input color format - color_space_pixel_format_t out_color_format; //output color format + cam_ctlr_color_t in_color_format; //input color format + cam_ctlr_color_t out_color_format; //output color format uint32_t h_res; //input horizontal resolution uint32_t v_res; //input vertical resolution int in_bpp; //input data type, bit per pixel diff --git a/components/esp_driver_cam/dvp/src/esp_cam_ctlr_dvp_cam.c b/components/esp_driver_cam/dvp/src/esp_cam_ctlr_dvp_cam.c index 6bd15f01610..cb0293fb78a 100644 --- a/components/esp_driver_cam/dvp/src/esp_cam_ctlr_dvp_cam.c +++ b/components/esp_driver_cam/dvp/src/esp_cam_ctlr_dvp_cam.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2024-2025 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2024-2026 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -272,10 +272,7 @@ static esp_err_t esp_cam_ctlr_dvp_cam_get_frame_size(const esp_cam_ctlr_dvp_conf if (config->pic_format_jpeg) { *p_size = config->h_res * config->v_res; } else { - color_space_pixel_format_t pixel_format = { - .color_type_id = config->input_data_color_type - }; - uint32_t depth = color_hal_pixel_format_get_bit_depth(pixel_format); + uint32_t depth = color_hal_pixel_format_fourcc_get_bit_depth(config->input_data_color_type); if (!depth) { return ESP_ERR_INVALID_ARG; } diff --git a/components/esp_hal_cam/cam_hal.c b/components/esp_hal_cam/cam_hal.c index fc70f89171e..582d1dd3522 100644 --- a/components/esp_hal_cam/cam_hal.c +++ b/components/esp_hal_cam/cam_hal.c @@ -1,9 +1,10 @@ /* - * SPDX-FileCopyrightText: 2024-2025 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2024-2026 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ +#include #include "hal/cam_ll.h" #include "hal/cam_hal.h" #include "hal/color_types.h" @@ -158,25 +159,8 @@ void cam_hal_color_format_convert(cam_hal_context_t *hal, cam_ll_enable_rgb_yuv_convert(hal->hw, false); - // Extract color space from source and destination formats - color_space_t src_space = COLOR_SPACE_TYPE(cfg->src_format); - color_space_t dst_space = COLOR_SPACE_TYPE(cfg->dst_format); - - // Configure conversion based on color space types - if (src_space == COLOR_SPACE_YUV && dst_space == COLOR_SPACE_RGB) { - // YUV to RGB conversion - color_pixel_yuv_format_t yuv_format = COLOR_PIXEL_FORMAT(cfg->src_format); - cam_ll_set_convert_mode_yuv_to_rgb(hal->hw, yuv_format); - } else if (src_space == COLOR_SPACE_RGB && dst_space == COLOR_SPACE_YUV) { - // RGB to YUV conversion - color_pixel_yuv_format_t yuv_format = COLOR_PIXEL_FORMAT(cfg->dst_format); - cam_ll_set_convert_mode_rgb_to_yuv(hal->hw, yuv_format); - } else if (src_space == COLOR_SPACE_YUV && dst_space == COLOR_SPACE_YUV) { - // YUV to YUV conversion - color_pixel_yuv_format_t src_yuv_format = COLOR_PIXEL_FORMAT(cfg->src_format); - color_pixel_yuv_format_t dst_yuv_format = COLOR_PIXEL_FORMAT(cfg->dst_format); - cam_ll_set_convert_mode_yuv_to_yuv(hal->hw, src_yuv_format, dst_yuv_format); - } + // Configure conversion mode based on source and destination formats + cam_ll_set_convert_mode(hal->hw, cfg->src_format, cfg->dst_format); // Common configuration for all conversion types cam_ll_set_yuv_convert_std(hal->hw, cfg->conv_std); diff --git a/components/esp_hal_cam/esp32p4/include/hal/cam_ll.h b/components/esp_hal_cam/esp32p4/include/hal/cam_ll.h index 826977bcbbc..7a42801cd76 100644 --- a/components/esp_hal_cam/esp32p4/include/hal/cam_ll.h +++ b/components/esp_hal_cam/esp32p4/include/hal/cam_ll.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2024-2025 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2024-2026 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -302,91 +302,40 @@ static inline void cam_ll_set_yuv_convert_std(lcd_cam_dev_t *dev, color_conv_std } /** - * @brief Set the converter mode: RGB565 to YUV + * @brief Set converter mode * * @param dev CAM register base address - * @param yuv_sample YUV sample mode + * @param src_fourcc Source format FourCC + * @param dst_fourcc Destination format FourCC */ -static inline void cam_ll_set_convert_mode_rgb_to_yuv(lcd_cam_dev_t *dev, color_pixel_yuv_format_t yuv_sample) +static inline void cam_ll_set_convert_mode(lcd_cam_dev_t *dev, uint32_t src_fourcc, uint32_t dst_fourcc) { - dev->cam_rgb_yuv.cam_conv_trans_mode = 1; - dev->cam_rgb_yuv.cam_conv_yuv2yuv_mode = 3; - switch (yuv_sample) { - case COLOR_PIXEL_YUV422: - dev->cam_rgb_yuv.cam_conv_yuv_mode = 0; - break; - case COLOR_PIXEL_YUV420: - dev->cam_rgb_yuv.cam_conv_yuv_mode = 1; - break; - case COLOR_PIXEL_YUV411: - dev->cam_rgb_yuv.cam_conv_yuv_mode = 2; - break; - default: - abort(); - } -} + bool src_is_yuv = (src_fourcc == ESP_COLOR_FOURCC_OUYY_EVYY || + src_fourcc == ESP_COLOR_FOURCC_YVYU || + src_fourcc == ESP_COLOR_FOURCC_YUYV || + src_fourcc == ESP_COLOR_FOURCC_UYVY || + src_fourcc == ESP_COLOR_FOURCC_VYUY || + src_fourcc == ESP_COLOR_FOURCC_YUV); + bool dst_is_yuv = (dst_fourcc == ESP_COLOR_FOURCC_OUYY_EVYY || + dst_fourcc == ESP_COLOR_FOURCC_YVYU || + dst_fourcc == ESP_COLOR_FOURCC_YUYV || + dst_fourcc == ESP_COLOR_FOURCC_UYVY || + dst_fourcc == ESP_COLOR_FOURCC_VYUY || + dst_fourcc == ESP_COLOR_FOURCC_YUV); -/** - * @brief Set the converter mode: YUV to RGB565 - * - * @param dev CAM register base address - * @param yuv_sample YUV sample mode - */ -static inline void cam_ll_set_convert_mode_yuv_to_rgb(lcd_cam_dev_t *dev, color_pixel_yuv_format_t yuv_sample) -{ - dev->cam_rgb_yuv.cam_conv_trans_mode = 0; - dev->cam_rgb_yuv.cam_conv_yuv2yuv_mode = 3; - switch (yuv_sample) { - case COLOR_PIXEL_YUV422: - dev->cam_rgb_yuv.cam_conv_yuv_mode = 0; - break; - case COLOR_PIXEL_YUV420: - dev->cam_rgb_yuv.cam_conv_yuv_mode = 1; - break; - case COLOR_PIXEL_YUV411: - dev->cam_rgb_yuv.cam_conv_yuv_mode = 2; - break; - default: - abort(); - } -} - -/** - * @brief Set the converter mode: YUV to YUV - * - * @param dev CAM register base address - * @param src_sample Source YUV sample mode - * @param dst_sample Destination YUV sample mode - */ -static inline void cam_ll_set_convert_mode_yuv_to_yuv(lcd_cam_dev_t *dev, color_pixel_yuv_format_t src_sample, color_pixel_yuv_format_t dst_sample) -{ - HAL_ASSERT(src_sample != dst_sample); - dev->cam_rgb_yuv.cam_conv_trans_mode = 1; - switch (src_sample) { - case COLOR_PIXEL_YUV422: - dev->cam_rgb_yuv.cam_conv_yuv_mode = 0; - break; - case COLOR_PIXEL_YUV420: - dev->cam_rgb_yuv.cam_conv_yuv_mode = 1; - break; - case COLOR_PIXEL_YUV411: - dev->cam_rgb_yuv.cam_conv_yuv_mode = 2; - break; - default: - abort(); - } - switch (dst_sample) { - case COLOR_PIXEL_YUV422: - dev->cam_rgb_yuv.cam_conv_yuv2yuv_mode = 0; - break; - case COLOR_PIXEL_YUV420: - dev->cam_rgb_yuv.cam_conv_yuv2yuv_mode = 1; - break; - case COLOR_PIXEL_YUV411: - dev->cam_rgb_yuv.cam_conv_yuv2yuv_mode = 2; - break; - default: - abort(); + if (src_is_yuv && dst_is_yuv) { + HAL_ASSERT(src_fourcc != dst_fourcc); + dev->cam_rgb_yuv.cam_conv_trans_mode = 1; + dev->cam_rgb_yuv.cam_conv_yuv_mode = (src_fourcc == ESP_COLOR_FOURCC_OUYY_EVYY) ? 1 : 0; + dev->cam_rgb_yuv.cam_conv_yuv2yuv_mode = (dst_fourcc == ESP_COLOR_FOURCC_OUYY_EVYY) ? 1 : 0; + } else if (src_is_yuv) { + dev->cam_rgb_yuv.cam_conv_trans_mode = 0; + dev->cam_rgb_yuv.cam_conv_yuv2yuv_mode = 3; + dev->cam_rgb_yuv.cam_conv_yuv_mode = (src_fourcc == ESP_COLOR_FOURCC_OUYY_EVYY) ? 1 : 0; + } else if (dst_is_yuv) { + dev->cam_rgb_yuv.cam_conv_trans_mode = 1; + dev->cam_rgb_yuv.cam_conv_yuv2yuv_mode = 3; + dev->cam_rgb_yuv.cam_conv_yuv_mode = (dst_fourcc == ESP_COLOR_FOURCC_OUYY_EVYY) ? 1 : 0; } } diff --git a/components/esp_hal_cam/esp32p4/include/hal/mipi_csi_brg_ll.h b/components/esp_hal_cam/esp32p4/include/hal/mipi_csi_brg_ll.h index 5ce3feec202..dd19cc6a92a 100644 --- a/components/esp_hal_cam/esp32p4/include/hal/mipi_csi_brg_ll.h +++ b/components/esp_hal_cam/esp32p4/include/hal/mipi_csi_brg_ll.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2024-2025 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -11,6 +11,8 @@ #include "hal/assert.h" #include "hal/hal_utils.h" #include "hal/mipi_csi_types.h" +#include "hal/color_types.h" +#include "hal/cam_ctlr_types.h" #include "soc/mipi_csi_bridge_struct.h" #ifdef __cplusplus diff --git a/components/esp_hal_cam/esp32s3/include/hal/cam_ll.h b/components/esp_hal_cam/esp32s3/include/hal/cam_ll.h index b52b34eab08..2b58c45f76f 100644 --- a/components/esp_hal_cam/esp32s3/include/hal/cam_ll.h +++ b/components/esp_hal_cam/esp32s3/include/hal/cam_ll.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2025-2026 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -265,91 +265,40 @@ static inline void cam_ll_set_yuv_convert_std(lcd_cam_dev_t *dev, color_conv_std } /** - * @brief Set the converter mode: RGB565 to YUV + * @brief Set converter mode * * @param dev CAM register base address - * @param yuv_sample YUV sample mode + * @param src_fourcc Source format FourCC + * @param dst_fourcc Destination format FourCC */ -static inline void cam_ll_set_convert_mode_rgb_to_yuv(lcd_cam_dev_t *dev, color_pixel_yuv_format_t yuv_sample) +static inline void cam_ll_set_convert_mode(lcd_cam_dev_t *dev, uint32_t src_fourcc, uint32_t dst_fourcc) { - dev->cam_rgb_yuv.cam_conv_trans_mode = 1; - dev->cam_rgb_yuv.cam_conv_yuv2yuv_mode = 3; - switch (yuv_sample) { - case COLOR_PIXEL_YUV422: - dev->cam_rgb_yuv.cam_conv_yuv_mode = 0; - break; - case COLOR_PIXEL_YUV420: - dev->cam_rgb_yuv.cam_conv_yuv_mode = 1; - break; - case COLOR_PIXEL_YUV411: - dev->cam_rgb_yuv.cam_conv_yuv_mode = 2; - break; - default: - abort(); - } -} + bool src_is_yuv = (src_fourcc == ESP_COLOR_FOURCC_OUYY_EVYY || + src_fourcc == ESP_COLOR_FOURCC_YVYU || + src_fourcc == ESP_COLOR_FOURCC_YUYV || + src_fourcc == ESP_COLOR_FOURCC_UYVY || + src_fourcc == ESP_COLOR_FOURCC_VYUY || + src_fourcc == ESP_COLOR_FOURCC_YUV); + bool dst_is_yuv = (dst_fourcc == ESP_COLOR_FOURCC_OUYY_EVYY || + dst_fourcc == ESP_COLOR_FOURCC_YVYU || + dst_fourcc == ESP_COLOR_FOURCC_YUYV || + dst_fourcc == ESP_COLOR_FOURCC_UYVY || + dst_fourcc == ESP_COLOR_FOURCC_VYUY || + dst_fourcc == ESP_COLOR_FOURCC_YUV); -/** - * @brief Set the converter mode: YUV to RGB565 - * - * @param dev CAM register base address - * @param yuv_sample YUV sample mode - */ -static inline void cam_ll_set_convert_mode_yuv_to_rgb(lcd_cam_dev_t *dev, color_pixel_yuv_format_t yuv_sample) -{ - dev->cam_rgb_yuv.cam_conv_trans_mode = 0; - dev->cam_rgb_yuv.cam_conv_yuv2yuv_mode = 3; - switch (yuv_sample) { - case COLOR_PIXEL_YUV422: - dev->cam_rgb_yuv.cam_conv_yuv_mode = 0; - break; - case COLOR_PIXEL_YUV420: - dev->cam_rgb_yuv.cam_conv_yuv_mode = 1; - break; - case COLOR_PIXEL_YUV411: - dev->cam_rgb_yuv.cam_conv_yuv_mode = 2; - break; - default: - abort(); - } -} - -/** - * @brief Set the converter mode: YUV to YUV - * - * @param dev CAM register base address - * @param src_sample Source YUV sample mode - * @param dst_sample Destination YUV sample mode - */ -static inline void cam_ll_set_convert_mode_yuv_to_yuv(lcd_cam_dev_t *dev, color_pixel_yuv_format_t src_sample, color_pixel_yuv_format_t dst_sample) -{ - HAL_ASSERT(src_sample != dst_sample); - dev->cam_rgb_yuv.cam_conv_trans_mode = 1; - switch (src_sample) { - case COLOR_PIXEL_YUV422: - dev->cam_rgb_yuv.cam_conv_yuv_mode = 0; - break; - case COLOR_PIXEL_YUV420: - dev->cam_rgb_yuv.cam_conv_yuv_mode = 1; - break; - case COLOR_PIXEL_YUV411: - dev->cam_rgb_yuv.cam_conv_yuv_mode = 2; - break; - default: - abort(); - } - switch (dst_sample) { - case COLOR_PIXEL_YUV422: - dev->cam_rgb_yuv.cam_conv_yuv2yuv_mode = 0; - break; - case COLOR_PIXEL_YUV420: - dev->cam_rgb_yuv.cam_conv_yuv2yuv_mode = 1; - break; - case COLOR_PIXEL_YUV411: - dev->cam_rgb_yuv.cam_conv_yuv2yuv_mode = 2; - break; - default: - abort(); + if (src_is_yuv && dst_is_yuv) { + HAL_ASSERT(src_fourcc != dst_fourcc); + dev->cam_rgb_yuv.cam_conv_trans_mode = 1; + dev->cam_rgb_yuv.cam_conv_yuv_mode = (src_fourcc == ESP_COLOR_FOURCC_OUYY_EVYY) ? 1 : 0; + dev->cam_rgb_yuv.cam_conv_yuv2yuv_mode = (dst_fourcc == ESP_COLOR_FOURCC_OUYY_EVYY) ? 1 : 0; + } else if (src_is_yuv) { + dev->cam_rgb_yuv.cam_conv_trans_mode = 0; + dev->cam_rgb_yuv.cam_conv_yuv2yuv_mode = 3; + dev->cam_rgb_yuv.cam_conv_yuv_mode = (src_fourcc == ESP_COLOR_FOURCC_OUYY_EVYY) ? 1 : 0; + } else if (dst_is_yuv) { + dev->cam_rgb_yuv.cam_conv_trans_mode = 1; + dev->cam_rgb_yuv.cam_conv_yuv2yuv_mode = 3; + dev->cam_rgb_yuv.cam_conv_yuv_mode = (dst_fourcc == ESP_COLOR_FOURCC_OUYY_EVYY) ? 1 : 0; } } diff --git a/components/esp_hal_cam/include/hal/cam_ctlr_types.h b/components/esp_hal_cam/include/hal/cam_ctlr_types.h index 7b0001e9792..a23d50575b2 100644 --- a/components/esp_hal_cam/include/hal/cam_ctlr_types.h +++ b/components/esp_hal_cam/include/hal/cam_ctlr_types.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2023-2025 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2023-2026 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -14,19 +14,20 @@ extern "C" { #endif /** - * @brief Camera Controller Color Type + * @brief Camera Controller Color Type, in FourCC format */ typedef enum { - CAM_CTLR_COLOR_RAW8 = COLOR_TYPE_ID(COLOR_SPACE_RAW, COLOR_PIXEL_RAW8), ///< RAW8 - CAM_CTLR_COLOR_RAW10 = COLOR_TYPE_ID(COLOR_SPACE_RAW, COLOR_PIXEL_RAW10), ///< RAW10 - CAM_CTLR_COLOR_RAW12 = COLOR_TYPE_ID(COLOR_SPACE_RAW, COLOR_PIXEL_RAW12), ///< RAW12 - CAM_CTLR_COLOR_RGB565 = COLOR_TYPE_ID(COLOR_SPACE_RGB, COLOR_PIXEL_RGB565), ///< RGB565 - CAM_CTLR_COLOR_RGB666 = COLOR_TYPE_ID(COLOR_SPACE_RGB, COLOR_PIXEL_RGB666), ///< RGB666 - CAM_CTLR_COLOR_RGB888 = COLOR_TYPE_ID(COLOR_SPACE_RGB, COLOR_PIXEL_RGB888), ///< RGB888 - CAM_CTLR_COLOR_YUV420 = COLOR_TYPE_ID(COLOR_SPACE_YUV, COLOR_PIXEL_YUV420), ///< YUV420 - CAM_CTLR_COLOR_YUV422 = COLOR_TYPE_ID(COLOR_SPACE_YUV, COLOR_PIXEL_YUV422), ///< YUV422 - CAM_CTLR_COLOR_GRAY4 = COLOR_TYPE_ID(COLOR_SPACE_GRAY, COLOR_PIXEL_GRAY4), ///< GRAY4 - CAM_CTLR_COLOR_GRAY8 = COLOR_TYPE_ID(COLOR_SPACE_GRAY, COLOR_PIXEL_GRAY8), ///< GRAY8 + CAM_CTLR_COLOR_RAW8 = ESP_COLOR_FOURCC_RAW8, ///< RAW8 + CAM_CTLR_COLOR_RAW10 = ESP_COLOR_FOURCC_RAW10, ///< RAW10 + CAM_CTLR_COLOR_RAW12 = ESP_COLOR_FOURCC_RAW12, ///< RAW12 + CAM_CTLR_COLOR_RGB565 = ESP_COLOR_FOURCC_RGB16, ///< RGB565 + CAM_CTLR_COLOR_RGB888 = ESP_COLOR_FOURCC_RGB24, ///< RGB888 + CAM_CTLR_COLOR_YUV420 = ESP_COLOR_FOURCC_OUYY_EVYY, ///< YUV420 + CAM_CTLR_COLOR_YUV422_YVYU = ESP_COLOR_FOURCC_YVYU, ///< YUV422, YVYU + CAM_CTLR_COLOR_YUV422_YUYV = ESP_COLOR_FOURCC_YUYV, ///< YUV422, YUYV + CAM_CTLR_COLOR_YUV422_UYVY = ESP_COLOR_FOURCC_UYVY, ///< YUV422, UYVY + CAM_CTLR_COLOR_YUV422_VYUY = ESP_COLOR_FOURCC_VYUY, ///< YUV422, VYUY + CAM_CTLR_COLOR_GRAY8 = ESP_COLOR_FOURCC_GREY, ///< GREY8 } cam_ctlr_color_t; /** diff --git a/components/hal/color_hal.c b/components/hal/color_hal.c index b556f8da488..693a8d535d9 100644 --- a/components/hal/color_hal.c +++ b/components/hal/color_hal.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2023-2025 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2023-2026 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -8,41 +8,6 @@ #include "hal/color_hal.h" #include "hal/assert.h" -uint32_t color_hal_pixel_format_get_bit_depth(color_space_pixel_format_t format) -{ - switch (format.color_type_id) { - case COLOR_TYPE_ID(COLOR_SPACE_GRAY, COLOR_PIXEL_GRAY4): - case COLOR_TYPE_ID(COLOR_SPACE_ALPHA, COLOR_PIXEL_A4): - case COLOR_TYPE_ID(COLOR_SPACE_CLUT, COLOR_PIXEL_L4): - return 4; - case COLOR_TYPE_ID(COLOR_SPACE_RAW, COLOR_PIXEL_RAW8): - case COLOR_TYPE_ID(COLOR_SPACE_GRAY, COLOR_PIXEL_GRAY8): - case COLOR_TYPE_ID(COLOR_SPACE_ALPHA, COLOR_PIXEL_A8): - case COLOR_TYPE_ID(COLOR_SPACE_CLUT, COLOR_PIXEL_L8): - return 8; - case COLOR_TYPE_ID(COLOR_SPACE_RAW, COLOR_PIXEL_RAW10): - return 10; - case COLOR_TYPE_ID(COLOR_SPACE_RAW, COLOR_PIXEL_RAW12): - case COLOR_TYPE_ID(COLOR_SPACE_YUV, COLOR_PIXEL_YUV420): - case COLOR_TYPE_ID(COLOR_SPACE_YUV, COLOR_PIXEL_YUV411): - return 12; - case COLOR_TYPE_ID(COLOR_SPACE_RGB, COLOR_PIXEL_RGB565): - case COLOR_TYPE_ID(COLOR_SPACE_YUV, COLOR_PIXEL_YUV422): - return 16; - case COLOR_TYPE_ID(COLOR_SPACE_RGB, COLOR_PIXEL_RGB666): - return 18; - case COLOR_TYPE_ID(COLOR_SPACE_RGB, COLOR_PIXEL_RGB888): - case COLOR_TYPE_ID(COLOR_SPACE_YUV, COLOR_PIXEL_YUV444): - return 24; - case COLOR_TYPE_ID(COLOR_SPACE_ARGB, COLOR_PIXEL_ARGB8888): - return 32; - default: - // Unknown color space pixel format, unknown bit depth - HAL_ASSERT(false); - return 0; - } -} - uint32_t color_hal_pixel_format_fourcc_get_bit_depth(esp_color_fourcc_t four_character_code) { switch (four_character_code) { @@ -62,8 +27,10 @@ uint32_t color_hal_pixel_format_fourcc_get_bit_depth(esp_color_fourcc_t four_cha case ESP_COLOR_FOURCC_YVYU: case ESP_COLOR_FOURCC_VYUY: case ESP_COLOR_FOURCC_RGB16: + case ESP_COLOR_FOURCC_RGB16_BE: return 16; case ESP_COLOR_FOURCC_BGR24: + case ESP_COLOR_FOURCC_RGB24: case ESP_COLOR_FOURCC_YUV: return 24; case ESP_COLOR_FOURCC_BGRA32: diff --git a/components/hal/include/hal/color_hal.h b/components/hal/include/hal/color_hal.h index 6502781a882..1344bf66848 100644 --- a/components/hal/include/hal/color_hal.h +++ b/components/hal/include/hal/color_hal.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2023-2025 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2023-2026 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -13,16 +13,6 @@ extern "C" { #endif -/** - * @brief Get the bit depth (bits/pixel) of each color space pixel format - * - * @param color_type_id Value constructed in color_space_pixel_format_t struct - * - * @return Number of bits per pixel - */ -uint32_t color_hal_pixel_format_get_bit_depth(color_space_pixel_format_t color_type_id); - - /** * @brief Get the bit depth (bits/pixel) of each color space pixel format * diff --git a/components/hal/include/hal/color_types.h b/components/hal/include/hal/color_types.h index c52fca8d75d..a17dc7af3a9 100644 --- a/components/hal/include/hal/color_types.h +++ b/components/hal/include/hal/color_types.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2023-2025 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2023-2026 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -44,6 +44,16 @@ typedef uint32_t esp_color_fourcc_t; */ #define ESP_COLOR_FOURCC_BGR24 ESP_COLOR_FOURCC('B', 'G', 'R', '3') /* 24 bpp BGR-8-8-8 */ +/** + * RGB24 (RGB888) + * Memory Layout: + * | bit7 - bit0 | + * Byte 2: | B7 - B0 | + * Byte 1: | G7 - G0 | + * Byte 0: | R7 - R0 | + */ +#define ESP_COLOR_FOURCC_RGB24 ESP_COLOR_FOURCC('R', 'G', 'B', '3') /* 24 bpp RGB-8-8-8 */ + /** * RGB565 * Memory Layout: @@ -53,6 +63,15 @@ typedef uint32_t esp_color_fourcc_t; */ #define ESP_COLOR_FOURCC_RGB16 ESP_COLOR_FOURCC('R', 'G', 'B', 'L') /* 16 bpp RGB-5-6-5, little endian */ +/** + * RGB565 (Big Endian) + * Memory Layout: + * | bit7 bit6 bit5 bit4 bit3 bit2 bit1 bit0 | + * Byte 1: | G2 G1 G0 | B4 B3 B2 B1 B0 | + * Byte 0: | R4 R3 R2 R1 R0 | G5 G4 G3 | + */ +#define ESP_COLOR_FOURCC_RGB16_BE ESP_COLOR_FOURCC('R', 'G', 'B', 'E') /* 16 bpp RGB-5-6-5, big endian */ + /** * Grey8 * Memory Layout: @@ -286,113 +305,6 @@ typedef enum { COLOR_COMPONENT_INVALID, /*!< Invalid color component */ } color_component_t; -///< The following values are deprecated, please use the FOURCC values instead, IDF-14284 - -/*--------------------------------------------------------------- - Color Space ----------------------------------------------------------------*/ -/** - * @brief Color Space - * - * @note Save enum 0 for special purpose - */ -typedef enum { - COLOR_SPACE_RAW = 1, ///< Color space raw - COLOR_SPACE_RGB, ///< Color space rgb - COLOR_SPACE_YUV, ///< Color space yuv - COLOR_SPACE_GRAY, ///< Color space gray - COLOR_SPACE_ARGB, ///< Color space argb - COLOR_SPACE_ALPHA, ///< Color space alpha (A) - COLOR_SPACE_CLUT, ///< Color look-up table (L) -} color_space_t; - -/*--------------------------------------------------------------- - Color Pixel Format ----------------------------------------------------------------*/ -/** - * @brief Raw Format - */ -typedef enum { - COLOR_PIXEL_RAW8, ///< 8 bits per pixel - COLOR_PIXEL_RAW10, ///< 10 bits per pixel - COLOR_PIXEL_RAW12, ///< 12 bits per pixel -} color_pixel_raw_format_t; - -/** - * @brief RGB Format - */ -typedef enum { - COLOR_PIXEL_RGB888, ///< 24 bits, 8 bits per R/G/B value - COLOR_PIXEL_RGB666, ///< 18 bits, 6 bits per R/G/B value - COLOR_PIXEL_RGB565, ///< 16 bits, 5 bits per R/B value, 6 bits for G value -} color_pixel_rgb_format_t; - -/** - * @brief YUV Format - */ -typedef enum { - COLOR_PIXEL_YUV444, ///< 24 bits, 8 bits per Y/U/V value - COLOR_PIXEL_YUV422, ///< 16 bits, 8-bit Y per pixel, 8-bit U and V per two pixels - COLOR_PIXEL_YUV420, ///< 12 bits, 8-bit Y per pixel, 8-bit U and V per four pixels - COLOR_PIXEL_YUV411, ///< 12 bits, 8-bit Y per pixel, 8-bit U and V per four pixels -} color_pixel_yuv_format_t; - -/** - * @brief Gray Format - */ -typedef enum { - COLOR_PIXEL_GRAY4, ///< 4 bits, grayscale - COLOR_PIXEL_GRAY8, ///< 8 bits, grayscale -} color_pixel_gray_format_t; - -/** - * @brief ARGB Format - */ -typedef enum { - COLOR_PIXEL_ARGB8888, ///< 32 bits, 8 bits per A(alpha)/R/G/B value -} color_pixel_argb_format_t; - -/** - * @brief Alpha(A) Format - */ -typedef enum { - COLOR_PIXEL_A4, ///< 4 bits, opacity only - COLOR_PIXEL_A8, ///< 8 bits, opacity only -} color_pixel_alpha_format_t; - -/** - * @brief CLUT(L) Format - */ -typedef enum { - COLOR_PIXEL_L4, ///< 4 bits, color look-up table - COLOR_PIXEL_L8, ///< 8 bits, color look-up table -} color_pixel_clut_format_t; - -/*--------------------------------------------------------------- - Color Space Pixel Struct Type ----------------------------------------------------------------*/ -///< Bitwidth of the `color_space_pixel_format_t::color_space` field -#define COLOR_SPACE_BITWIDTH 8 -///< Bitwidth of the `color_space_pixel_format_t::pixel_format` field -#define COLOR_PIXEL_FORMAT_BITWIDTH 24 -///< Helper to get the color_space from a unique color type ID -#define COLOR_SPACE_TYPE(color_type_id) (((color_type_id) >> COLOR_PIXEL_FORMAT_BITWIDTH) & ((1 << COLOR_SPACE_BITWIDTH) - 1)) -///< Helper to get the pixel_format from a unique color type ID -#define COLOR_PIXEL_FORMAT(color_type_id) ((color_type_id) & ((1 << COLOR_PIXEL_FORMAT_BITWIDTH) - 1)) -///< Make a unique ID of a color based on the value of color space and pixel format -#define COLOR_TYPE_ID(color_space, pixel_format) (((color_space) << COLOR_PIXEL_FORMAT_BITWIDTH) | (pixel_format)) - -/** - * @brief Color Space Info Structure - */ -typedef union { - struct { - uint32_t pixel_format: COLOR_PIXEL_FORMAT_BITWIDTH; ///< Format of a certain color space type - uint32_t color_space: COLOR_SPACE_BITWIDTH; ///< Color space type - }; - uint32_t color_type_id; ///< Unique type of a certain color pixel format -} color_space_pixel_format_t; - #ifdef __cplusplus } #endif diff --git a/docs/en/migration-guides/release-6.x/6.0/peripherals.rst b/docs/en/migration-guides/release-6.x/6.0/peripherals.rst index 5b914598874..faa91ff4826 100644 --- a/docs/en/migration-guides/release-6.x/6.0/peripherals.rst +++ b/docs/en/migration-guides/release-6.x/6.0/peripherals.rst @@ -275,6 +275,27 @@ LCD - The NT35510 LCD device driver has been moved out of ESP-IDF and is now hosted in the `ESP Component Registry `__. If your project uses the NT35510 driver, you can add it to your project by running ``idf.py add-dependency "espressif/esp_lcd_nt35510"``. - The ``use_dma2d`` member in the :cpp:type:`esp_lcd_dpi_panel_config_t` has been removed. Please use the :func:`esp_lcd_dpi_panel_enable_dma2d` function to enable DMA2D for the DPI panel. When not using DMA2D, the binary file size can be reduced by around 10KB. +Color Types +----------- + +The following types in the ``components/hal/include/hal/color_types.h`` header file have been removed. Please use FourCC format (:cpp:type:`esp_color_fourcc_t`) instead: + +- :cpp:type:`color_space_t` - The color space enumeration type has been removed. Please use FourCC format to specify color space and pixel format. +- :cpp:type:`color_space_pixel_format_t` - The color space pixel format union has been removed. Please use :cpp:type:`esp_color_fourcc_t` type and corresponding FourCC macro definitions to specify pixel format. + +Migration example: + +.. code-block:: c + + /* Old */ + color_space_pixel_format_t format = { + .color_space = COLOR_SPACE_RGB, + .pixel_format = COLOR_PIXEL_RGB565 + }; + + /* New */ + esp_color_fourcc_t format = ESP_COLOR_FOURCC_RGB565; + SPI --- diff --git a/docs/zh_CN/migration-guides/release-6.x/6.0/peripherals.rst b/docs/zh_CN/migration-guides/release-6.x/6.0/peripherals.rst index 689a0594b3c..ef01aeb0054 100644 --- a/docs/zh_CN/migration-guides/release-6.x/6.0/peripherals.rst +++ b/docs/zh_CN/migration-guides/release-6.x/6.0/peripherals.rst @@ -275,6 +275,27 @@ LCD - NT35510 LCD 设备驱动已经从 ESP-IDF 中移动到外部仓库，并且托管在了 `ESP Component Registry `__ 上。如果你的项目使用到了 NT35510 驱动，你可以通过运行 ``idf.py add-dependency "espressif/esp_lcd_nt35510"`` 将它添加到你的项目中。 - :cpp:type:`esp_lcd_dpi_panel_config_t` 结构体中的 ``use_dma2d`` 成员已被移除。请使用 :func:`esp_lcd_dpi_panel_enable_dma2d` 函数来启用 DMA2D 功能。当不使用 DMA2D 时，可以减小 10KB 左右的二进制文件大小。 +颜色类型 (Color Types) +---------------------- + +位于 ``components/hal/include/hal/color_types.h`` 头文件中的以下类型已被移除，请使用 FourCC 格式（:cpp:type:`esp_color_fourcc_t`）替代： + +- :cpp:type:`color_space_t` - 颜色空间枚举类型已被移除。请使用 FourCC 格式来指定颜色空间和像素格式。 +- :cpp:type:`color_space_pixel_format_t` - 颜色空间像素格式联合体已被移除。请使用 :cpp:type:`esp_color_fourcc_t` 类型和相应的 FourCC 宏定义来指定像素格式。 + +迁移示例： + +.. code-block:: c + + /* 旧版 */ + color_space_pixel_format_t format = { + .color_space = COLOR_SPACE_RGB, + .pixel_format = COLOR_PIXEL_RGB565 + }; + + /* 新版 */ + esp_color_fourcc_t format = ESP_COLOR_FOURCC_RGB565; + SPI ---