Merge branch 'feat/mmap_directly' into 'master'

feat: Add flag of COPY_PREBUILT_BIN

Closes AEG-2813

See merge request ae_group/esp-iot-solution!1390

Author: espressif2022

.gitlab/ci/rules.yml

@@ -2218,6 +2218,8 @@
       changes: *patterns-build_system
     - <<: *if-dev-push
       changes: *patterns-components_display_tools_esp_lv_decoder
+    - <<: *if-dev-push
+      changes: *patterns-components_display_tools_esp_mmap_assets
 
 .rules:build:components_display_tools_esp_lv_fs_test_apps:
   rules:

components/display/tools/esp_lv_decoder/test_apps/lvgl9/main/CMakeLists.txt

@@ -32,15 +32,3 @@ spiffs_create_partition_assets(pjpg ../spiffs_assets FLASH_IN_PROJECT
     MMAP_SUPPORT_PJPG
     IMPORT_INC_PATH "${CMAKE_CURRENT_SOURCE_DIR}"
 )
-
-# Ensure headers are generated before compiling this component
-idf_build_get_property(build_components BUILD_COMPONENTS)
-foreach(COMPONENT ${build_components})
-    if(COMPONENT MATCHES "^esp_mmap_assets$" OR COMPONENT MATCHES "^espressif__esp_mmap_assets$")
-        add_dependencies(${COMPONENT_LIB}
-            assets_qoi_bin
-            assets_spng_bin
-            assets_sjpg_bin
-            assets_pjpg_bin)
-    endif()
-endforeach()

components/display/tools/esp_mmap_assets/CHANGELOG.md

@@ -1,5 +1,9 @@
 # ChangeLog
 
+## v1.3.2 (2025-0930)
+* Add function png to pjpg
+* Add flag COPY_PREBUILT_BIN
+
 ## v1.3.1~2 (2025-08-13)
 
 * Support all target.

components/display/tools/esp_mmap_assets/README.md

@@ -55,7 +55,8 @@ set(one_value_args
     MMAP_FILE_SUPPORT_FORMAT,
     MMAP_SPLIT_HEIGHT,
     MMAP_RAW_FILE_FORMAT
-    IMPORT_INC_PATH)
+    IMPORT_INC_PATH
+    COPY_PREBUILT_BIN)
 ```
 
 ### Option Explanations
@@ -65,15 +66,18 @@ set(one_value_args
 - **`FLASH_IN_PROJECT`**: Users can opt to have the image automatically flashed together with the app binaries, partition tables, etc. on `idf.py flash`
 - **`FLASH_APPEND_APP`**: Enables appending binary data (`bin`) to the application binary (`app_bin`).
 - **`IMPORT_INC_PATH`**: Target path for generated include files. Defaults to referencing component location.
+- **`COPY_PREBUILT_BIN`**: Copies pre-generated binary files to target directory. This option allows you to use externally generated asset binaries instead of building them from source files.
 - **`MMAP_FILE_SUPPORT_FORMAT`**: Specifies supported file formats (e.g., `.png`, `.jpg`, `.ttf`).
 - **`MMAP_SPLIT_HEIGHT`**: Defines height for image splitting to reduce memory usage. Depends on:
   - `MMAP_SUPPORT_SJPG`
   - `MMAP_SUPPORT_SPNG`
   - `MMAP_SUPPORT_SQOI`
+  - `MMAP_SUPPORT_PJPG`
 
   ##### General demo
 
     ```c
+    //general usage
     spiffs_create_partition_assets(
         my_spiffs_partition
         my_folder
@@ -82,8 +86,30 @@ set(one_value_args
    )
     ```
 
+    ```c
+    // Animation assets with custom include path
+    spiffs_create_partition_assets(
+        anim_boot
+        "${ASSETS_DIR}/boot"
+        FLASH_IN_PROJECT
+        MMAP_FILE_SUPPORT_FORMAT ".aaf,.eaf"
+        IMPORT_INC_PATH "${ASSETS_DIR}"
+    )
+    ```
+
+    ```c
+    // Pre-built binary assets
+    spiffs_create_partition_assets(
+        anim_icon
+        "${ASSETS_DIR}"
+        FLASH_IN_PROJECT
+        COPY_PREBUILT_BIN "${ASSETS_DIR}/prebuilt.bin"
+    )
+    ```
+
 #### Supported Image Formats
 
+- **`MMAP_SUPPORT_PJPG`**: Enables support for **PJPG** format. Converts PNG to JPG format and uses JPG decoder for PNG files.
 - **`MMAP_SUPPORT_SJPG`**: Enables support for **SJPG** format.
 - **`MMAP_SUPPORT_SPNG`**: Enables support for **SPNG** format.
 - **`MMAP_SUPPORT_QOI`**: Enables support for **QOI** format.

components/display/tools/esp_mmap_assets/config_template.json.in

@@ -19,6 +19,7 @@
     "support_raw_ff": "@arg_MMAP_RAW_FILE_FORMAT@",
     "support_raw_cf": "@arg_MMAP_RAW_COLOR_FORMAT@",
     "app_bin_path": "@app_bin_path@",
-    "pjpg_processor": "@PJPG_PROCESSOR_PATH@"
-    ,"header_asset_name": "@partition@"
+    "pjpg_processor": "@PJPG_PROCESSOR_PATH@",
+    "header_asset_name": "@partition@",
+    "source_bin_path": "@source_bin_path@"
 }

components/display/tools/esp_mmap_assets/esp_mmap_assets.c

@@ -166,25 +166,25 @@ esp_err_t mmap_assets_new(const mmap_assets_config_t *config, mmap_assets_handle
 
     map_asset->stored_files = stored_files;
 
-    item = (mmap_assets_item_t *)malloc(sizeof(mmap_assets_item_t) * config->max_files);
+    item = (mmap_assets_item_t *)malloc(sizeof(mmap_assets_item_t) * stored_files);
     ESP_GOTO_ON_FALSE(item, ESP_ERR_NO_MEM, err, TAG, "no mem for asset item");
 
     if (map_asset->flags.mmap_enable) {
         mmap_assets_table_t *table = (mmap_assets_table_t *)(root + ASSETS_TABLE_OFFSET);
-        for (int i = 0; i < config->max_files; i++) {
+        for (int i = 0; i < stored_files; i++) {
             (item + i)->table = (table + i);
-            (item + i)->asset_mem = (void *)(root + ASSETS_TABLE_OFFSET + config->max_files * sizeof(mmap_assets_table_t) + table[i].asset_offset);
+            (item + i)->asset_mem = (void *)(root + ASSETS_TABLE_OFFSET + stored_files * sizeof(mmap_assets_table_t) + table[i].asset_offset);
         }
     } else {
-        mmap_assets_table_t *table = malloc(sizeof(mmap_assets_table_t) * config->max_files);
-        for (int i = 0; i < config->max_files; i++) {
+        mmap_assets_table_t *table = malloc(sizeof(mmap_assets_table_t) * stored_files);
+        for (int i = 0; i < stored_files; i++) {
             esp_partition_read(partition, ASSETS_TABLE_OFFSET + i * sizeof(mmap_assets_table_t), (table + i), sizeof(mmap_assets_table_t));
             (item + i)->table = (table + i);
-            (item + i)->asset_mem = (char *)(ASSETS_TABLE_OFFSET + config->max_files * sizeof(mmap_assets_table_t) + table[i].asset_offset);
+            (item + i)->asset_mem = (char *)(ASSETS_TABLE_OFFSET + stored_files * sizeof(mmap_assets_table_t) + table[i].asset_offset);
         }
     }
 
-    for (int i = 0; i < config->max_files; i++) {
+    for (int i = 0; i < stored_files; i++) {
         ESP_LOGD(TAG, "[%d], offset:[%" PRIu32 "], size:[%" PRIu32 "], name:%s, %p",
                  i,
                  (item + i)->table->asset_offset,
@@ -207,7 +207,7 @@ esp_err_t mmap_assets_new(const mmap_assets_config_t *config, mmap_assets_handle
 
     map_asset->mmap_handle = mmap_handle;
     map_asset->item = item;
-    map_asset->max_asset = config->max_files;
+    map_asset->max_asset = stored_files;
     *ret_item = (mmap_assets_handle_t)map_asset;
 
     ESP_LOGD(TAG, "new asset handle:@%p", map_asset);

components/display/tools/esp_mmap_assets/idf_component.yml

@@ -1,4 +1,4 @@
-version: 1.3.1~2
+version: 1.3.2
 dependencies:
   cmake_utilities:
     version: 0.*