Merge branch 'bugfix/fix_h264_param_failed' into 'main'

TempoTian · TempoTian · commit c36bfbfa17e8 · 2025-05-12T19:30:14.000+08:00
Fix H264 fail to allocate param buffer

See merge request adf/esp-webrtc-solution!25
diff --git a/solutions/doorbell_demo/main/settings.h b/solutions/doorbell_demo/main/settings.h
@@ -30,7 +30,7 @@ extern "C" {
 #if CONFIG_IDF_TARGET_ESP32P4
 #define VIDEO_WIDTH  1920
 #define VIDEO_HEIGHT 1080
-#define VIDEO_FPS    30
+#define VIDEO_FPS    25
 #else
 #define VIDEO_WIDTH  320
 #define VIDEO_HEIGHT 240
diff --git a/solutions/doorbell_demo/sdkconfig.defaults b/solutions/doorbell_demo/sdkconfig.defaults
@@ -26,3 +26,8 @@ CONFIG_IDF_EXPERIMENTAL_FEATURES=y
 
 # Use customer partition table
 CONFIG_PARTITION_TABLE_CUSTOM=y
+
+# Allocate LWIP and MbedTLS on SPIRAM
+CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=256
+CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y
+CONFIG_MBEDTLS_EXTERNAL_MEM_ALLOC=y
diff --git a/solutions/doorbell_demo/sdkconfig.defaults.esp32p4 b/solutions/doorbell_demo/sdkconfig.defaults.esp32p4
@@ -9,7 +9,7 @@ CONFIG_SPIRAM_SPEED_200M=y
 
 # Use camera SC2336
 CONFIG_CAMERA_SC2336=y
-CONFIG_CAMERA_SC2336_MIPI_RAW8_1920x1080_30FPS=y
+CONFIG_CAMERA_SC2336_MIPI_RAW10_1920x1080_25FPS_2_LANE=y
 
 # Enable ISP pipelines
 CONFIG_ESP_VIDEO_ENABLE_ISP_PIPELINE_CONTROLLER=y
diff --git a/solutions/doorbell_demo/sdkconfig.defaults.esp32s3 b/solutions/doorbell_demo/sdkconfig.defaults.esp32s3
@@ -17,7 +17,4 @@ CONFIG_ESP32S3_DATA_CACHE_LINE_64B=y
 CONFIG_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 
-CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=4096
-CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y
-CONFIG_MBEDTLS_EXTERNAL_MEM_ALLOC=y
 CONFIG_ESP_WS_CLIENT_ENABLE_DYNAMIC_BUFFER=y
diff --git a/solutions/doorbell_local/main/settings.h b/solutions/doorbell_local/main/settings.h
@@ -30,7 +30,7 @@ extern "C" {
 #if CONFIG_IDF_TARGET_ESP32P4
 #define VIDEO_WIDTH  1920
 #define VIDEO_HEIGHT 1080
-#define VIDEO_FPS    30
+#define VIDEO_FPS    25
 #else
 #define VIDEO_WIDTH  320
 #define VIDEO_HEIGHT 240
diff --git a/solutions/doorbell_local/sdkconfig.defaults b/solutions/doorbell_local/sdkconfig.defaults
@@ -33,3 +33,8 @@ CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_HTTPD_MAX_REQ_HDR_LEN=4096
 CONFIG_HTTPD_MAX_URI_LEN=256
 CONFIG_HTTPD_SERVER_EVENT_POST_TIMEOUT=100
+
+# Allocate LWIP and MbedTLS on SPIRAM
+CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=256
+CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y
+CONFIG_MBEDTLS_EXTERNAL_MEM_ALLOC=y
diff --git a/solutions/doorbell_local/sdkconfig.defaults.esp32p4 b/solutions/doorbell_local/sdkconfig.defaults.esp32p4
@@ -9,7 +9,7 @@ CONFIG_SPIRAM_SPEED_200M=y
 
 # Use camera SC2336
 CONFIG_CAMERA_SC2336=y
-CONFIG_CAMERA_SC2336_MIPI_RAW8_1920x1080_30FPS=y
+CONFIG_CAMERA_SC2336_MIPI_RAW10_1920x1080_25FPS_2_LANE=y
 
 # Enable ISP pipelines
 CONFIG_ESP_VIDEO_ENABLE_ISP_PIPELINE_CONTROLLER=y
diff --git a/solutions/doorbell_local/sdkconfig.defaults.esp32s3 b/solutions/doorbell_local/sdkconfig.defaults.esp32s3
@@ -17,7 +17,4 @@ CONFIG_ESP32S3_DATA_CACHE_LINE_64B=y
 CONFIG_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 
-CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=4096
-CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y
-CONFIG_MBEDTLS_EXTERNAL_MEM_ALLOC=y
 CONFIG_ESP_WS_CLIENT_ENABLE_DYNAMIC_BUFFER=y
diff --git a/solutions/openai_demo/sdkconfig.defaults b/solutions/openai_demo/sdkconfig.defaults
@@ -25,3 +25,8 @@ CONFIG_IDF_EXPERIMENTAL_FEATURES=y
 
 # Use customer partition table
 CONFIG_PARTITION_TABLE_CUSTOM=y
+
+# Allocate LWIP and MbedTLS on SPIRAM
+CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=256
+CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y
+CONFIG_MBEDTLS_EXTERNAL_MEM_ALLOC=y
diff --git a/solutions/videocall_demo/sdkconfig.defaults b/solutions/videocall_demo/sdkconfig.defaults
@@ -30,3 +30,8 @@ CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=64
 CONFIG_LWIP_MAX_UDP_PCBS=1024
 CONFIG_LWIP_UDP_RECVMBOX_SIZE=64
+
+# Allocate LWIP and MbedTLS on SPIRAM
+CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=256
+CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y
+CONFIG_MBEDTLS_EXTERNAL_MEM_ALLOC=y
diff --git a/solutions/whip_demo/sdkconfig.defaults b/solutions/whip_demo/sdkconfig.defaults
@@ -29,3 +29,8 @@ CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=64
 CONFIG_LWIP_MAX_UDP_PCBS=1024
 CONFIG_LWIP_UDP_RECVMBOX_SIZE=64
+
+# Allocate LWIP and MbedTLS on SPIRAM
+CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=256
+CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y
+CONFIG_MBEDTLS_EXTERNAL_MEM_ALLOC=y
diff --git a/solutions/whip_demo/sdkconfig.defaults.esp32s3 b/solutions/whip_demo/sdkconfig.defaults.esp32s3
@@ -11,4 +11,3 @@ CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y
 CONFIG_ESP32S3_INSTRUCTION_CACHE_32KB=y
 CONFIG_ESP32S3_DATA_CACHE_64KB=y
 CONFIG_ESP32S3_DATA_CACHE_LINE_64B=y
-
