Mixer test migrated to use CI changes

Author: cwoffenden

test/test_browser.py

@@ -5495,17 +5495,21 @@ def test_audio_worklet_post_function(self, args):
   def test_audio_worklet_modularize(self, args):
     self.btest_exit('webaudio/audioworklet.c', args=['-sAUDIO_WORKLET', '-sWASM_WORKERS', '-sMODULARIZE=1', '-sEXPORT_NAME=MyModule', '--shell-file', test_file('shell_that_launches_modularize.html')] + args)
 
-  # Tests multiple inputs, forcing a larger stack (note: passing BROWSER_TEST is
-  # specific to this test to allow it to exit rather than play forever).
+  # Tests an AudioWorklet with multiple stereo inputs mixing in the processor
+  # via a varying parameter to a single stereo output (touching all of the API
+  # copying from structs)
   @parameterized({
     '': ([],),
     'minimal_with_closure': (['-sMINIMAL_RUNTIME', '--closure=1', '-Oz'],),
   })
-  def test_audio_worklet_stereo_io(self, args):
+  @no_wasm64('https://github.com/emscripten-core/emscripten/pull/23508')
+  @no_2gb('https://github.com/emscripten-core/emscripten/pull/23508')
+  @requires_sound_hardware
+  def test_audio_worklet_params_mixing(self, args):
     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_in_out_stereo.c', args=['-sAUDIO_WORKLET', '-sWASM_WORKERS', '-DBROWSER_TEST'] + args)
+    self.btest_exit('webaudio/audioworklet_params_mixing.c', args=['-sAUDIO_WORKLET', '-sWASM_WORKERS', '-DTEST_AND_EXIT'] + args)
 
   def test_error_reporting(self):
     # Test catching/reporting Error objects

test/test_interactive.py

@@ -339,7 +339,7 @@ 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'])
+    self.btest_exit('webaudio/audioworklet_params_mixing.c', args=['-sAUDIO_WORKLET', '-sWASM_WORKERS', '-DTEST_AND_EXIT'])
 
 
 class interactive64(interactive):

test/webaudio/audioworklet_params_mixing.c

@@ -1,6 +1,5 @@
 #include <assert.h>
 #include <string.h>
-#include <stdio.h>
 
 #include <emscripten/em_js.h>
 #include <emscripten/webaudio.h>
@@ -18,7 +17,9 @@
 
 // Callback to process and mix the audio tracks
 bool process(int numInputs, const AudioSampleFrame* inputs, int numOutputs, AudioSampleFrame* outputs, int numParams, const AudioParamFrame* params, void* __unused data) {
+#ifdef TEST_AND_EXIT
   audioProcessedCount++;
+#endif
 
   // Single stereo output
   assert(numOutputs == 1 && outputs[0].numberOfChannels == 2);
@@ -93,7 +94,7 @@ EM_JS(void, doFade, (EMSCRIPTEN_AUDIO_WORKLET_NODE_T workletID), {
 // Registered keypress event to call the JS doFade()
 bool onPress(int __unused type, const EmscriptenKeyboardEvent* e, void* data) {
   if (!e->repeat && data) {
-    printf("Toggling fade\n");
+    emscripten_out("Toggling fade");
     doFade(VOIDP_2_WA(data));
   }
   return false;
@@ -102,12 +103,12 @@ bool onPress(int __unused type, const EmscriptenKeyboardEvent* e, void* data) {
 // Audio processor created, now register the audio callback
 void processorCreated(EMSCRIPTEN_WEBAUDIO_T context, bool success, void* __unused data) {
   if (!success) {
-    printf("Audio worklet node creation failed\n");
+    assert("Audio worklet failed in processorCreated()" && success);
     return;
   }
-  printf("Audio worklet processor created\n");
-  printf("Click to toggle audio playback\n");
-  printf("Keypress to fade the beat in or out\n");
+  emscripten_out("Audio worklet processor created");
+  emscripten_out("Click to toggle audio playback");
+  emscripten_out("Keypress to fade the beat in or out");
 
   // Stereo output, two inputs
   int outputChannelCounts[1] = { 2 };
@@ -135,17 +136,19 @@ void processorCreated(EMSCRIPTEN_WEBAUDIO_T context, bool success, void* __unuse
   // And a keypress to do affect the fader
   emscripten_set_keypress_callback(EMSCRIPTEN_EVENT_TARGET_DOCUMENT, WA_2_VOIDP(worklet), false, &onPress);
 
+#ifdef TEST_AND_EXIT
   // Register the counter that exits the test after one second of mixing
   emscripten_set_timeout_loop(&playedAndMixed, 16, NULL);
+#endif
 }
 
 // Worklet thread inited, now create the audio processor
 void initialisedWithParams(EMSCRIPTEN_WEBAUDIO_T context, bool success, void* __unused data) {
   if (!success) {
-    printf("Audio worklet failed to initialise\n");
+    assert("Audio worklet failed initialised()" && success);
     return;
   }
-  printf("Audio worklet initialised\n");
+  emscripten_out("Audio worklet initialised");
 
   // Custom audio params we'll use as a fader
   WebAudioParamDescriptor faderParam[] = {

test/webaudio/audioworklet_test_shared.inc

@@ -11,18 +11,21 @@
 #define __unused __attribute__((unused))
 #endif
 
-// Count the audio callbacks and return after 375 frames (1 second with the default 128 size)
+// Count the audio callbacks and return after 375 frames (1 second with the
+// default 128 size).
 //
 // *** Remove this in your own code ***
 //
+#ifdef TEST_AND_EXIT
 volatile int audioProcessedCount = 0;
 bool playedAndMixed(double __unused time, void* __unused data) {
   if (audioProcessedCount >= 375) {
-    emscripten_force_exit(0);
+    emscripten_force_exit(EXIT_SUCCESS);
     return false;
   }
   return true;
 }
+#endif
 
 // ID to the beat and bass loops
 EMSCRIPTEN_WEBAUDIO_T beatID = 0;
@@ -67,10 +70,10 @@ EM_JS(void, toggleTrack, (EMSCRIPTEN_WEBAUDIO_T srcID), {
 bool onClick(int __unused type, const EmscriptenMouseEvent* __unused 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");
+    emscripten_out("Resuming playback");
     emscripten_resume_audio_context_sync(ctx);
   }
-  printf("Toggling audio playback\n");
+  emscripten_out("Toggling audio playback");
   toggleTrack(beatID);
   toggleTrack(bassID);
   return false;
@@ -82,10 +85,10 @@ 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) {
   if (!success) {
-    printf("Audio worklet failed to initialise\n");
+    assert("Audio worklet failed in initialised()" && success);
     return;
   }
-  printf("Audio worklet initialised\n");
+  emscripten_out("Audio worklet initialised");
 
   WebAudioWorkletProcessorCreateOptions opts = {
     .name = "mixer"
@@ -99,16 +102,16 @@ 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);
+  emscripten_outf("Audio worklet stack at 0x%p", workletStack);
   assert(workletStack);
 
   EMSCRIPTEN_WEBAUDIO_T context = emscripten_create_audio_context(NULL);
   emscripten_start_wasm_audio_worklet_thread_async(context, workletStack, AUDIO_STACK_SIZE, getStartCallback(), NULL);
 
-#ifndef BROWSER_TEST
-  // Special case: browser tests need to exit instantly, interactive tests need to wait
-  emscripten_runtime_keepalive_push();
-#endif
+#ifdef TEST_AND_EXIT
+   // We're in the test harness and exiting is via playedAndMixed()
+   emscripten_exit_with_live_runtime();
+ #endif
 
   return EXIT_SUCCESS;
 }