Tidy, bullet-proof and document

Author: cwoffenden

test/webaudio/audioworklet_2x_in_hard_pan.c

@@ -18,17 +18,29 @@
 bool process(int numInputs, const AudioSampleFrame* inputs, int numOutputs, AudioSampleFrame* outputs, int __unused numParams, const AudioParamFrame* __unused params, void* __unused data) {
   audioProcessedCount++;
 
-  // Twin mono in, single stereo out
+  // Twin mono in (or disabled), single stereo out
   assert(numInputs == 2 && numOutputs == 1);
-  assert(inputs[0].numberOfChannels == 1 && inputs[1].numberOfChannels == 1);
+  assert(inputs[0].numberOfChannels == 0 || inputs[0].numberOfChannels == 1);
+  assert(inputs[1].numberOfChannels == 0 || inputs[1].numberOfChannels == 1);
   assert(outputs[0].numberOfChannels == 2);
   // All with the same number of samples
   assert(inputs[0].samplesPerChannel == inputs[1].samplesPerChannel);
   assert(inputs[0].samplesPerChannel == outputs[0].samplesPerChannel);
-  // Now with all known quantities we can memcpy the data
-  int samplesPerChannel = inputs[0].samplesPerChannel;
-  memcpy(outputs[0].data, inputs[0].data, samplesPerChannel * sizeof(float));
-  memcpy(outputs[0].data + samplesPerChannel, inputs[1].data, samplesPerChannel * sizeof(float));
+  // Now with all known quantities we can memcpy the L&R data (or zero it if the
+  // channels are disabled)
+  int bytesPerChannel = outputs[0].samplesPerChannel * sizeof(float);
+  float* outputData = outputs[0].data;
+  if (inputs[0].numberOfChannels > 0) {
+    memcpy(outputData, inputs[0].data, bytesPerChannel);
+  } else {
+    memset(outputData, 0, bytesPerChannel);
+  }
+  outputData += outputs[0].samplesPerChannel;
+  if (inputs[1].numberOfChannels > 0) {
+    memcpy(outputData, inputs[1].data, bytesPerChannel);
+  } else {
+    memset(outputData, 0, bytesPerChannel);
+  }
   return true;
 }
 
@@ -70,6 +82,6 @@ void processorCreated(EMSCRIPTEN_WEBAUDIO_T context, bool success, void* __unuse
 }
 
 // This implementation has no custom start-up requirements
-EmscriptenStartWebAudioWorkletCallback getStartCallback() {
+EmscriptenStartWebAudioWorkletCallback getStartCallback(void) {
   return &initialised;
 }

test/webaudio/audioworklet_2x_in_out_stereo.c

@@ -19,16 +19,27 @@ bool process(int numInputs, const AudioSampleFrame* inputs, int numOutputs, Audi
 
   // Twin stereo in and out
   assert(numInputs == 2 && numOutputs == 2);
-  assert(inputs[0].numberOfChannels == 2 && inputs[1].numberOfChannels == 2);
-  assert(outputs[0].numberOfChannels == 2 && outputs[1].numberOfChannels == 2);
+  assert(inputs[0].numberOfChannels == 0 || inputs[0].numberOfChannels == 2);
+  assert(inputs[1].numberOfChannels == 0 || inputs[1].numberOfChannels == 2);
+  assert(outputs[0].numberOfChannels == 2);
+  assert(outputs[1].numberOfChannels == 2);
   // All with the same number of samples
   assert(inputs[0].samplesPerChannel == inputs[1].samplesPerChannel);
   assert(inputs[0].samplesPerChannel == outputs[0].samplesPerChannel);
   assert(outputs[0].samplesPerChannel == outputs[1].samplesPerChannel);
-  // Now with all known quantities we can memcpy the data
-  int totalSamples = outputs[0].samplesPerChannel * outputs[0].numberOfChannels;
-  memcpy(outputs[0].data, inputs[0].data, totalSamples * sizeof(float));
-  memcpy(outputs[1].data, inputs[1].data, totalSamples * sizeof(float));
+  // Now with all known quantities we can memcpy all the data (or zero it if the
+  // channels are disabled)
+  int totalBytes = outputs[0].samplesPerChannel * outputs[0].numberOfChannels * sizeof(float);
+  if (inputs[0].numberOfChannels > 0) {
+    memcpy(outputs[0].data, inputs[0].data, totalBytes);
+  } else {
+    memset(outputs[0].data, 0, totalBytes);
+  }
+  if (inputs[1].numberOfChannels > 0) {
+    memcpy(outputs[1].data, inputs[1].data, totalBytes);
+  } else {
+    memset(outputs[1].data, 0, totalBytes);
+  }
   return true;
 }
 
@@ -72,6 +83,6 @@ void processorCreated(EMSCRIPTEN_WEBAUDIO_T context, bool success, void* __unuse
 }
 
 // This implementation has no custom start-up requirements
-EmscriptenStartWebAudioWorkletCallback getStartCallback() {
+EmscriptenStartWebAudioWorkletCallback getStartCallback(void) {
   return &initialised;
 }

test/webaudio/audioworklet_in_out_mono.c

@@ -29,11 +29,18 @@ bool process(int numInputs, const AudioSampleFrame* inputs, int numOutputs, Audi
   // We can now do a quick mix since we know the layouts
   if (numInputs > 0) {
     int totalSamples = outputs[0].samplesPerChannel * outputs[0].numberOfChannels;
+    // Simple copy of single input's audio data, checking that we have channels
+    // (since a muted input has zero channels)
     float* outputData = outputs[0].data;
-    memcpy(outputData, inputs[0].data, totalSamples * sizeof(float));
+    if (inputs[0].numberOfChannels > 0) {
+      memcpy(outputData, inputs[0].data, totalSamples * sizeof(float));
+    } else {
+      // And for muted we need to fill the buffer with zeroes otherwise it repeats the last frame
+      memset(outputData, 0, totalSamples * sizeof(float));
+    }
+    // Now add another inputs
     for (int n = 1; n < numInputs; n++) {
-      // It's possible to have an input with no channels
-      if (inputs[n].numberOfChannels == 1) {
+      if (inputs[n].numberOfChannels > 0) {
         float* inputData = inputs[n].data;
         for (int i = totalSamples - 1; i >= 0; i--) {
           outputData[i] += inputData[i];
@@ -82,7 +89,7 @@ void processorCreated(EMSCRIPTEN_WEBAUDIO_T context, bool success, void* __unuse
 }
 
 // This implementation has no custom start-up requirements
-EmscriptenStartWebAudioWorkletCallback getStartCallback() {
+EmscriptenStartWebAudioWorkletCallback getStartCallback(void) {
   return &initialised;
 }
 

test/webaudio/audioworklet_in_out_stereo.c

@@ -29,11 +29,18 @@ bool process(int numInputs, const AudioSampleFrame* inputs, int numOutputs, Audi
   // We can now do a quick mix since we know the layouts
   if (numInputs > 0) {
     int totalSamples = outputs[0].samplesPerChannel * outputs[0].numberOfChannels;
+    // Simple copy of single input's audio data, checking that we have channels
+    // (since a muted input has zero channels)
     float* outputData = outputs[0].data;
-    memcpy(outputData, inputs[0].data, totalSamples * sizeof(float));
+    if (inputs[0].numberOfChannels > 0) {
+      memcpy(outputData, inputs[0].data, totalSamples * sizeof(float));
+    } else {
+      // And for muted we need to fill the buffer with zeroes otherwise it repeats the last frame
+      memset(outputData, 0, totalSamples * sizeof(float));
+    }
+    // Now add another inputs
     for (int n = 1; n < numInputs; n++) {
-      // It's possible to have an input with no channels
-      if (inputs[n].numberOfChannels == 2) {
+      if (inputs[n].numberOfChannels > 0) {
         float* inputData = inputs[n].data;
         for (int i = totalSamples - 1; i >= 0; i--) {
           outputData[i] += inputData[i];
@@ -82,6 +89,6 @@ void processorCreated(EMSCRIPTEN_WEBAUDIO_T context, bool success, void* __unuse
 }
 
 // This implementation has no custom start-up requirements
-EmscriptenStartWebAudioWorkletCallback getStartCallback() {
+EmscriptenStartWebAudioWorkletCallback getStartCallback(void) {
   return &initialised;
 }

test/webaudio/audioworklet_params_mixing.c

@@ -6,30 +6,32 @@
 #include <emscripten/webaudio.h>
 
 // Tests processing two stereo audio inputs being mixed to a single stereo audio
-// output in process() (by adding the inputs together).
+// output in process(), then applying a fade from the parameters.
 
-// This needs to be big enough for the stereo output, 2x inputs, 2x params and the worker stack
+// This needs to be big enough for the stereo output, 2x inputs, 2x params and
+// the worker stack. To note that different browsers have different stack size
+// requirement (see notes in process()).
 #define AUDIO_STACK_SIZE 5120
 
 // Shared file playback and bootstrap
 #include "audioworklet_test_shared.inc"
 
 // Callback to process and mix the audio tracks
-bool process(int numInputs, const AudioSampleFrame* inputs, int numOutputs, AudioSampleFrame* outputs, int numParams, const AudioParamFrame* __unused params, void* __unused data) {
+bool process(int numInputs, const AudioSampleFrame* inputs, int numOutputs, AudioSampleFrame* outputs, int numParams, const AudioParamFrame* params, void* __unused data) {
   audioProcessedCount++;
 
   // Single stereo output
   assert(numOutputs == 1 && outputs[0].numberOfChannels == 2);
   int outSamplesPerChannel = outputs[0].samplesPerChannel;
   for (int n = 0; n < numInputs; n++) {
-    // And all inputs are also stereo
+    // And all inputs are also stereo (or disabled)
     assert(inputs[n].numberOfChannels == 2 || inputs[n].numberOfChannels == 0);
     // This should always be the case
     assert(inputs[n].samplesPerChannel == outSamplesPerChannel);
   }
   // Interestingly, params varies per browser. Chrome won't have a length > 1
-  // unless the value changes, and FF has all the samples even for a k-rate
-  // parameter. The only given is that two params are incoming.
+  // unless the value changes, and FF has all 128 entries even for a k-rate
+  // parameter. The only given is that two params are incoming:
   assert(numParams = 2);
   assert(params[0].length == 1 || params[0].length == outSamplesPerChannel);
   assert(params[1].length == 1 || params[1].length == outSamplesPerChannel);
@@ -39,16 +41,17 @@ bool process(int numInputs, const AudioSampleFrame* inputs, int numOutputs, Audi
     // Simple copy of single input's audio data, checking that we have channels
     // (since a muted input has zero channels)
     float* outputData = outputs[0].data;
-    if (inputs[0].numberOfChannels != 0) {
+    if (inputs[0].numberOfChannels > 0) {
       memcpy(outputData, inputs[0].data, totalSamples * sizeof(float));
     } else {
-      // And for muted we need to full the buffer with zeroes otherwise it play the previous frame
+      // And for muted we need to fill the buffer with zeroes otherwise it repeats the last frame
       memset(outputData, 0, totalSamples * sizeof(float));
     }
-    // Grab the mix level parameter (with either a length of 1 or the samples per channel)
+    // Grab the mix level parameter (with either a length of 1 or the samples
+    // per channel) and add any other inputs
     const AudioParamFrame* mixLevel = &params[0];
     for (int n = 1; n < numInputs; n++) {
-      if (inputs[n].numberOfChannels != 0) {
+      if (inputs[n].numberOfChannels > 0) {
         float* inputData = inputs[n].data;
         for (int i = totalSamples - 1; i >= 0; i--) {
           // Output and input buffers are stereo planar in this example so we
@@ -76,7 +79,7 @@ EM_JS(void, doFade, (EMSCRIPTEN_AUDIO_WORKLET_NODE_T workletID), {
       param.setTargetAtTime((param.value > 0.5) ? 0 : 1, 0 /* same as context.currentTime */, 0.5);
     }
   }
-});
+})
 
 // Registered keypress event to call the JS doFade()
 bool onPress(int __unused type, const EmscriptenKeyboardEvent* e, void* data) {
@@ -160,6 +163,6 @@ void initialisedWithParams(EMSCRIPTEN_WEBAUDIO_T context, bool success, void* __
 }
 
 // This implementation has no custom start-up requirements
-EmscriptenStartWebAudioWorkletCallback getStartCallback() {
+EmscriptenStartWebAudioWorkletCallback getStartCallback(void) {
   return &initialisedWithParams;
 }

test/webaudio/audioworklet_test_shared.inc

@@ -35,7 +35,8 @@ EM_JS(EMSCRIPTEN_WEBAUDIO_T, createTrack, (EMSCRIPTEN_WEBAUDIO_T ctxID, const ch
   if (context) {
     var audio = document.createElement('audio');
 #if __wasm64__
-    // Workaround for UTF8ToString() needing a JS number and from64() not working in EM_JS
+    // Number() wrapper is a workaround for UTF8ToString() needing a JS number
+    // and from64() not being available in EM_JS macros. Fix in UTF8ToString?
     url = Number(url);
 #endif
     audio.src = UTF8ToString(url);
@@ -44,7 +45,7 @@ EM_JS(EMSCRIPTEN_WEBAUDIO_T, createTrack, (EMSCRIPTEN_WEBAUDIO_T ctxID, const ch
     return emscriptenRegisterAudioObject(track);
   }
   return 0;
-});
+})
 
 // Toggles the play/pause of a MediaElementAudioSourceNode given its ID
 EM_JS(void, toggleTrack, (EMSCRIPTEN_WEBAUDIO_T srcID), {
@@ -60,7 +61,7 @@ EM_JS(void, toggleTrack, (EMSCRIPTEN_WEBAUDIO_T srcID), {
       }
     }
   }
-});
+})
 
 // Registered click event to (1) enable audio playback and (2) toggle playing the tracks
 bool onClick(int __unused type, const EmscriptenMouseEvent* __unused e, void* data) {
@@ -93,10 +94,10 @@ void initialised(EMSCRIPTEN_WEBAUDIO_T context, bool success, void* __unused dat
 }
 
 // To be implemented by the test code, allowing initialised() to be changed.
-EmscriptenStartWebAudioWorkletCallback getStartCallback();
+EmscriptenStartWebAudioWorkletCallback getStartCallback(void);
 
 // Common entry point for the mixer tests
-int main() {
+int main(void) {
   char* const workletStack = memalign(16, AUDIO_STACK_SIZE);
   printf("Audio worklet stack at 0x%p\n", workletStack);
   assert(workletStack);