Jan/WLED_MM_Infinity
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

receiveAudioData() process last packet in buffer now to account for slower refreshes

Browse Source
This commit is contained in:
Troy
2025-01-22 13:11:38 -05:00
parent a24491003c
commit 5a06280935
1 changed files with 40 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
usermods/audioreactive/audio_reactive.h
View File

@@ -1836,54 +1836,62 @@ class AudioReactive : public Usermod {
agcSensitivity = 128.0f; // substitute - V1 format does not include this value agcSensitivity = 128.0f; // substitute - V1 format does not include this value
} }
bool receiveAudioData() // check & process new data. return TRUE in case that new audio data was received. bool receiveAudioData() {
{
if (!udpSyncConnected) return false; if (!udpSyncConnected) return false;
bool haveFreshData = false; bool haveFreshData = false;
size_t packetSize = 0; size_t packetSize = 0;
// WLEDMM use exception handler to catch out-of-memory errors static uint8_t fftUdpBuffer[UDPSOUND_MAX_PACKET + 1] = {0};
#if __cpp_exceptions size_t lastValidPacketSize = 0;
try{
// Loop to read all available packets
while (true) {
#if __cpp_exceptions
try {
packetSize = fftUdp.parsePacket(); packetSize = fftUdp.parsePacket();
} catch(...) { } catch (...) {
packetSize = 0; // low heap memory -> discard packet. packetSize = 0;
#ifdef ARDUINO_ARCH_ESP32 #ifdef ARDUINO_ARCH_ESP32
fftUdp.flush(); // this does not work on 8266 fftUdp.flush();
#endif #endif
DEBUG_PRINTLN(F("receiveAudioData: parsePacket out of memory exception caught!")); DEBUG_PRINTLN(F("receiveAudioData: parsePacket out of memory exception caught!"));
USER_FLUSH(); USER_FLUSH();
continue; // Skip to next iteration
} }
#else #else
packetSize = fftUdp.parsePacket(); packetSize = fftUdp.parsePacket();
#endif #endif
#ifdef ARDUINO_ARCH_ESP32 #ifdef ARDUINO_ARCH_ESP32
if ((packetSize > 0) && ((packetSize < 5) || (packetSize > UDPSOUND_MAX_PACKET))) fftUdp.flush(); // discard invalid packets (too small or too big) if ((packetSize > 0) && ((packetSize < 5) || (packetSize > UDPSOUND_MAX_PACKET))) {
#endif fftUdp.flush();
if ((packetSize > 5) && (packetSize <= UDPSOUND_MAX_PACKET)) { continue; // Skip invalid packets
static uint8_t fftUdpBuffer[UDPSOUND_MAX_PACKET+1] = { 0 }; // static buffer for receiving, to reuse the same memory and avoid heap fragmentation }
//DEBUGSR_PRINTLN("Received UDP Sync Packet"); #endif
fftUdp.read(fftUdpBuffer, packetSize);
// VERIFY THAT THIS IS A COMPATIBLE PACKET if (packetSize == 0) break; // No more packets available
if (packetSize == sizeof(audioSyncPacket) && (isValidUdpSyncVersion((const char *)fftUdpBuffer))) {
if ((packetSize > 5) && (packetSize <= UDPSOUND_MAX_PACKET)) {
fftUdp.read(fftUdpBuffer, packetSize);
lastValidPacketSize = packetSize;
}
}
// Process only the last valid packet
if (lastValidPacketSize > 0) {
if (lastValidPacketSize == sizeof(audioSyncPacket) && (isValidUdpSyncVersion((const char *)fftUdpBuffer))) {
receivedFormat = 2; receivedFormat = 2;
haveFreshData = decodeAudioData(packetSize, fftUdpBuffer); haveFreshData = decodeAudioData(lastValidPacketSize, fftUdpBuffer);
//DEBUGSR_PRINTLN("Finished parsing UDP Sync Packet v2"); } else if (lastValidPacketSize == sizeof(audioSyncPacket_v1) && (isValidUdpSyncVersion_v1((const char *)fftUdpBuffer))) {
decodeAudioData_v1(lastValidPacketSize, fftUdpBuffer);
receivedFormat = 1;
haveFreshData = true;
} else { } else {
if (packetSize == sizeof(audioSyncPacket_v1) && (isValidUdpSyncVersion_v1((const char *)fftUdpBuffer))) { receivedFormat = 0; // unknown format
decodeAudioData_v1(packetSize, fftUdpBuffer);
receivedFormat = 1;
//DEBUGSR_PRINTLN("Finished parsing UDP Sync Packet v1");
haveFreshData = true;
} else receivedFormat = 0; // unknown format
} }
} }
return haveFreshData; return haveFreshData;
} }
////////////////////// //////////////////////
// usermod functions// // usermod functions//
////////////////////// //////////////////////
@@ -2319,6 +2327,7 @@ class AudioReactive : public Usermod {
static float syncVolumeSmth = 0; static float syncVolumeSmth = 0;
bool have_new_sample = false; bool have_new_sample = false;
if (millis() - lastTime > delayMs) { if (millis() - lastTime > delayMs) {
// DEBUG_PRINTF(F("AR reading at %d compared to %d max\n"), millis() - lastTime, delayMs); // TroyHacks
have_new_sample = receiveAudioData(); have_new_sample = receiveAudioData();
if (have_new_sample) { if (have_new_sample) {
last_UDPTime = millis(); last_UDPTime = millis();