Tests all moved to #23659, undoing all the changes here

Author: cwoffenden

test/test_interactive.py

@@ -334,32 +334,10 @@ def test_audio_worklet_2x_hard_pan_io(self):
     shutil.copy(test_file('webaudio/audio_files/emscripten-bass-mono.mp3'), 'audio_files/')
     self.btest_exit('webaudio/audioworklet_2x_in_hard_pan.c', args=['-sAUDIO_WORKLET', '-sWASM_WORKERS'])
 
-  # Tests an AudioWorklet with multiple stereo inputs mixing in the processor via a parameter to a single stereo output (6kB stack)
-  def test_audio_worklet_params_mixing(self):
-    os.mkdir('audio_files')
-    shutil.copy(test_file('webaudio/audio_files/emscripten-beat.mp3'), 'audio_files/')
-    shutil.copy(test_file('webaudio/audio_files/emscripten-bass.mp3'), 'audio_files/')
-    self.btest_exit('webaudio/audioworklet_params_mixing.c', args=['-sAUDIO_WORKLET', '-sWASM_WORKERS'])
-
 
 class interactive64(interactive):
   def setUp(self):
     super().setUp()
     self.set_setting('MEMORY64')
+    self.emcc_args.append('-Wno-experimental')
     self.require_wasm64()
-
-
-class interactive64_4gb(interactive):
-  def setUp(self):
-    super().setUp()
-    self.set_setting('MEMORY64')
-    self.set_setting('INITIAL_MEMORY', '4200mb')
-    self.set_setting('GLOBAL_BASE', '4gb')
-    self.require_wasm64()
-
-
-class interactive_2gb(interactive):
-  def setUp(self):
-    super().setUp()
-    self.set_setting('INITIAL_MEMORY', '2200mb')
-    self.set_setting('GLOBAL_BASE', '2gb')

test/webaudio/audioworklet_2x_in_hard_pan.c

@@ -15,37 +15,25 @@
 #include "audioworklet_test_shared.inc"
 
 // Callback to process and copy the audio tracks
-bool process(int numInputs, const AudioSampleFrame* inputs, int numOutputs, AudioSampleFrame* outputs, int __unused 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* data) {
   audioProcessedCount++;
 
-  // Twin mono in (or disabled), single stereo out
+  // Twin mono in, single stereo out
   assert(numInputs == 2 && numOutputs == 1);
-  assert(inputs[0].numberOfChannels == 0 || inputs[0].numberOfChannels == 1);
-  assert(inputs[1].numberOfChannels == 0 || inputs[1].numberOfChannels == 1);
+  assert(inputs[0].numberOfChannels == 1 && 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 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);
-  }
+  // 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));
   return true;
 }
 
 // Audio processor created, now register the audio callback
-void processorCreated(EMSCRIPTEN_WEBAUDIO_T context, bool success, void* __unused data) {
+void processorCreated(EMSCRIPTEN_WEBAUDIO_T context, bool success, void* data) {
   if (!success) {
     printf("Audio worklet node creation failed\n");
     return;
@@ -80,8 +68,3 @@ void processorCreated(EMSCRIPTEN_WEBAUDIO_T context, bool success, void* __unuse
   // Register the counter that exits the test after one second of mixing
   emscripten_set_timeout_loop(&playedAndMixed, 16, NULL);
 }
-
-// This implementation has no custom start-up requirements
-EmscriptenStartWebAudioWorkletCallback getStartCallback(void) {
-  return &initialised;
-}

test/webaudio/audioworklet_2x_in_out_stereo.c

@@ -14,37 +14,26 @@
 #include "audioworklet_test_shared.inc"
 
 // Callback to process and copy the audio tracks
-bool process(int numInputs, const AudioSampleFrame* inputs, int numOutputs, AudioSampleFrame* outputs, int __unused 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* data) {
   audioProcessedCount++;
 
   // Twin stereo in and out
   assert(numInputs == 2 && numOutputs == 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);
+  assert(inputs[0].numberOfChannels == 2 && inputs[1].numberOfChannels == 2);
+  assert(outputs[0].numberOfChannels == 2 && 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 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);
-  }
+  // 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));
   return true;
 }
 
 // Audio processor created, now register the audio callback
-void processorCreated(EMSCRIPTEN_WEBAUDIO_T context, bool success, void* __unused data) {
+void processorCreated(EMSCRIPTEN_WEBAUDIO_T context, bool success, void* data) {
   if (!success) {
     printf("Audio worklet node creation failed\n");
     return;
@@ -81,8 +70,3 @@ void processorCreated(EMSCRIPTEN_WEBAUDIO_T context, bool success, void* __unuse
   // Register the counter that exits the test after one second of mixing
   emscripten_set_timeout_loop(&playedAndMixed, 16, NULL);
 }
-
-// This implementation has no custom start-up requirements
-EmscriptenStartWebAudioWorkletCallback getStartCallback(void) {
-  return &initialised;
-}

test/webaudio/audioworklet_in_out_mono.c

@@ -15,7 +15,7 @@
 #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 __unused 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* data) {
   audioProcessedCount++;
 
   // Single mono output
@@ -29,18 +29,11 @@ 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 the first 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) {
-      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
+    memcpy(outputData, inputs[0].data, totalSamples * sizeof(float));
     for (int n = 1; n < numInputs; n++) {
-      if (inputs[n].numberOfChannels > 0) {
+      // It's possible to have an input with no channels
+      if (inputs[n].numberOfChannels == 1) {
         float* inputData = inputs[n].data;
         for (int i = totalSamples - 1; i >= 0; i--) {
           outputData[i] += inputData[i];
@@ -52,7 +45,7 @@ bool process(int numInputs, const AudioSampleFrame* inputs, int numOutputs, Audi
 }
 
 // Audio processor created, now register the audio callback
-void processorCreated(EMSCRIPTEN_WEBAUDIO_T context, bool success, void* __unused data) {
+void processorCreated(EMSCRIPTEN_WEBAUDIO_T context, bool success, void* data) {
   if (!success) {
     printf("Audio worklet node creation failed\n");
     return;
@@ -87,9 +80,3 @@ void processorCreated(EMSCRIPTEN_WEBAUDIO_T context, bool success, void* __unuse
   // Register the counter that exits the test after one second of mixing
   emscripten_set_timeout_loop(&playedAndMixed, 16, NULL);
 }
-
-// This implementation has no custom start-up requirements
-EmscriptenStartWebAudioWorkletCallback getStartCallback(void) {
-  return &initialised;
-}
-

test/webaudio/audioworklet_in_out_stereo.c

@@ -15,7 +15,7 @@
 #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 __unused 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* data) {
   audioProcessedCount++;
 
   // Single stereo output
@@ -29,18 +29,11 @@ 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 the first 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) {
-      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
+    memcpy(outputData, inputs[0].data, totalSamples * sizeof(float));
     for (int n = 1; n < numInputs; n++) {
-      if (inputs[n].numberOfChannels > 0) {
+      // It's possible to have an input with no channels
+      if (inputs[n].numberOfChannels == 2) {
         float* inputData = inputs[n].data;
         for (int i = totalSamples - 1; i >= 0; i--) {
           outputData[i] += inputData[i];
@@ -52,7 +45,7 @@ bool process(int numInputs, const AudioSampleFrame* inputs, int numOutputs, Audi
 }
 
 // Audio processor created, now register the audio callback
-void processorCreated(EMSCRIPTEN_WEBAUDIO_T context, bool success, void* __unused data) {
+void processorCreated(EMSCRIPTEN_WEBAUDIO_T context, bool success, void* data) {
   if (!success) {
     printf("Audio worklet node creation failed\n");
     return;
@@ -87,8 +80,3 @@ void processorCreated(EMSCRIPTEN_WEBAUDIO_T context, bool success, void* __unuse
   // Register the counter that exits the test after one second of mixing
   emscripten_set_timeout_loop(&playedAndMixed, 16, NULL);
 }
-
-// This implementation has no custom start-up requirements
-EmscriptenStartWebAudioWorkletCallback getStartCallback(void) {
-  return &initialised;
-}

test/webaudio/audioworklet_test_shared.inc

@@ -5,18 +5,12 @@
 // Helper for MEMORY64 to cast a void* to an audio context or type
 #define VOIDP_2_WA(ptr) ((EMSCRIPTEN_WEBAUDIO_T) (intptr_t) ptr)
 
-// Attribute that marks a function, parameter, variable, etc., as unused
-// (silencing any -Wunused warnings).
-#ifndef __unused
-#define __unused __attribute__((unused))
-#endif
-
 // Count the audio callbacks and return after 375 frames (1 second with the default 128 size)
 //
 // *** Remove this in your own code ***
 //
 volatile int audioProcessedCount = 0;
-bool playedAndMixed(double __unused time, void* __unused data) {
+bool playedAndMixed(double time, void* data) {
   if (audioProcessedCount >= 375) {
     emscripten_force_exit(0);
     return false;
@@ -34,18 +28,13 @@ EM_JS(EMSCRIPTEN_WEBAUDIO_T, createTrack, (EMSCRIPTEN_WEBAUDIO_T ctxID, const ch
   var context = emscriptenGetAudioObject(ctxID);
   if (context) {
     var audio = document.createElement('audio');
-#if __wasm64__
-    // 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);
     audio.loop = looping;
     var track = context.createMediaElementSource(audio);
     return emscriptenRegisterAudioObject(track);
   }
   return 0;
-})
+});
 
 // Toggles the play/pause of a MediaElementAudioSourceNode given its ID
 EM_JS(void, toggleTrack, (EMSCRIPTEN_WEBAUDIO_T srcID), {
@@ -61,10 +50,10 @@ 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) {
+// Registered click even to (1) enable audio playback and (2) toggle playing the tracks
+bool onClick(int type, const EmscriptenMouseEvent* e, void* data) {
   EMSCRIPTEN_WEBAUDIO_T ctx = VOIDP_2_WA(data);
   if (emscripten_audio_context_state(ctx) != AUDIO_CONTEXT_STATE_RUNNING) {
     printf("Resuming playback\n");
@@ -80,35 +69,27 @@ bool onClick(int __unused type, const EmscriptenMouseEvent* __unused e, void* da
 void processorCreated(EMSCRIPTEN_WEBAUDIO_T context, bool success, void* data);
 
 // Worklet thread inited, now create the audio processor
-void initialised(EMSCRIPTEN_WEBAUDIO_T context, bool success, void* __unused data) {
+void initialised(EMSCRIPTEN_WEBAUDIO_T context, bool success, void* data) {
   if (!success) {
     printf("Audio worklet failed to initialise\n");
     return;
   }
   printf("Audio worklet initialised\n");
 
   WebAudioWorkletProcessorCreateOptions opts = {
-    .name = "mixer"
+    .name = "mixer",
   };
   emscripten_create_wasm_audio_worklet_processor_async(context, &opts, &processorCreated, NULL);
 }
 
-// To be implemented by the test code, allowing initialised() to be changed.
-EmscriptenStartWebAudioWorkletCallback getStartCallback(void);
-
 // Common entry point for the mixer tests
-int main(void) {
-  char* const workletStack = memalign(16, AUDIO_STACK_SIZE);
-  printf("Audio worklet stack at 0x%p\n", workletStack);
-  assert(workletStack);
-
+int main() {
+  static char workletStack[AUDIO_STACK_SIZE];
   EMSCRIPTEN_WEBAUDIO_T context = emscripten_create_audio_context(NULL);
-  emscripten_start_wasm_audio_worklet_thread_async(context, workletStack, AUDIO_STACK_SIZE, getStartCallback(), NULL);
-
+  emscripten_start_wasm_audio_worklet_thread_async(context, workletStack, sizeof workletStack, &initialised, NULL);
 #ifndef BROWSER_TEST
   // Special case: browser tests need to exit instantly, interactive tests need to wait
   emscripten_runtime_keepalive_push();
 #endif
-
-  return EXIT_SUCCESS;
+  return 0;
 }