prepare for libmad decoder

Author: schreibfaul1

src/Audio.cpp

@@ -3,7 +3,7 @@
     audio.cpp
 
     Created on: Oct 28.2018                                                                                                  */char audioI2SVers[] ="\
-    Version 3.3.2p                                                                                                                                ";
+    Version 3.3.2q                                                                                                                                ";
 /*  Updated on: Jul 11.2025
 
     Author: Wolle (schreibfaul1)
@@ -44,7 +44,8 @@ void AUDIO_INFO(const char* fmt, Args&&... args) {
     char* dst = result.get();
     if (!dst) return;  // Or error treatment
     std::snprintf(dst, len + 1, fmt, std::forward<Args>(args)...);
-    if(audio_info) audio_info(result.get());
+    result.append(ANSI_ESC_RESET);
+    if(audio_info) audio_info(result.c_get());
     result.reset();
 }
 
@@ -4588,7 +4589,7 @@ void Audio::setDecoderItems() {
         setSampleRate(MP3GetSampRate());
         setBitsPerSample(MP3GetBitsPerSample());
         setBitrate(MP3GetBitrate());
-        AUDIO_INFO("MPEG-%s, Layer %s",(MP3GetVersion()==0) ? "2.5" : (MP3GetVersion()==2) ? "2" : "1", (MP3GetLayer()==1) ? "III" : (MP3GetLayer()==2) ? "II" : "I");
+        AUDIO_INFO("%s %s", MP3GetMPEGVersion(), MP3GetLayer());
     }
     if(m_codec == CODEC_AAC || m_codec == CODEC_M4A) {
         setChannels(AACGetChannels());

src/mp3_decoder/mp3_decoder.cpp

@@ -1550,8 +1550,16 @@ int32_t MP3GetChannels(){return m_MP3FrameInfo->nChans;}
 int32_t MP3GetBitsPerSample(){return m_MP3FrameInfo->bitsPerSample;}
 int32_t MP3GetBitrate(){return m_MP3FrameInfo->bitrate;}
 int32_t MP3GetOutputSamps(){return m_MP3FrameInfo->outputSamps;}
-int32_t MP3GetLayer(){return m_MP3FrameInfo->layer;}     // 0: Reserviert, 1: Layer III, 2: Layer II, 3: Layer I
-int32_t MP3GetVersion(){return m_MP3FrameInfo->version;} // 0: MPEG-2.5, 1: Reserviert, 2: MPEG-2 (ISO/IEC 13818-3), 3: MPEG-1 (ISO/IEC 11172-3)
+
+const char* MP3GetLayer(){
+    const char* layer_str = layer_table[m_MP3FrameInfo->layer];  // 0: Reserviert, 1: Layer III, 2: Layer II, 3: Layer I
+    return layer_str;
+}
+
+const char* MP3GetMPEGVersion(){
+    const char* mpeg_version_str = mpeg_version_table[m_MP3FrameInfo->version]; // 0: MPEG-2.5, 1: Reserviert, 2: MPEG-2 (ISO/IEC 13818-3), 3: MPEG-1 (ISO/IEC 11172-3)
+    return mpeg_version_str;
+}
 /***********************************************************************************************************************
  * Function:    MP3GetNextFrameInfo
  *
@@ -4264,3 +4272,4 @@ int MP3_AnalyzeFrame(const uint8_t *frame_data, size_t frame_len) {
 
     return main_data_begin_val;
 }
+

src/mp3_decoder/mp3_decoder.h

@@ -22,20 +22,6 @@ enum {
     MP3_NONE =                      0,
     MP3_ERR =                      -1,
     MP3_STOP =                     -100,
-    // ERR_MP3_INDATA_UNDERFLOW =     -1,
-    // ERR_MP3_MAINDATA_UNDERFLOW =   -2,
-    // ERR_MP3_FREE_BITRATE_SYNC =    -3,
-    // ERR_MP3_OUT_OF_MEMORY =        -4,
-    // ERR_MP3_NULL_POINTER =         -5,
-    // ERR_MP3_INVALID_FRAMEHEADER =  -6,
-    // ERR_MP3_INVALID_SIDEINFO =     -7,
-    // ERR_MP3_INVALID_SCALEFACT =    -8,
-    // ERR_MP3_INVALID_HUFFCODES =    -9,
-    // ERR_MP3_INVALID_DEQUANTIZE =   -10,
-    // ERR_MP3_INVALID_IMDCT =        -11,
-    // ERR_MP3_INVALID_SUBBAND =      -12,
-
-    // ERR_UNKNOWN =                  -9999
 };
 
 typedef struct MP3FrameInfo {
@@ -479,6 +465,20 @@ const uint32_t csa[8][2] PROGMEM = {
  *   see PolyphaseStereo() and PolyphaseMono()
  */
 
+static const char* mpeg_version_table[] = {
+    "MPEG-2.5",  // 0
+    "reserved",  // 1
+    "MPEG-2",    // 2
+    "MPEG-1"     // 3
+};
+
+static const char* layer_table[] = {
+    "Unknown",   // 0
+    "Layer I",   // 1
+    "Layer II",  // 2
+    "Layer III"  // 3
+};
+
 // prototypes
 bool     MP3Decoder_AllocateBuffers(void);
 bool     MP3Decoder_IsInit();
@@ -492,8 +492,8 @@ int32_t  MP3GetChannels();
 int32_t  MP3GetBitsPerSample();
 int32_t  MP3GetBitrate();
 int32_t  MP3GetOutputSamps();
-int32_t  MP3GetLayer();
-int32_t  MP3GetVersion();
+const char* MP3GetLayer();
+const char* MP3GetMPEGVersion();
 
 //internally used
 int  MP3_AnalyzeFrame(const uint8_t *frame_data, size_t frame_len);