Merge branch 'feature/add_element_caps' into 'main'

Add element caps implementation

Closes AUD-5770

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

Author: jason-mao

gmf_core/helpers/include/esp_fourcc.h

@@ -33,17 +33,25 @@
     - Add audio, video and pixel format with fourcc(four character code)
 */
 
+typedef uint32_t esp_fourcc_t;  // 32-bit FOURCC code
+
 #define ESP_FOURCC_TO_INT(a, b, c, d) ((uint32_t)(a) | ((uint32_t)(b) << 8) | ((uint32_t)(c) << 16) | ((uint32_t)(d) << 24))
 
-#define ESP_FOURCC_TO_STR(fourcc)         \
-    (char[])                              \
-    {                                     \
-        (char)((fourcc) & 0xFF),          \
-        (char)(((fourcc) >> 8) & 0xFF),   \
-        (char)(((fourcc) >> 16) & 0xFF),  \
-        (char)(((fourcc) >> 24) & 0xFF),  \
-        '\0'                              \
+// Convert 32-bit FOURCC to string
+static inline void gmf_fourcc_to_str(uint32_t fourcc, char out[5]) {
+    for (int i = 0; i < 4; i++) {
+        out[i] = (char)((fourcc >> (i * 4)) & 0xFF);
     }
+    out[4] = '\0';
+}
+
+// Macro to convert an FOURCC code to a string
+#define ESP_FOURCC_TO_STR(fourcc)  ({ \
+    static char fourcc_str[5]; \
+    fourcc_str[0] = fourcc_str[1] = fourcc_str[2] = fourcc_str[3] = fourcc_str[4] = '\0'; \
+    gmf_fourcc_to_str(fourcc, fourcc_str); \
+    fourcc_str; \
+})
 
 /***************************************************************/
 /*                         Video codec                         */

gmf_core/helpers/include/esp_gmf_caps_def.h

@@ -0,0 +1,91 @@
+/*
+ * Espressif Modified MIT License
+ *
+ * Copyright (c) 2025 Espressif Systems (Shanghai) Co., LTD
+ *
+ * Permission is hereby granted for use **exclusively** with Espressif Systems products.
+ * This includes the right to use, copy, modify, merge, publish, distribute, and sublicense
+ * the Software, subject to the following conditions:
+ *
+ * 1. This Software **must be used in conjunction with Espressif Systems products**.
+ * 2. The above copyright notice and this permission notice shall be included in all copies
+ *    or substantial portions of the Software.
+ * 3. Redistribution of the Software in source or binary form **for use with non-Espressif products**
+ *    is strictly prohibited.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+ * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
+ * FOR ANY CLAIM, DAMAGES, OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * SPDX-License-Identifier: LicenseRef-Espressif-Modified-MIT
+ */
+
+#pragma once
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+
+// Convert string to character code
+static inline uint64_t gmf_str_to_cc(const char *str, int max_len)
+{
+    uint64_t result = 0;
+    if (str && strlen(str) <= max_len) {
+        memcpy(&result, str, strlen(str));
+    }
+    return result;
+}
+
+// Convert 64-bit EIGHTCC to string
+static inline void gmf_eightcc_to_str(uint64_t eightcc, char out[9])
+{
+    for (int i = 0; i < 8; i++) {
+        out[i] = (char)((eightcc >> (i * 8)) & 0xFF);
+    }
+    out[8] = '\0';  // Null-terminate the string
+}
+
+// Macro to convert a string to an 8-byte identifier (EIGHTCC)
+#define STR_2_EIGHTCC(str) gmf_str_to_cc(str, 8)
+
+// Macro to convert a string to an 4-byte identifier (FOURCC)
+#define STR_2_FOURTCC(str) gmf_str_to_cc(str, 4)
+
+// Macro to convert an EIGHTCC code to a string
+#define EIGHTCC_2_STR(eightcc) ({             \
+    static char eightcc_str[9];               \
+    gmf_eightcc_to_str(eightcc, eightcc_str); \
+    eightcc_str;                              \
+})
+
+/***************************************************************************/
+/*                      Definition of Audio Capabilities                   */
+/***************************************************************************/
+#define ESP_GMF_CAPS_AUDIO_DECODER              STR_2_EIGHTCC("AUDDEC")
+#define ESP_GMF_CAPS_AUDIO_ENCODER              STR_2_EIGHTCC("AUDENC")
+#define ESP_GMF_CAPS_AUDIO_ALC                  STR_2_EIGHTCC("AUDALC")
+#define ESP_GMF_CAPS_AUDIO_BIT_CONVERT          STR_2_EIGHTCC("AUDBTCVT")
+#define ESP_GMF_CAPS_AUDIO_CHANNEL_CONVERT      STR_2_EIGHTCC("AUDCHCVT")
+#define ESP_GMF_CAPS_AUDIO_RATE_CONVERT         STR_2_EIGHTCC("AUDRTCVT")
+#define ESP_GMF_CAPS_AUDIO_MIXER                STR_2_EIGHTCC("AUDMIXER")
+#define ESP_GMF_CAPS_AUDIO_EQUALIZER            STR_2_EIGHTCC("AUDEQ")
+#define ESP_GMF_CAPS_AUDIO_SONIC                STR_2_EIGHTCC("AUDSONIC")
+#define ESP_GMF_CAPS_AUDIO_FADE                 STR_2_EIGHTCC("AUDFADE")
+#define ESP_GMF_CAPS_AUDIO_DEINTERLEAVE         STR_2_EIGHTCC("AUDDITLV")
+#define ESP_GMF_CAPS_AUDIO_INTERLEAVE           STR_2_EIGHTCC("AUDINTLV")
+
+
+/***************************************************************************/
+/*                      Definition of Video Capabilities                   */
+/***************************************************************************/
+#define ESP_GMF_CAPS_VIDEO_DECODER              STR_2_EIGHTCC("VIDDEC")
+#define ESP_GMF_CAPS_VIDEO_ENCODER              STR_2_EIGHTCC("VIDENC")
+
+
+#ifdef __cplusplus
+}
+#endif  /* __cplusplus */

gmf_core/include/esp_gmf_cache.h

@@ -22,7 +22,7 @@
  *
  */
 
- #pragma once
+#pragma once
 
 #include <string.h>
 #include "esp_gmf_oal_mem.h"
@@ -188,11 +188,11 @@ static inline esp_gmf_err_t esp_gmf_cache_acquire(esp_gmf_cache_t *handle, uint3
     *load_out = &handle->load;
     ESP_LOGD("GMF_CACHE", "ACQ, filled: %ld, Origin_valid_size: %d", handle->buf_filled, handle->origin_load.valid_size);
 
-    /*
-    *  1. If the original buffer has sufficient data, return its address directly to the user
-    *  2. Copy the remaining data from the original buffer to the cache buffer
-    *  3. If the original buffer does not have enough data for the user, provide the cached buffer address instead
-    */
+    /**
+     *  1. If the original buffer has sufficient data, return its address directly to the user
+     *  2. Copy the remaining data from the original buffer to the cache buffer
+     *  3. If the original buffer does not have enough data for the user, provide the cached buffer address instead
+     */
 
     if (handle->buf_filled == 0) {
         if (handle->origin_load.valid_size >= expected_size) {
@@ -207,8 +207,8 @@ static inline esp_gmf_err_t esp_gmf_cache_acquire(esp_gmf_cache_t *handle, uint3
     }
     if (handle->buf_filled || (handle->origin_load.valid_size < expected_size)) {
         int n = (handle->buf_len - handle->buf_filled) > handle->origin_load.valid_size
-                    ? handle->origin_load.valid_size
-                    : (handle->buf_len - handle->buf_filled);
+            ? handle->origin_load.valid_size
+            : (handle->buf_len - handle->buf_filled);
         memcpy(handle->buf + handle->buf_filled, handle->origin_load.buf, n);
         handle->origin_load.buf += n;
         handle->origin_load.valid_size -= n;
@@ -230,7 +230,7 @@ static inline esp_gmf_err_t esp_gmf_cache_acquire(esp_gmf_cache_t *handle, uint3
 /**
  * @brief  Release the payload data previously acquired with `esp_gmf_cache_acquire`
  *
- * @note   The filled portion of the buffer is cleared only if its size equals the buffer length
+ * @note  The filled portion of the buffer is cleared only if its size equals the buffer length
  *
  * @param[in]  handle  Pointer to the cache handle
  * @param[in]  load    Pointer to the payload data to be released