More robust audio input handling code in Teensy.

modularev · Nov 9, 2020 · cbfe606 · cbfe606
1 parent 37a741d
commit cbfe606
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 9 deletions.
diff --git a/architecture/faust/audio/teensy-dsp.h b/architecture/faust/audio/teensy-dsp.h
@@ -27,6 +27,7 @@
 
 #include <set>
 #include <utility>
+#include <string.h> // for memset
 
 #include "faust/dsp/dsp.h"
 
@@ -68,13 +69,17 @@ class teensyaudio : public AudioStream, public audio {
         {
             if (INPUTS > 0) {
                 audio_block_t* inBlock[INPUTS];
-                for(int channel = 0; channel < INPUTS; channel++) {
+                for (int channel = 0; channel < INPUTS; channel++) {
                     inBlock[channel] = receiveReadOnly(channel);
-                    for (int i = 0; i < AUDIO_BLOCK_SAMPLES; i++) {
-                        int32_t val = inBlock[channel]->data[i] << 16;
-                        fInChannel[channel][i] = val*DIV_16;
+                    if (inBlock) {
+                        for (int i = 0; i < AUDIO_BLOCK_SAMPLES; i++) {
+                            int32_t val = inBlock[channel]->data[i] << 16;
+                            fInChannel[channel][i] = val*DIV_16;
+                        }
+                        release(inBlock[channel]);
+                    } else {
+                        memset(fInChannel[channel], 0, AUDIO_BLOCK_SAMPLES * sizeof(float));
                     }
-                    release(inBlock[channel]);
                 }
             }
 

diff --git a/architecture/teensy/teensy.cpp b/architecture/teensy/teensy.cpp
@@ -33,6 +33,8 @@
  ************************************************************************
  ************************************************************************/
 
+#include <string.h> // for memset
+
 #include "teensy.h"
 
 // IMPORTANT: in order for MapUI to work, the teensy linker must be g++
@@ -172,11 +174,15 @@ void AudioFaust::updateImp(void)
         audio_block_t* inBlock[INPUTS];
         for (int channel = 0; channel < INPUTS; channel++) {
             inBlock[channel] = receiveReadOnly(channel);
-            for (int i = 0; i < AUDIO_BLOCK_SAMPLES; i++) {
-                int32_t val = inBlock[channel]->data[i] << 16;
-                fInChannel[channel][i] = val*DIV_16;
+            if (inBlock) {
+                for (int i = 0; i < AUDIO_BLOCK_SAMPLES; i++) {
+                    int32_t val = inBlock[channel]->data[i] << 16;
+                    fInChannel[channel][i] = val*DIV_16;
+                }
+                release(inBlock[channel]);
+            } else {
+                memset(fInChannel[channel], 0, AUDIO_BLOCK_SAMPLES * sizeof(float));
             }
-            release(inBlock[channel]);
         }
     }