Merge branch 'feature/add_more_dec_in_simple_decoder' into 'master'

add_more_dec_in_simple_decoder

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

Author: jason-mao

esp_audio_codec/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## v2.2.0
+
+### Features
+
+- Support g711a, g711u, pcm, adpcm decoder in audio simple decoder
+- Add pcm decoder in esp_audio_codec
+
+### Bug Fixes
+
+- Fix a bug that dtx is not effect in opus encoder
+- Complete error log in esp_audio_codec
+
 ## v2.1.0
 
 ### Features

esp_audio_codec/Kconfig

@@ -58,6 +58,11 @@ menu "Audio Codec Configuration"
             default y
             help
                 Enable this option to register ALAC decoder
+        config AUDIO_DECODER_PCM_SUPPORT
+            bool "Support PCM Decoder"
+            default y
+            help
+                Enable this option to register PCM decoder
     endmenu
 
     menu "Audio Simple Decoder Configuration"

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.1.0
+version: 2.2.0

esp_audio_codec/include/decoder/esp_audio_dec.h

@@ -56,8 +56,8 @@ extern "C" {
  */
 typedef struct {
     uint8_t *buffer;   /*!< Input encoded data buffer */
-    uint32_t len;      /*!< Input encoded data size */
-    uint32_t consumed; /*!< Input data consumed size */
+    uint32_t len;      /*!< Input data size to be decoded */
+    uint32_t consumed; /*!< Consumed input data size (output) */
 } esp_audio_dec_in_raw_t;
 
 /**

esp_audio_codec/include/decoder/esp_audio_dec_default.h

@@ -35,6 +35,7 @@
 #include "esp_mp3_dec.h"
 #include "esp_opus_dec.h"
 #include "esp_vorbis_dec.h"
+#include "esp_pcm_dec.h"
 
 #ifdef __cplusplus
 extern "C" {

esp_audio_codec/include/decoder/impl/esp_pcm_dec.h

@@ -0,0 +1,110 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * 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:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or
+ * substantial portions of 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.
+ *
+ */
+
+#pragma once
+
+#include "esp_audio_dec.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @brief  Configuration for PCM decoder
+ *
+ */
+typedef struct {
+    int32_t sample_rate;     /*!< The sample rate of audio */
+    uint8_t channel;         /*!< The channel num of audio */
+    uint8_t bits_per_sample; /*!< The bits per sample of audio */
+} esp_pcm_dec_cfg_t;
+
+/**
+ * @brief  Default decoder operations for PCM
+ */
+#define ESP_PCM_DEC_DEFAULT_OPS() { \
+    .open = esp_pcm_dec_open,       \
+    .decode = esp_pcm_dec_decode,   \
+    .close = esp_pcm_dec_close,     \
+}
+
+/**
+ * @brief  Register PCM decoder library
+ *
+ * @note  If user want to use decoder through decoder common API, need register it firstly.
+ *        Register can use either of following methods:
+ *          1: Manually call `esp_pcm_dec_register`.
+ *          2: Call `esp_audio_dec_register_default` and use menuconfig to enable it.
+ *        When user want to use PCM decoder only and not manage it by common part, no need to call this API,
+ *        And call `esp_pcm_dec_open`, `esp_pcm_dec_decode`, `esp_pcm_dec_close` instead.
+ *
+ * @return
+ *       - ESP_AUDIO_ERR_OK        On success
+ *       - ESP_AUDIO_ERR_MEM_LACK  Fail to allocate memory
+ */
+esp_audio_err_t esp_pcm_dec_register(void);
+
+/**
+ * @brief  Open PCM decoder
+ *
+ * @param[in]   cfg         Pointer to `esp_pcm_dec_cfg_t`
+ * @param[in]   cfg_sz      Set to sizeof(esp_pcm_dec_cfg_t)
+ * @param[out]  dec_handle  The PCM decoder handle
+ *
+ * @return
+ *       - ESP_AUDIO_ERR_OK                 On success
+ *       - ESP_AUDIO_ERR_MEM_LACK           Fail to allocate memory
+ *       - ESP_AUDIO_ERR_INVALID_PARAMETER  Invalid parameter
+ */
+esp_audio_err_t esp_pcm_dec_open(void *cfg, uint32_t cfg_sz, void **dec_handle);
+
+/**
+ * @brief  Decode raw data for PCM
+ *
+ * @param[in]      dec_handle  Decoder handle
+ * @param[in,out]  raw         Raw data to be decoded
+ * @param[in,out]  frame       Decoded PCM frame data
+ * @param[out]     dec_info    Information of decoder
+ *
+ * @return
+ *       - ESP_AUDIO_ERR_OK                 On success
+ *       - ESP_AUDIO_ERR_INVALID_PARAMETER  Invalid parameter
+ *       - ESP_AUDIO_ERR_BUFF_NOT_ENOUGH    No enough frame buffer to hold output PCM frame data
+ */
+esp_audio_err_t esp_pcm_dec_decode(void *dec_handle, esp_audio_dec_in_raw_t *raw, esp_audio_dec_out_frame_t *frame,
+                                   esp_audio_dec_info_t *dec_info);
+
+/**
+ * @brief  Close decoder for PCM
+ *
+ * @param[in]  dec_handle  Decoder handle
+ *
+ * @return
+ *       - ESP_AUDIO_ERR_OK  On success
+ */
+esp_audio_err_t esp_pcm_dec_close(void *dec_handle);
+
+#ifdef __cplusplus
+}
+#endif

esp_audio_codec/include/encoder/impl/esp_opus_enc.h

@@ -71,21 +71,24 @@ typedef struct {
     int                           bits_per_sample;    /*!< The bits per sample of OPUS audio.
                                                            This must be 16 */
     int                           bitrate;            /*!< Suggest bitrate(Kbps) range on mono stream :
-                                                           | frame_duration(ms)|    2.5    |     5     |    10    |    20    |    40    |    60    | 
-                                                           |   samplerate(Hz)  |           |           |          |          |          |          |
-                                                           |       8000        | 50 - 128  | 40 - 128  | 20 - 128 | 20 - 128 | 20 - 128 | 20 - 128 |
-                                                           |       12000       | 60 - 192  | 50 - 192  | 30 - 192 | 20 - 192 | 20 - 192 | 20 - 192 |
-                                                           |       16000       | 70 - 256  | 60 - 256  | 50 - 256 | 20 - 256 | 20 - 256 | 20 - 256 |
-                                                           |       24000       | 70 - 384  | 60 - 384  | 60 - 384 | 60 - 384 | 50 - 384 | 60 - 384 |
-                                                           |       48000       | 80 - 510  | 80 - 510  | 80 - 510 | 70 - 510 | 70 - 510 | 70 - 510 |
+                                                           | frame_duration(ms)|    2.5    |     5     |    10    |    20    |    40    |    60    |    80    |   100    |   120    | 
+                                                           |   samplerate(Hz)  |           |           |          |          |          |          |          |          |          |
+                                                           |       8000        | 30 - 128  | 20 - 128  |  6 - 128 |  6 - 128 |  6 - 128 |  6 - 128 |  6 - 128 |  6 - 128 |  6 - 128 |
+                                                           |       12000       | 30 - 192  | 20 - 192  |  6 - 192 |  6 - 192 |  6 - 192 |  6 - 192 |  6 - 192 |  6 - 192 |  6 - 192 |
+                                                           |       16000       | 30 - 256  | 20 - 256  |  6 - 256 |  6 - 256 |  6 - 256 |  6 - 256 |  6 - 256 |  6 - 256 |  6 - 256 |
+                                                           |       24000       | 50 - 384  | 40 - 384  | 40 - 384 | 40 - 384 | 40 - 384 | 40 - 384 | 40 - 384 | 40 - 384 | 40 - 384 |
+                                                           |       48000       | 40 - 510  | 30 - 510  | 30 - 510 | 30 - 510 | 30 - 510 | 30 - 510 | 30 - 510 | 30 - 510 | 30 - 510 |
                                                            Note : 1) This table shows the bitrate range corresponding to each samplerate and frame duration.
                                                                   2) The bitrate range of dual stream is the same that of mono. */
     esp_opus_enc_frame_duration_t frame_duration;     /*!< The duration of one frame.
                                                            This must be 2.5, 5, 10, 20, 40, 60, 80, 100, 120 ms. */
     esp_opus_enc_application_t    application_mode;   /*!< The application mode. */
     int                           complexity;         /*!< Indicates the complexity of OPUS encoding. 0 is lowest. 10 is higest.*/
     bool                          enable_fec;         /*!< Configures the encoder's use of inband forward error correction (FEC) */
-    bool                          enable_dtx;         /*!< Configures the encoder's use of discontinuous transmission (DTX) */
+    bool                          enable_dtx;         /*!< Configures the encoder's use of discontinuous transmission (DTX).
+                                                           DTX activation condition: 1) The sample_rate must be 8000, 12000 or 16000Hz
+                                                                                     2) The application_mode must set to `ESP_OPUS_ENC_APPLICATION_VOIP`
+                                                                                     3) The frame_duration must gather than 5ms */
     bool                          enable_vbr;         /*!< Configures to enable or disable variable bitrate mode */
 } esp_opus_enc_config_t;
 

esp_audio_codec/include/simple_dec/esp_audio_simple_dec.h

@@ -57,6 +57,10 @@ typedef enum {
     ESP_AUDIO_SIMPLE_DEC_TYPE_M4A      = 7,    /*!< Simple decoder for M4A */
     ESP_AUDIO_SIMPLE_DEC_TYPE_TS       = 8,    /*!< Simple decoder for TS */
     ESP_AUDIO_SIMPLE_DEC_TYPE_RAW_OPUS = 9,    /*!< Simple decoder for OPUS (raw data with no extra header) */
+    ESP_AUDIO_SIMPLE_DEC_TYPE_G711A    = 10,   /*!< Simple decoder for G711A */
+    ESP_AUDIO_SIMPLE_DEC_TYPE_G711U    = 11,   /*!< Simple decoder for G711U */
+    ESP_AUDIO_SIMPLE_DEC_TYPE_PCM      = 12,   /*!< Simple decoder for PCM */
+    ESP_AUDIO_SIMPLE_DEC_TYPE_ADPCM    = 13,   /*!< Simple decoder for IMA-ADPCM */
     ESP_AUDIO_SIMPLE_DEC_TYPE_CUSTOM   = 0x10, /*!< Customized simple decoder type start */
 } esp_audio_simple_dec_type_t;