Merge branch 'feature/support_idf_v6.0' into 'main'

Add support for IDFv6.0

See merge request adf/esp-webrtc-solution!39

Author: TempoTian

components/codec_board/lcd_init.c

@@ -187,7 +187,9 @@ static int _init_spi_lcd(lcd_cfg_t *cfg)
     };
 #if SOC_SPI_SUPPORT_OCT
     if (cfg->spi_cfg.d[6] >= 0) {
+#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(6, 0, 0)
         io_config.flags.octal_mode = 1;
+#endif
         io_config.spi_mode = 3;
     }
 #endif
@@ -196,7 +198,9 @@ static int _init_spi_lcd(lcd_cfg_t *cfg)
     RETURN_ON_ERR(ret);
     esp_lcd_panel_dev_config_t panel_config = {
         .reset_gpio_num = get_hw_gpio(cfg->reset_pin),
-#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 3, 0)
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(6, 0, 0)
+        .rgb_ele_order = LCD_RGB_ELEMENT_ORDER_BGR,
+#elif ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 3, 0)
         .rgb_ele_order = ESP_LCD_COLOR_SPACE_BGR,
 #else
         .rgb_endian = LCD_RGB_ENDIAN_BGR,

components/esp_capture/src/impl/capture_video_src/capture_video_dvp_src.c

@@ -75,8 +75,9 @@ static int dvp_src_get_support_codecs(esp_capture_video_src_if_t *src, const esp
 {
     static esp_capture_codec_type_t dvp_codecs[] = {
         ESP_CAPTURE_CODEC_TYPE_MJPEG,
-        ESP_CAPTURE_CODEC_TYPE_YUV422P,
+        ESP_CAPTURE_CODEC_TYPE_YUV422,
         ESP_CAPTURE_CODEC_TYPE_YUV420,
+        ESP_CAPTURE_CODEC_TYPE_RGB565,
     };
     *codecs = dvp_codecs;
     *num = sizeof(dvp_codecs) / sizeof(dvp_codecs[0]);
@@ -142,7 +143,7 @@ static int dvp_src_negotiate_caps(esp_capture_video_src_if_t *src, esp_capture_v
     }
     if (in_cap->codec == ESP_CAPTURE_CODEC_TYPE_MJPEG) {
         camera_config.pixel_format = PIXFORMAT_JPEG;
-    } else if (in_cap->codec == ESP_CAPTURE_CODEC_TYPE_YUV422P || in_cap->codec == ESP_CAPTURE_CODEC_TYPE_YUV420) {
+    } else if (in_cap->codec == ESP_CAPTURE_CODEC_TYPE_YUV422 || in_cap->codec == ESP_CAPTURE_CODEC_TYPE_YUV420) {
         camera_config.pixel_format = PIXFORMAT_YUV422;
         if (in_cap->codec == ESP_CAPTURE_CODEC_TYPE_YUV420) {
             dvp_src->need_convert_420 = true;

components/esp_capture/src/impl/capture_video_src/idf_component.yml

@@ -5,7 +5,7 @@ dependencies:
       - if: "target in [esp32p4]"
 
   espressif/esp32-camera:
-    version: "~2.0.15"
+    version: "~2.1"
     rules:
       - if: "target in [esp32s3,esp32s2,esp32]"
   esp_capture:

components/esp_peer/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## v1.2.3
+
+### Features
+
+- Added support for IDFv6.0
+- Added API `esp_peer_pre_generate_cert` for pre-generate DTLS key
+
+### Bug Fixes
+
+- Fixed build error on IDFv6.0
+- Make DTLS module to be open source
+- Fixed data channel role not follow DTLS role
+
 ## v1.2.2
 
 ### Bug Fixes

components/esp_peer/CMakeLists.txt

@@ -1,7 +1,9 @@
-idf_component_register(INCLUDE_DIRS ./include SRC_DIRS "src")
+idf_component_register(INCLUDE_DIRS ./include
+                       SRC_DIRS "src"
+                       PRIV_REQUIRES mbedtls)
 
 get_filename_component(BASE_DIR ${CMAKE_CURRENT_SOURCE_DIR} NAME)
 add_prebuilt_library(${BASE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/libs/${IDF_TARGET}/libpeer_default.a"
-                     PRIV_REQUIRES ${BASE_DIR} esp_timer mbedtls)
+                     PRIV_REQUIRES ${BASE_DIR} esp_timer)
 target_link_libraries(${COMPONENT_LIB} PRIVATE "-L ${CMAKE_CURRENT_SOURCE_DIR}/libs/${IDF_TARGET}")
 target_link_libraries(${COMPONENT_LIB} PRIVATE ${BASE_DIR})

components/esp_peer/README.md

@@ -199,6 +199,8 @@ Ensure these config options are enabled:
 ```ini
 CONFIG_MBEDTLS_SSL_PROTO_DTLS=y
 CONFIG_MBEDTLS_SSL_DTLS_SRTP=y
+For IDFv6.0 need turn on following option also
+CONFIG_MBEDTLS_X509_CREATE_C=y
 ```
 
 ---

components/esp_peer/examples/peer_demo/sdkconfig.defaults

@@ -4,6 +4,7 @@ CONFIG_FREERTOS_HZ=1000
 # Enable DTLS SRTP
 CONFIG_MBEDTLS_SSL_PROTO_DTLS=y
 CONFIG_MBEDTLS_SSL_DTLS_SRTP=y
+CONFIG_MBEDTLS_X509_CREATE_C=y
 
 # Enable experimental features
 CONFIG_IDF_EXPERIMENTAL_FEATURES=y

components/esp_peer/idf_component.yml

@@ -1,5 +1,5 @@
 description: Espressif PeerConnection Library
-version: 1.2.2
+version: 1.2.3
 url: "https://github.com/espressif/esp-webrtc-solution/tree/main/components/esp_peer"
 documentation: "https://github.com/espressif/esp-webrtc-solution/tree/main/components/esp_peer/README.md"
 issues: "https://github.com/espressif/esp-webrtc-solution/issues"

components/esp_peer/include/esp_peer.h

@@ -567,6 +567,25 @@ int esp_peer_query(esp_peer_handle_t peer);
  */
 int esp_peer_close(esp_peer_handle_t peer);
 
+/**
+ * @brief  Pre-generates cryptographic materials for DTLS handshake to optimize connection establishment
+ *
+ * @note  This function generates and caches X.509 certificates and associated private keys
+ *          that will be used for subsequent DTLS handshakes. Pre-generation is recommended
+ *          because:
+ *          - Cryptographic operations during runtime can significantly delay connection establishment
+ *          - Certificate generation is computationally intensive
+ *          - Reusing pre-generated materials maintains security while improving performance
+ *       Important considerations:
+ *       - Generated materials are stored in internal memory and persist until reset
+ *       - Each call overwrites any previously generated materials
+ *
+ * @return
+ *       - ESP_PEER_ERR_NONE  On success
+ *       - Others             Failed to generate
+ */
+int esp_peer_pre_generate_cert(void);
+
 #ifdef __cplusplus
 }
 #endif