Merge 4d76f39878 into b837e7d36a

src/AudioGeneratorMP3.cpp

@@ -1,7 +1,7 @@
 /*
   AudioGeneratorMP3
   Wrap libmad MP3 library to play audio
-  
+
   Copyright (C) 2017  Earle F. Philhower, III
 
   This program is free software: you can redistribute it and/or modify
@@ -62,7 +62,7 @@ AudioGeneratorMP3::~AudioGeneratorMP3()
     free(synth);
     free(frame);
     free(stream);
-  } 
+  }
 }
 
 
@@ -182,7 +182,7 @@ bool AudioGeneratorMP3::GetOneSample(int16_t sample[2])
     output->SetChannels(synth->pcm.channels);
     lastChannels = synth->pcm.channels;
   }
-    
+
   // If we're here, we have one decoded frame and sent 0 or more samples out
   if (samplePtr < synth->pcm.length) {
     sample[AudioOutput::LEFTCHANNEL ] = synth->pcm.samples[0][samplePtr];
@@ -190,7 +190,7 @@ bool AudioGeneratorMP3::GetOneSample(int16_t sample[2])
     samplePtr++;
   } else {
     samplePtr = 0;
-    
+
     switch ( mad_synth_frame_onens(synth, frame, nsCount++) ) {
         case MAD_FLOW_STOP:
         case MAD_FLOW_BREAK: audioLogger->printf_P(PSTR("msf1ns failed\n"));
@@ -302,6 +302,7 @@ bool AudioGeneratorMP3::begin(AudioFileSource *source, AudioOutput *output)
       synth = reinterpret_cast<struct mad_synth *>(preallocateSynthSpace);
     }
     else {
+      output->stop();
       audioLogger->printf_P("OOM error in MP3:  Want %d/%d/%d/%d bytes, have %d/%d/%d/%d bytes preallocated.\n",
           preAllocBuffSize(), preAllocStreamSize(), preAllocFrameSize(), preAllocSynthSize(),
           preallocateSize, preallocateStreamSize, preallocateFrameSize, preallocateSynthSize);
@@ -319,6 +320,7 @@ bool AudioGeneratorMP3::begin(AudioFileSource *source, AudioOutput *output)
     p += preAllocSynthSize();
     int neededBytes = p - reinterpret_cast<uint8_t *>(preallocateSpace);
     if (neededBytes > preallocateSize) {
+      output->stop();
       audioLogger->printf_P("OOM error in MP3:  Want %d bytes, have %d bytes preallocated.\n", neededBytes, preallocateSize);
       return false;
     }
@@ -336,17 +338,20 @@ bool AudioGeneratorMP3::begin(AudioFileSource *source, AudioOutput *output)
       stream = NULL;
       frame = NULL;
       synth = NULL;
+
+      output->stop();
+      audioLogger->printf_P("OOM error in MP3\n");
       return false;
     }
   }
- 
+
   mad_stream_init(stream);
   mad_frame_init(frame);
   mad_synth_init(synth);
   synth->pcm.length = 0;
   mad_stream_options(stream, 0); // TODO - add options support
   madInitted = true;
- 
+
   running = true;
   return true;
 }
@@ -413,4 +418,3 @@ extern "C" {
   }
 #endif
 }
-

src/AudioGeneratorRTTTL.cpp

@@ -236,13 +236,13 @@ bool AudioGeneratorRTTTL::GetNextNote()
     ptr++;
     note++;
   }
+  if (!ReadInt(&scale)) {
+    scale = defaultOctave;
+  }
   if ((ptr < len) && (buff[ptr] == '.')) {
     ptr++;
     dur += dur / 2;
   }
-  if (!ReadInt(&scale)) {
-    scale = defaultOctave;
-  }
   // Eat any trailing whitespace and comma
   SkipWhitespace();
   if ((ptr < len) && (buff[ptr]==',')) {

src/AudioOutputI2S.cpp

@@ -33,6 +33,7 @@ AudioOutputI2S::AudioOutputI2S(int port, int output_mode, int dma_buf_count, int
 {
   this->portNo = port;
   this->i2sOn = false;
+  this->i2sRateSet = false;
   this->dma_buf_count = dma_buf_count;
   if (output_mode != EXTERNAL_I2S && output_mode != INTERNAL_DAC && output_mode != INTERNAL_PDM) {
     output_mode = EXTERNAL_I2S;
@@ -56,6 +57,7 @@ AudioOutputI2S::AudioOutputI2S(int port, int output_mode, int dma_buf_count, int
 #elif defined(ARDUINO_ARCH_RP2040)
 AudioOutputI2S::AudioOutputI2S(long sampleRate, pin_size_t sck, pin_size_t data) {
     i2sOn = false;
+    i2sRateSet = false;
     mono = false;
     bps = 16;
     channels = 2;
@@ -129,7 +131,13 @@ bool AudioOutputI2S::SetPinout(int bclk, int wclk, int dout, int mclk)
 bool AudioOutputI2S::SetRate(int hz)
 {
   // TODO - have a list of allowable rates from constructor, check them
+
+  if(this->hertz == hz && this->i2sRateSet){ // hz already set to this
+    return true;
+  }
+
   this->hertz = hz;
+
   if (i2sOn)
   {
   #ifdef ESP32
@@ -140,6 +148,10 @@ bool AudioOutputI2S::SetRate(int hz)
       i2s.setFrequency(hz);
   #endif
   }
+
+  if(!this->i2sRateSet){
+    this->i2sRateSet = true;
+  }
   return true;
 }
 
@@ -401,5 +413,6 @@ bool AudioOutputI2S::stop()
     i2s.end();
   #endif
   i2sOn = false;
+  i2sRateSet = false;
   return true;
 }

src/AudioOutputI2S.h

@@ -62,10 +62,12 @@ class AudioOutputI2S : public AudioOutput
     bool mono;
     int lsb_justified;
     bool i2sOn;
+    bool i2sRateSet;
     int dma_buf_count;
     int use_apll;
     bool use_mclk;
     bool swap_clocks;
+
     // We can restore the old values and free up these pins when in NoDAC mode
     uint32_t orig_bck;
     uint32_t orig_ws;