Merge branch 'feature/update_esp_audio_codec_to_v_2.3.0' into 'master'

esp_audio_codec v2.3.0 and esp_audio_effects v2.1.0 release

See merge request adf/esp-adf-libs!287

Author: jason-mao

esp_audio_codec/CHANGELOG.md

@@ -1,5 +1,26 @@
 # Changelog
 
+## v2.3.0
+
+### Features
+
+- Added support for SBC codec
+- Added support for LC3 codec
+- Added compatibility with `esp_audio_codec` on `ESP32-H4`
+- Added `esp_xxx_enc_get_frame_info_by_cfg` APIs to get frame information by configuration before creating encoder handle
+- Added `esp_xxx_enc_set_bitrate` APIs to set bitrate for encoder
+- Added `esp_audio_dec_check_audio_type`, `esp_audio_enc_check_audio_type`, `esp_audio_simple_check_audio_type` APIs to check whether the audio type is supported by the codec
+- Use `esp_fourcc.h` to define audio codec type
+- Added CO64 atom parsing support for `M4A` format
+- Standardized bitrate units in `AAC` and `Opus` encoder headers
+- Added `ALAC` decoder to the simple decoder module
+- Added `frame_duration` configuration support to `G711` and `PCM` encoders
+
+### Bug Fixes
+- Fixed crash in `AMR-NB` encoder when DTX is enabled
+- Fixed crash in `AAC` encoder when recommended output buffer size is insufficient
+- Fixed `M4A` parsing error when extra boxes are present under the mdat atom
+
 ## v2.2.1
 
 ### Bug Fixes

esp_audio_codec/Kconfig

@@ -63,6 +63,16 @@ menu "Audio Codec Configuration"
             default y
             help
                 Enable this option to register PCM decoder
+        config AUDIO_DECODER_SBC_SUPPORT
+            bool "Support SBC Decoder"
+            default y
+            help
+                Enable this option to register SBC decoder
+        config AUDIO_DECODER_LC3_SUPPORT
+            bool "Support LC3 Decoder"
+            default y
+            help
+                Enable this option to register LC3 decoder
     endmenu
 
     menu "Audio Simple Decoder Configuration"
@@ -131,6 +141,16 @@ menu "Audio Codec Configuration"
             default y
             help
                 Enable this option to register PCM encoder
+        config AUDIO_ENCODER_SBC_SUPPORT
+            bool "Support SBC Encoder"
+            default y
+            help
+                Enable this option to register SBC encoder
+        config AUDIO_ENCODER_LC3_SUPPORT
+            bool "Support LC3 Encoder"
+            default y
+            help
+                Enable this option to register LC3 encoder
     endmenu
 
  endmenu

esp_audio_codec/LICENSE

@@ -1,20 +1,22 @@
- ESPRESSIF MIT License
+Espressif Modified MIT License
 
- Copyright (c) 2024 <ESPRESSIF SYSTEMS (SHANGHAI) CO.，LTD>
+Copyright (c) 2025 Espressif Systems (Shanghai) CO., LTD
 
- Permission is hereby granted for use on all ESPRESSIF SYSTEMS products, in which case,
- it is free of charge, to any person obtaining a copy of this software and associated
- documentation files (the "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the Software is furnished
- to do so, subject to the following conditions:
+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:
 
- The above copyright notice and this permission notice shall be included in all copies or
- substantial portions of the Software.
+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.
+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

esp_audio_codec/README.md

@@ -38,6 +38,8 @@ The ESP Audio Codec supports the following features:
   - PCM
   - ALAC
   - OPUS
+  - LC3
+  - SBC
 * Supports operate all encoder through common API see [esp_audio_enc.h](include/encoder/esp_audio_enc.h)
 * Supports customized encoder through `esp_audio_enc_register` or overwrite default encoder
 * Supports register all supported encoder through `esp_audio_enc_register_default` and manager it by menuconfig
@@ -88,7 +90,25 @@ Details for the supported encoders are as follow:
 - Encoding sample rates (Hz): 8000, 12000, 16000, 24000, 48000    
 - Encoding channel num: mono, dual    
 - Encoding bits per sample: 16 bits  
-  
+
+**SBC**    
+- Encoding sample rates (Hz): 16000, 32000, 44100, 48000    
+- Encoding channel mode: mono, dual, stereo, joint stereo 
+- Encoding bits per sample: 16 bits  
+- Encoding sbc mode: standard, msbc
+- Encoding block length: 4, 8, 12, 16 
+- Encoding subbands number: 4, 8
+- Encoding allocation method: loudness, SNR
+- Encoding bitpool range: 2 to 250
+
+**LC3**    
+- Encoding sample rates (Hz): 8000, 16000, 24000, 32000, 44100, 48000    
+- Encoding full range of channel
+- Encoding bits per sample: 16, 24, 32 bits  
+- Encoding frame decimilliseconds: 75, 100 dms
+- Encoding nbyte range: 20 to 400
+- Support 2-byte length prefix before each encoded frame
+
 ## Decoder   
 
 * Following decoders are supported:
@@ -154,7 +174,23 @@ Details for the supported decoders are as follow:
 - Decoding bits per sample: 16 bits
 - Supports decode VORBIS frame only, need remove OGG header
 - User need provide common header information firstly
-  
+
+**SBC**    
+- Decoding sample rates (Hz): 16000, 32000, 44100, 48000    
+- Decoding channel: mono, dual 
+- Decoding bits per sample: 16 bits  
+- Decoding sbc mode: standard, msbc
+- Packet Loss Concealment (PLC)
+
+**LC3**    
+- Decoding sample rates (Hz): 8000, 16000, 24000, 32000, 44100, 48000    
+- Decoding full range of channel
+- Decoding bits per sample: 16, 24, 32 bits  
+- Decoding frame decimilliseconds: 75, 100 dms
+- Decoding nbyte range: 20 to 400
+- Support decoding of 2-byte length-prefixed frame data
+- Packet Loss Concealment (PLC)
+
 ## Simple Decoder   
 
 * Supports audio frame finding and decoding
@@ -167,14 +203,17 @@ Details for the supported audio containers are as follow:
 | Audio Container| Notes                                                       |
 |       --       |  --                                                         |
 |       AAC      | Supports AAC-Plus controlled by configuration               |
-|       MP3      | Supports layer 3 only                                       |
+|       MP3      | Supports layer 1, 2, 3                                      |
 |       AMRNB    | Supports files with AMRNB file header only                  |
 |       AMRWB    | Supports files with AMRWB file header only                  |
 |       FLAC     | Supports files with FLAC file header only                   |
 |       ADPCM    | Supports IMA-ADPCM only                                     |
 |       WAV      | Supports G711A, G711U, PCM, ADPCM                           |
 |       M4A      | Supports MP3, AAC, ALAC <br> Supports MDAT after MOOV only  |
 |       TS       | Supports MP3, AAC                                           |
+|       G711     | Supports G711A, G711U                                       |
+|       SBC      | Supports SBC and MSBC                                       |
+|       LC3      | Supports LC3                                                |
 
 # Performance
 
@@ -197,7 +236,9 @@ To get performance under other sample rate, channel or complexity, please change
 | AMR-WB        | 16000            | 1       | 5.6         | 37.69           |
 | ADPCM         | 48000            | 2       | 0.01        | 2.69            |
 | OPUS          | 48000            | 2       | 29.4        | 24.9            |
-  
+| SBC           | 48000            | 2       | 1.85        | 9.55            |
+| LC3           | 48000            | 2       | 3.67        | 46.57           |
+
 **Notes:**   
 Encoder cpu usage is highly dependent on certain encoding settings (like bitrate or complexity)  
  1) For AAC encoder, tested under bitrate 90kbps
@@ -217,6 +258,8 @@ Encoder cpu usage is highly dependent on certain encoding settings (like bitrate
 | OPUS          | 48000            | 2       | 26.6        | 5.86            |
 | MP3           | 44100            | 2       | 28          | 8.17            |
 | FLAC          | 44100            | 2       | 89.4        | 8.0             |
+| SBC           | 48000            | 2       | 0.21        | 8.14            |
+| LC3           | 48000            | 2       | 1.36        | 17.5            |
 
 **Notes:** 
  1) MP3 and FLAC decoders are tested with real audio data. All other codes are tested with encoded data from sin wav PCM. 
@@ -235,6 +278,8 @@ The following table shows the support of ESP_AUDIO_CODEC for Espressif SoCs. The
 |ESP32-C6     |       &#10004;     |
 |ESP32-S3     |       &#10004;     |
 |ESP32-P4     |       &#10004;     |
+|ESP32-C4     |       &#10004;     |
+|ESP32-H4     |       &#10004;     |
 
 # Usage
 

esp_audio_codec/idf_component.yml

@@ -5,4 +5,4 @@ description: Espressif audio encoder and decoder
 issues: https://github.com/espressif/esp-adf/issues
 repository: https://github.com/espressif/esp-adf-libs.git
 url: https://github.com/espressif/esp-adf-libs/tree/master/esp_audio_codec
-version: 2.2.1
+version: 2.3.0

esp_audio_codec/include/decoder/esp_audio_dec.h

@@ -1,25 +1,26 @@
-/**
- * ESPRESSIF MIT License
+/*
+ * Espressif Modified MIT License
  *
- * Copyright (c) 2024 <ESPRESSIF SYSTEMS (SHANGHAI) CO., LTD>
+ * Copyright (c) 2025 Espressif Systems (Shanghai) CO., LTD
  *
- * Permission is hereby granted for use on all ESPRESSIF SYSTEMS products, in which case,
- * it is free of charge, to any person obtaining a copy of this software and associated
- * documentation files (the "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the Software is furnished
- * to do so, subject to the following conditions:
+ * 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:
  *
- * The above copyright notice and this permission notice shall be included in all copies or
- * substantial portions of the Software.
+ * 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.
+ * 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
@@ -33,6 +34,14 @@
 extern "C" {
 #endif
 
+/**
+ * @brief  Recovery strategy for tht current frame
+ */
+typedef enum {
+    ESP_AUDIO_DEC_RECOVERY_NONE = 0, /*!< The current frame is a normal decoded frame */
+    ESP_AUDIO_DEC_RECOVERY_PLC  = 1, /*!< The current frame is recovered through the packet loss concealment (PLC) mechanism */
+} esp_audio_dec_recovery_t;
+
 /**
  * @brief  Audio decoder input frame
  *
@@ -55,9 +64,10 @@ extern "C" {
  *
  */
 typedef struct {
-    uint8_t *buffer;   /*!< Input encoded data buffer */
-    uint32_t len;      /*!< Input data size to be decoded */
-    uint32_t consumed; /*!< Consumed input data size (output) */
+    uint8_t                 *buffer;        /*!< Input encoded data buffer */
+    uint32_t                 len;           /*!< Input data size to be decoded */
+    uint32_t                 consumed;      /*!< Consumed input data size (output) */
+    esp_audio_dec_recovery_t frame_recover; /*!< Recovery strategy for current frame */
 } esp_audio_dec_in_raw_t;
 
 /**

esp_audio_codec/include/decoder/esp_audio_dec_default.h

@@ -1,25 +1,26 @@
-/**
- * ESPRESSIF MIT License
+/*
+ * Espressif Modified MIT License
  *
- * Copyright (c) 2024 <ESPRESSIF SYSTEMS (SHANGHAI) CO., LTD>
+ * Copyright (c) 2025 Espressif Systems (Shanghai) CO., LTD
  *
- * Permission is hereby granted for use on all ESPRESSIF SYSTEMS products, in which case,
- * it is free of charge, to any person obtaining a copy of this software and associated
- * documentation files (the "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the Software is furnished
- * to do so, subject to the following conditions:
+ * 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:
  *
- * The above copyright notice and this permission notice shall be included in all copies or
- * substantial portions of the Software.
+ * 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.
+ * 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
@@ -36,6 +37,8 @@
 #include "esp_opus_dec.h"
 #include "esp_vorbis_dec.h"
 #include "esp_pcm_dec.h"
+#include "esp_sbc_dec.h"
+#include "esp_lc3_dec.h"
 
 #ifdef __cplusplus
 extern "C" {