cleanup processMessageLoop

Author: pschatzmann

examples/SnapClientAudioKit/SnapClientAudioKit.ino

@@ -7,14 +7,10 @@
 #include "SnapClient.h"
 #include "AudioLibs/AudioBoardStream.h" // install https://github.com/pschatzmann/arduino-audio-driver
 #include "AudioCodecs/CodecOpus.h" // https://github.com/pschatzmann/arduino-libopus
-//#include "AudioCodecs/CodecFLAC.h"   // https://github.com/pschatzmann/arduino-libflac.git
-//#include "AudioCodecs/CodecVorbis.h" //https://github.com/pschatzmann/arduino-libvorbis-idec
 
 #define ARDUINO_LOOP_STACK_SIZE (10 * 1024)
 
 AudioBoardStream out(AudioKitEs8388V1); 
-//FLACDecoder flac;
-//VorbisDecoder ogg;
 //WAVDecoder pcm;
 OpusAudioDecoder opus;
 WiFiClient wifi;

examples/SnapClientFreeRTOS/SnapClientFreeRTOS.ino

@@ -3,13 +3,9 @@
 #include "api/SnapProcessorRTOS.h" // install https://github.com/pschatzmann/arduino-freertos-addons
 #include "AudioLibs/AudioBoardStream.h" // install https://github.com/pschatzmann/arduino-audio-driver
 #include "AudioCodecs/CodecOpus.h" // https://github.com/pschatzmann/arduino-libopus
-//#include "AudioCodecs/CodecFLAC.h"   // https://github.com/pschatzmann/arduino-libflac.git
-//#include "AudioCodecs/CodecVorbis.h" //https://github.com/pschatzmann/arduino-libvorbis-idec
 
 
 AudioBoardStream out(AudioKitEs8388V1);  // or replace with e.g. I2SStream out;
-//FLACDecoder flac;
-//VorbisDecoder ogg;
 //WAVDecoder pcm;
 OpusAudioDecoder opus;
 WiFiClient wifi;

src/api/SnapProcessor.h

@@ -141,13 +141,11 @@ class SnapProcessor {
     bool rc = true;
     while (rc) {
       rc = processMessageLoop();
-      logHeap();
+      processExt();
+      //logHeap();
       checkHeap();
     }
 
-    // ESP_LOGI(TAG, "... done reading from socket");
-    // p_client->stop();
-
     if (id_counter % 100 == 0) {
       logHeap();
     }
@@ -156,6 +154,11 @@ class SnapProcessor {
     return true;
   }
 
+  /// additional processing
+  void processExt() {
+    delay(5);
+  }
+
   bool resizeData() {
     audio.resize(frame_size);
     send_receive_buffer.resize(CONFIG_SNAPCAST_BUFF_LEN);
@@ -165,14 +168,16 @@ class SnapProcessor {
 
   bool processMessageLoop() {
     ESP_LOGD(TAG, "processMessageLoop");
+    // Wait for data
+    if (p_client->available() < BASE_MESSAGE_SIZE) {
+      return true;
+    }
 
     if (!readBaseMessage())
       return false;
-    delay(1);
 
     if (!readData())
       return false;
-    delay(1);
 
     switch (base_message.type) {
     case SNAPCAST_MESSAGE_CODEC_HEADER:
@@ -199,15 +204,12 @@ class SnapProcessor {
     default:
       ESP_LOGD(TAG, "Invalid Message: %u", base_message.type);
     }
-    delay(1);
 
     // If it's been a second or longer since our last time message was
     // sent, do so now
     if (!writeTimedMessage())
       return false;
 
-    delay(1);
-
     return true;
   }
 
@@ -269,11 +271,6 @@ class SnapProcessor {
 
   bool readBaseMessage() {
     ESP_LOGD(TAG, "%d", BASE_MESSAGE_SIZE);
-    // Wait for timeout
-    // uint64_t end = millis() + CONFIG_WEBSOCKET_SERVER_TIMEOUT_SEC * 1000;
-    while (p_client->available() < BASE_MESSAGE_SIZE) {
-      delay(10);
-    }
 
     // Read Header Record with size
     size = p_client->readBytes(&send_receive_buffer[0], BASE_MESSAGE_SIZE);