Merge branch 'bugfix/fix_https_skip_cert_fail' into 'main'

Fix HTTPS skip cert fail

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

Author: TempoTian

components/esp_webrtc/impl/apprtc_signal/https_client.c

@@ -27,7 +27,10 @@
 #include "esp_log.h"
 #include "https_client.h"
 #include "esp_tls.h"
+#include <sdkconfig.h>
+#ifdef CONFIG_MBEDTLS_CERTIFICATE_BUNDLE
 #include "esp_crt_bundle.h"
+#endif
 #include "esp_http_client.h"
 
 static const char *TAG = "HTTPS_CLIENT";
@@ -114,7 +117,9 @@ int https_send_request(const char *method, char **headers, const char *url, char
     esp_http_client_config_t config = {
         .url = url,
         .event_handler = _http_event_handler,
+#ifdef CONFIG_MBEDTLS_CERTIFICATE_BUNDLE
         .crt_bundle_attach = esp_crt_bundle_attach,
+#endif
         .user_data = &info,
         .timeout_ms = 10000, // Change default timeout to be 10s
     };

components/esp_webrtc/impl/apprtc_signal/signal_default.c

@@ -36,7 +36,10 @@
 #include <esp_system.h>
 #include <sys/param.h>
 #include "esp_netif.h"
+#include <sdkconfig.h>
+#ifdef CONFIG_MBEDTLS_CERTIFICATE_BUNDLE
 #include "esp_crt_bundle.h"
+#endif
 #include "esp_websocket_client.h"
 #include "esp_tls.h"
 
@@ -417,7 +420,9 @@ int create_wss(wss_sig_t *sg)
     esp_websocket_client_config_t ws_cfg = {
         .uri = sg->client_info.wss_url,
         .headers = origin,
+#ifdef CONFIG_MBEDTLS_CERTIFICATE_BUNDLE
         .crt_bundle_attach = esp_crt_bundle_attach,
+#endif
         // .keep_alive_enable = true,
         .reconnect_timeout_ms = 60 * 1000,
         // .ping_interval_sec = 30,

solutions/peer_demo/sdkconfig.defaults.esp32p4

@@ -0,0 +1,17 @@
+
+CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
+
+CONFIG_SPIRAM_SPEED_200M=y
+
+# If you use serial JTAG turn on this option
+#CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG=y
+
+# Use camera SC2336
+CONFIG_CAMERA_SC2336=y
+CONFIG_CAMERA_SC2336_MIPI_RAW10_1920x1080_25FPS_2_LANE=y
+
+# Enable ISP pipelines
+CONFIG_ESP_VIDEO_ENABLE_ISP_PIPELINE_CONTROLLER=y
+
+CONFIG_IDF_SLAVE_TARGET="esp32c6"
+CONFIG_SLAVE_IDF_TARGET_ESP32C6=y

solutions/whip_demo/main/settings.h

@@ -16,14 +16,24 @@ extern "C" {
 /**
  * @brief  Board name setting refer to `codec_board` README.md for more details
  */
+#if CONFIG_IDF_TARGET_ESP32P4
 #define TEST_BOARD_NAME "ESP32_P4_DEV_V14"
+#else
+#define TEST_BOARD_NAME "S3_Korvo_V2"
+#endif
 
 /**
  * @brief  Video resolution settings
  */
-#define VIDEO_WIDTH  1024
-#define VIDEO_HEIGHT 600
+#if CONFIG_IDF_TARGET_ESP32P4
+#define VIDEO_WIDTH  1920
+#define VIDEO_HEIGHT 1080
+#define VIDEO_FPS    25
+#else
+#define VIDEO_WIDTH  320
+#define VIDEO_HEIGHT 240
 #define VIDEO_FPS    10
+#endif
 
 /**
  * @brief  Set for wifi ssid

solutions/whip_demo/sdkconfig.defaults.esp32p4

@@ -8,7 +8,7 @@ CONFIG_SPIRAM_SPEED_200M=y
 
 # Use camera SC2336
 CONFIG_CAMERA_SC2336=y
-CONFIG_CAMERA_SC2336_MIPI_RAW8_1024x600_30FPS=y
+CONFIG_CAMERA_SC2336_MIPI_RAW10_1920x1080_25FPS_2_LANE=y
 
 # Enable ISP pipelines
 CONFIG_ESP_VIDEO_ENABLE_ISP_PIPELINE_CONTROLLER=y