Merge branch 'feature/add_crt_bundle_attach_for_https' into 'main'

feat(gmf_loader): Add some features for gmf_loader

See merge request adf/multimedia/esp-gmf!190

Author: jason-mao

packages/gmf_loader/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## v0.7.2
+
+### Features
+
+- Add `crt_bundle_attach` to use when not enable `CONFIG_ESP_TLS_SKIP_SERVER_CERT_VERIFY`
+- Add io_file cache size configuration to improve read and write performance
+
 ## v0.7.1
 
 ### Bug Fixes
@@ -10,4 +17,4 @@
 
 ### Features
 
-- Add initial implementation of `gmf_loader` with official element registration and I/O setup.
+- Add initial implementation of `gmf_loader` with official element registration and I/O setup

packages/gmf_loader/CMakeLists.txt

@@ -1,4 +1,5 @@
 idf_component_register(
     SRC_DIRS "./src"
     INCLUDE_DIRS "./include"
+    REQUIRES "mbedtls"
 )

packages/gmf_loader/Kconfigs/kconfig.io.reader

@@ -10,6 +10,20 @@ menu "GMF IO Reader"
         help
             Initialize GMF File Reader
 
+        menu "IO File Configuration"
+            depends on GMF_IO_INIT_FILE_READER
+
+            config GMF_IO_FILE_READ_CACHE_SIZE
+                int "IO File Read Cache Size"
+                default 2048
+                range 0 65536
+                help
+                    Configure the buffer size for the GMF IO File Reader.
+                    This setting affects the performance of file reading operations.
+                    Larger buffer sizes may improve read performance but consume more memory.
+                    If the SOC does not have the SOC_SDMMC_PSRAM_DMA_CAPABLE capability, internal memory will be used.
+        endmenu
+
     config GMF_IO_INIT_HTTP_READER
         bool "Initialize GMF HTTP Reader"
         default y
@@ -49,7 +63,7 @@ menu "GMF IO Reader"
             config GMF_IO_HTTP_READER_OUT_BUF_SIZE
                 int "HTTP Reader Output Buffer Size"
                 default 8192
-                range 1024 16384
+                range 1024 131072
                 help
                     Configure the size of the output buffer for the GMF HTTP Reader.
 

packages/gmf_loader/Kconfigs/kconfig.io.writer

@@ -11,6 +11,20 @@ menu "GMF IO Writer"
         help
             Initialize GMF file writer
 
+        menu "IO File Configuration"
+            depends on GMF_IO_INIT_FILE_WRITER
+
+            config GMF_IO_FILE_WRITE_CACHE_SIZE
+                int "IO File Write Cache Size"
+                default 4096
+                range 0 65536
+                help
+                    Configure the buffer size for the GMF IO File Writer.
+                    This setting affects the performance of file writing operations.
+                    Larger buffer sizes may improve write performance but consume more memory.
+                    If the SOC does not have the SOC_SDMMC_PSRAM_DMA_CAPABLE capability, internal memory will be used.
+        endmenu
+
     config GMF_IO_INIT_HTTP_WRITER
         bool "Initialize GMF HTTP Writer"
         default n
@@ -50,7 +64,7 @@ menu "GMF IO Writer"
             config GMF_IO_HTTP_WRITER_OUT_BUF_SIZE
                 int "HTTP Writer Output Buffer Size"
                 default 8192
-                range 1024 16384
+                range 1024 131072
                 help
                     Configure the size of the output buffer for the GMF HTTP Writer.
 

packages/gmf_loader/idf_component.yml

@@ -1,4 +1,4 @@
-version: "0.7.1"
+version: "0.7.2"
 description: Espressif GMF Loader is a module that loads elements and I/O components for the GMF pipeline
 url: https://github.com/espressif/esp-gmf/tree/main/packages/gmf_loader
 documentation: "https://github.com/espressif/esp-gmf/blob/main/packages/gmf_loader/README.md"

packages/gmf_loader/src/gmf_loader_setup_audio_codec.c

@@ -16,8 +16,13 @@
 #include "sdkconfig.h"
 
 static const char *TAG               = "GMF_SETUP_AUD_CODEC";
+
+#ifdef CONFIG_GMF_AUDIO_CODEC_INIT_ENCODER
 static int8_t      _init_encoder_cnt = 0;
+#endif  /* CONFIG_GMF_AUDIO_CODEC_INIT_ENCODER */
+#ifdef CONFIG_GMF_AUDIO_CODEC_INIT_DECODER
 static int8_t      _init_decoder_cnt = 0;
+#endif  /* CONFIG_GMF_AUDIO_CODEC_INIT_DECODER */
 
 #if defined(CONFIG_GMF_AUDIO_CODEC_INIT_ENCODER)
 static esp_gmf_err_t gmf_loader_setup_default_enc(esp_gmf_pool_handle_t pool)

packages/gmf_loader/src/gmf_loader_setup_io.c

@@ -6,6 +6,10 @@
  */
 
 #include "esp_gmf_err.h"
+#include "esp_heap_caps.h"
+#if CONFIG_MBEDTLS_CERTIFICATE_BUNDLE
+#include "esp_crt_bundle.h"
+#endif  /* CONFIG_MBEDTLS_CERTIFICATE_BUNDLE */
 #include "esp_gmf_io.h"
 #include "esp_gmf_io_codec_dev.h"
 #include "esp_gmf_io_embed_flash.h"
@@ -42,6 +46,19 @@ static esp_gmf_err_t gmf_loader_setup_default_fs_io(esp_gmf_pool_handle_t pool,
 
     esp_gmf_err_t ret = ESP_GMF_ERR_OK;
     file_io_cfg_t fs_cfg = FILE_IO_CFG_DEFAULT();
+    fs_cfg.cache_caps = MALLOC_CAP_DMA;
+    if (dir == ESP_GMF_IO_DIR_READER) {
+#if CONFIG_GMF_IO_INIT_FILE_READER
+        fs_cfg.cache_size = CONFIG_GMF_IO_FILE_READ_CACHE_SIZE;
+#endif
+    } else {
+#if CONFIG_GMF_IO_INIT_FILE_WRITER
+        fs_cfg.cache_size = CONFIG_GMF_IO_FILE_WRITE_CACHE_SIZE;
+#endif
+    }
+#if SOC_SDMMC_PSRAM_DMA_CAPABLE
+    fs_cfg.cache_caps |= MALLOC_CAP_SPIRAM;
+#endif
     esp_gmf_io_handle_t hd = NULL;
     fs_cfg.dir = dir;
     ret = esp_gmf_io_file_init(&fs_cfg, &hd);
@@ -114,6 +131,12 @@ static esp_gmf_err_t gmf_loader_setup_default_http_io(esp_gmf_pool_handle_t pool
 #endif  /* CONFIG_GMF_IO_INIT_HTTP_WRITER */
     }
 
+#ifdef CONFIG_ESP_TLS_SKIP_SERVER_CERT_VERIFY
+    http_cfg.cert_pem = NULL;
+#elif defined(CONFIG_MBEDTLS_CERTIFICATE_BUNDLE)
+    http_cfg.crt_bundle_attach = esp_crt_bundle_attach;
+#endif
+
     ret = esp_gmf_io_http_init(&http_cfg, &hd);
     ESP_GMF_RET_ON_ERROR(TAG, ret, return ret, "Failed to init http io");
     ret = esp_gmf_pool_register_io(pool, hd, NULL);