Merge branch 'bugfix/task_create_with_caps_leak' into 'main'

TempoTian · TempoTian · commit 5f3e523ca317 · 2025-01-24T10:30:19.000+08:00
Fix leakage when create task use xTaskCreatePinnedToCoreWithCaps

See merge request adf/esp-webrtc-solution!4
diff --git a/components/media_lib_sal/port/media_lib_os_freertos.c b/components/media_lib_sal/port/media_lib_os_freertos.c
@@ -211,8 +211,14 @@ static int _thread_create(media_lib_thread_handle_t *handle, const char *name,
 
 static void _thread_destroy(media_lib_thread_handle_t handle)
 {
+#if defined(CONFIG_SPIRAM_BOOT_INIT) &&              \
+    (CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY)  &&  \
+    (ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0))
+    vTaskDeleteWithCaps((TaskHandle_t)handle);
+#else
     // allow NULL to destroy self
     vTaskDelete((TaskHandle_t)handle);
+#endif
 }
 
 static bool _thread_set_priority(media_lib_thread_handle_t handle, int prio)

Original file line number	Diff line number	Diff line change
`@@ -211,8 +211,14 @@ static int _thread_create(media_lib_thread_handle_t handle, const char name,`
`211`	`211`
`212`	`212`	`static void _thread_destroy(media_lib_thread_handle_t handle)`
`213`	`213`	`{`
	`214`	`+#if defined(CONFIG_SPIRAM_BOOT_INIT) && \`
	`215`	`+ (CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY) && \`
	`216`	`+ (ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0))`
	`217`	`+ vTaskDeleteWithCaps((TaskHandle_t)handle);`
	`218`	`+#else`
`214`	`219`	`// allow NULL to destroy self`
`215`	`220`	`vTaskDelete((TaskHandle_t)handle);`
	`221`	`+#endif`
`216`	`222`	`}`
`217`	`223`
`218`	`224`	`static bool _thread_set_priority(media_lib_thread_handle_t handle, int prio)`