corr, getInBufferSize(), setInBufferSize()

Author: schreibfaul1

src/Audio.cpp

@@ -102,17 +102,20 @@ AudioBuffer::~AudioBuffer() {
 
 int32_t AudioBuffer::getBufsize() { return m_buffSize; }
 
-void AudioBuffer::setBufsize(size_t mbs) {
-    if(mbs < 2 * m_resBuffSize) AUDIO_ERROR("not allowed buffer size must be greater than %i", 2 * m_resBuffSize);
+bool AudioBuffer::setBufsize(size_t mbs) {
+    if(mbs < 2 * m_resBuffSize) {
+        AUDIO_ERROR("not allowed buffer size must be greater than %i", 2 * m_resBuffSize);
+        return false;
+    }
     m_buffSize = mbs;
-    return;
+    if(!init()) return false;
+    return true;
 }
 
 size_t AudioBuffer::init() {
     if(m_buffer) free(m_buffer);
     m_buffer = NULL;
-    m_buffer = (uint8_t*)ps_calloc(m_buffSize, sizeof(uint8_t));
-    m_buffSize = m_buffSize - m_resBuffSize;
+    m_buffer = (uint8_t*)ps_malloc(m_buffSize + m_resBuffSize);
 
     if(!m_buffer) return 0;
     m_f_init = true;
@@ -288,7 +291,7 @@ void Audio::initInBuff() {
             AUDIO_INFO("inputBufferSize: %u bytes", size - 1);
         }
     }
-    changeMaxBlockSize(1600); // default size mp3 or aac
+    InBuff.changeMaxBlockSize(1600); // default size mp3 or aac
 }
 
 //------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -5262,11 +5265,20 @@ uint32_t Audio::inBufferFree() {
     return InBuff.freeSpace();
 }
 //------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-uint32_t Audio::inBufferSize() {
+uint32_t Audio::getInBufferSize() {
     // current audio input buffer size in bytes
     return InBuff.getBufsize();
 }
 //------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+bool Audio::setInBufferSize(size_t mbs){
+    size_t oldBuffSize = InBuff.getBufsize();
+    stopSong();
+    bool res = InBuff.setBufsize(mbs);
+    if(res == false) InBuff.setBufsize(oldBuffSize);
+    InBuff.init();
+    return res;
+}
+//------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 //            ***     D i g i t a l   b i q u a d r a t i c     f i l t e r     ***
 //------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 void Audio::IIR_calculateCoefficients(int8_t G0, int8_t G1, int8_t G2) { // Infinite Impulse Response (IIR) filters

src/Audio.h

@@ -84,7 +84,7 @@ class AudioBuffer {
     size_t   init();                            // set default values
     bool     isInitialized() { return m_f_init; };
     int32_t  getBufsize();
-    void     setBufsize(size_t mbs);            // default is m_buffSizePSRAM for psram, and m_buffSizeRAM without psram
+    bool     setBufsize(size_t mbs);            // default is m_buffSizePSRAM for psram, and m_buffSizeRAM without psram
     void     changeMaxBlockSize(uint16_t mbs);  // is default 1600 for mp3 and aac, set 16384 for FLAC
     uint16_t getMaxBlockSize();                 // returns maxBlockSize
     size_t   freeSpace();                       // number of free bytes to overwrite
@@ -120,7 +120,7 @@ static StaticTask_t __attribute__((unused)) xAudioTaskBuffer;
 static StackType_t  __attribute__((unused)) xAudioStack[AUDIO_STACK_SIZE];
 extern char audioI2SVers[];
 
-class Audio : private AudioBuffer{
+class Audio{
 
     AudioBuffer InBuff; // instance of input buffer
 
@@ -399,17 +399,17 @@ class Audio : private AudioBuffer{
     uint32_t getTotalPlayingTime();
     uint16_t getVUlevel();
 
-    uint32_t inBufferFilled(); // returns the number of stored bytes in the inputbuffer
-    uint32_t inBufferFree();   // returns the number of free bytes in the inputbuffer
-    uint32_t inBufferSize();   // returns the size of the inputbuffer in bytes
-    void setBufsize(size_t mbs); // sets the size of the inputbuffer in bytes
-    void setTone(int8_t gainLowPass, int8_t gainBandPass, int8_t gainHighPass);
-    void setI2SCommFMT_LSB(bool commFMT);
-    int getCodec() {return m_codec;}
-    const char *getCodecname() {return codecname[m_codec];}
-    const char *getVersion() {return audioI2SVers;}
+    uint32_t    inBufferFilled();            // returns the number of stored bytes in the inputbuffer
+    uint32_t    inBufferFree();              // returns the number of free bytes in the inputbuffer
+    uint32_t    getInBufferSize();           // returns the size of the inputbuffer in bytes
+    bool        setInBufferSize(size_t mbs); // sets the size of the inputbuffer in bytes
+    void        setTone(int8_t gainLowPass, int8_t gainBandPass, int8_t gainHighPass);
+    void        setI2SCommFMT_LSB(bool commFMT);
+    int         getCodec() { return m_codec; }
+    const char* getCodecname() { return codecname[m_codec]; }
+    const char* getVersion() { return audioI2SVers; }
 
-private:
+  private:
     // ------- PRIVATE MEMBERS ----------------------------------------
 
     void            latinToUTF8(ps_ptr<char>& buff, bool UTF8check = true);