[AUDIO_WORKLET] Fix emscripten_audio_worklet_post_function_sig

src/lib/libwebaudio.js

@@ -378,7 +378,7 @@ let LibraryWebAudio = {
     emscripten_audio_worklet_post_function_3(audioContext, funcPtr, arg0, arg1, arg2);
   },
 
-  emscripten_audio_worklet_post_function_sig__deps: ['$readAsmConstArgs'],
+  emscripten_audio_worklet_post_function_sig__deps: ['$readEmAsmArgs'],
   emscripten_audio_worklet_post_function_sig: (audioContext, funcPtr, sigPtr, varargs) => {
 #if ASSERTIONS
     assert(audioContext >= 0);
@@ -387,7 +387,7 @@ let LibraryWebAudio = {
     assert(UTF8ToString(sigPtr)[0] != 'v', 'Do NOT specify the return argument in the signature string for a call to emscripten_audio_worklet_post_function_sig(), just pass the function arguments.');
     assert(varargs);
 #endif
-    (audioContext ? EmAudio[audioContext].audioWorklet.bootstrapMessage.port : globalThis['messagePort']).postMessage({'_wsc': funcPtr, 'x': readAsmConstArgs(sigPtr, varargs) });
+    (audioContext ? EmAudio[audioContext].audioWorklet.bootstrapMessage.port : globalThis['messagePort']).postMessage({'_wsc': funcPtr, 'x': readEmAsmArgs(sigPtr, varargs) });
   }
 };
 

test/webaudio/audioworklet_post_function.c

@@ -5,28 +5,193 @@
 // and the Audio Worklet thread using the
 // emscripten_audio_worklet_post_function_*() API.
 
-// This event will fire on the main thread.
-void MessageReceivedOnMainThread(int d, int e, int f) {
-  emscripten_outf("MessageReceivedOnMainThread: d=%d, e=%d, f=%d", d, e, f);
-  assert(!emscripten_current_thread_is_audio_worklet());
-  assert(d == 1 && e == 2 && f == 3);
+// This test consists of two steps
+//   1. post invocation from main thread to audio worklet thread
+//   2. post invocation from audio worklet thread to main thread
+_Atomic uint32_t callbackCount = 0;
 
-  // test succeeded, were able to post a message from main thread to audio thread and back!
+void do_exit() {
+  emscripten_out("do_exit");
+  assert(callbackCount == 16);
   emscripten_force_exit(0);
 }
 
-// This event will fire on the audio worklet thread.
-void MessageReceivedInAudioWorkletThread(int a, int b) {
-  emscripten_outf("MessageReceivedInAudioWorkletThread: a=%d, b=%d", a, b);
+// [v, vi, vii, viii, vd, vdd, vddd, viiiiiidddddd] * [audio_worklet, main]
+// 8 * 2 callbacks invoked, each callbacks check the correctivity of arguments
+void v_received_on_audio_worklet() {
+  assert(emscripten_current_thread_is_audio_worklet());
+  emscripten_out("v_on_audio_worklet");
+  ++callbackCount;
+}
+
+void vi_received_on_audio_worklet(int i) {
+  assert(emscripten_current_thread_is_audio_worklet());
+  emscripten_out("vi_on_audio_worklet");
+  assert(i == 1);
+  ++callbackCount;
+}
+
+void vii_received_on_audio_worklet(int i, int j) {
+  assert(emscripten_current_thread_is_audio_worklet());
+  emscripten_out("vii_on_audio_worklet");
+  assert(i == 2);
+  assert(j == 3);
+  ++callbackCount;
+}
+
+void viii_received_on_audio_worklet(int i, int j, int k) {
+  assert(emscripten_current_thread_is_audio_worklet());
+  emscripten_out("viii_on_audio_worklet");
+  assert(i == 4);
+  assert(j == 5);
+  assert(k == 6);
+  ++callbackCount;
+}
+
+void vd_received_on_audio_worklet(double i) {
   assert(emscripten_current_thread_is_audio_worklet());
-  assert(a == 42 && b == 9000);
-  emscripten_audio_worklet_post_function_viii(EMSCRIPTEN_AUDIO_MAIN_THREAD, MessageReceivedOnMainThread, /*d=*/1, /*e=*/2, /*f=*/3);
+  emscripten_out("vd_on_audio_worklet");
+  assert(i == 1.5);
+  ++callbackCount;
+}
+
+void vdd_received_on_audio_worklet(double i, double j) {
+  assert(emscripten_current_thread_is_audio_worklet());
+  emscripten_out("vdd_on_audio_worklet");
+  assert(i == 2.5);
+  assert(j == 3.5);
+  ++callbackCount;
+}
+
+void vddd_received_on_audio_worklet(double i, double j, double k) {
+  assert(emscripten_current_thread_is_audio_worklet());
+  emscripten_out("vddd_on_audio_worklet");
+  assert(i == 4.5);
+  assert(j == 5.5);
+  assert(k == 6.5);
+  ++callbackCount;
+}
+
+void viiiiiidddddd_received_on_audio_worklet(int a, int b, int c, int d, int e, int f, double g, double h, double i, double j, double k, double l) {
+  assert(emscripten_current_thread_is_audio_worklet());
+  emscripten_out("viiiiiidddddd_on_audio_worklet");
+  assert(a == 10);
+  assert(b == 11);
+  assert(c == 12);
+  assert(d == 13);
+  assert(e == 14);
+  assert(f == 15);
+  assert(g == 16.5);
+  assert(h == 17.5);
+  assert(i == 18.5);
+  assert(j == 19.5);
+  assert(k == 20.5);
+  assert(l == 21.5);
+  ++callbackCount;
+}
+
+void v_received_on_main() {
+  assert(!emscripten_current_thread_is_audio_worklet());
+  emscripten_out("v_on_main");
+  ++callbackCount;
+}
+
+void vi_received_on_main(int i) {
+  assert(!emscripten_current_thread_is_audio_worklet());
+  emscripten_out("vi_on_main");
+  assert(i == 1);
+  ++callbackCount;
+}
+
+void vii_received_on_main(int i, int j) {
+  assert(!emscripten_current_thread_is_audio_worklet());
+  emscripten_out("vii_on_main");
+  assert(i == 2);
+  assert(j == 3);
+  ++callbackCount;
+}
+
+void viii_received_on_main(int i, int j, int k) {
+  assert(!emscripten_current_thread_is_audio_worklet());
+  emscripten_out("viii_on_main");
+  assert(i == 4);
+  assert(j == 5);
+  assert(k == 6);
+  ++callbackCount;
+}
+
+void vd_received_on_main(double i) {
+  assert(!emscripten_current_thread_is_audio_worklet());
+  emscripten_out("vd_on_main");
+  assert(i == 1.5);
+  ++callbackCount;
+}
+
+void vdd_received_on_main(double i, double j) {
+  assert(!emscripten_current_thread_is_audio_worklet());
+  emscripten_out("vdd_on_main");
+  assert(i == 2.5);
+  assert(j == 3.5);
+  ++callbackCount;
+}
+
+void vddd_received_on_main(double i, double j, double k) {
+  assert(!emscripten_current_thread_is_audio_worklet());
+  emscripten_out("vddd_on_main");
+  assert(i == 4.5);
+  assert(j == 5.5);
+  assert(k == 6.5);
+  ++callbackCount;
+}
+
+void viiiiiidddddd_received_on_main(int a, int b, int c, int d, int e, int f, double g, double h, double i, double j, double k, double l) {
+  assert(!emscripten_current_thread_is_audio_worklet());
+  emscripten_out("viiiiiidddddd_on_main");
+  assert(a == 10);
+  assert(b == 11);
+  assert(c == 12);
+  assert(d == 13);
+  assert(e == 14);
+  assert(f == 15);
+  assert(g == 16.5);
+  assert(h == 17.5);
+  assert(i == 18.5);
+  assert(j == 19.5);
+  assert(k == 20.5);
+  assert(l == 21.5);
+  ++callbackCount;
+}
+
+void lastCallbackOnAudioWorklet() {
+  assert(emscripten_current_thread_is_audio_worklet());
+  assert(callbackCount == 8);
+
+  // These event will fire callbacks on main thread.
+  emscripten_audio_worklet_post_function_v(EMSCRIPTEN_AUDIO_MAIN_THREAD, v_received_on_main);
+  emscripten_audio_worklet_post_function_vi(EMSCRIPTEN_AUDIO_MAIN_THREAD, vi_received_on_main, 1);
+  emscripten_audio_worklet_post_function_vii(EMSCRIPTEN_AUDIO_MAIN_THREAD, vii_received_on_main, 2, 3);
+  emscripten_audio_worklet_post_function_viii(EMSCRIPTEN_AUDIO_MAIN_THREAD, viii_received_on_main, 4, 5, 6);
+  emscripten_audio_worklet_post_function_vd(EMSCRIPTEN_AUDIO_MAIN_THREAD, vd_received_on_main, 1.5);
+  emscripten_audio_worklet_post_function_vdd(EMSCRIPTEN_AUDIO_MAIN_THREAD, vdd_received_on_main, 2.5, 3.5);
+  emscripten_audio_worklet_post_function_vddd(EMSCRIPTEN_AUDIO_MAIN_THREAD, vddd_received_on_main, 4.5, 5.5, 6.5);
+  emscripten_audio_worklet_post_function_sig(EMSCRIPTEN_AUDIO_MAIN_THREAD, viiiiiidddddd_received_on_main, "iiiiiidddddd", 10, 11, 12, 13, 14, 15, 16.5, 17.5, 18.5, 19.5, 20.5, 21.5);
+  emscripten_audio_worklet_post_function_v(EMSCRIPTEN_AUDIO_MAIN_THREAD, do_exit);
 }
 
 // This callback will fire when the audio worklet thread has been initialized.
 void WebAudioWorkletThreadInitialized(EMSCRIPTEN_WEBAUDIO_T audioContext, bool success, void *userData) {
   emscripten_out("WebAudioWorkletThreadInitialized");
-  emscripten_audio_worklet_post_function_vii(audioContext, MessageReceivedInAudioWorkletThread, /*a=*/42, /*b=*/9000);
+
+  // These event will fire callbacks on audio worklet thread.
+  emscripten_audio_worklet_post_function_v(audioContext, v_received_on_audio_worklet );
+  emscripten_audio_worklet_post_function_vi(audioContext, vi_received_on_audio_worklet , 1);
+  emscripten_audio_worklet_post_function_vii(audioContext, vii_received_on_audio_worklet , 2, 3);
+  emscripten_audio_worklet_post_function_viii(audioContext, viii_received_on_audio_worklet , 4, 5, 6);
+  emscripten_audio_worklet_post_function_vd(audioContext, vd_received_on_audio_worklet , 1.5);
+  emscripten_audio_worklet_post_function_vdd(audioContext, vdd_received_on_audio_worklet , 2.5, 3.5);
+  emscripten_audio_worklet_post_function_vddd(audioContext, vddd_received_on_audio_worklet , 4.5, 5.5, 6.5);
+  emscripten_audio_worklet_post_function_sig(audioContext, viiiiiidddddd_received_on_audio_worklet , "iiiiiidddddd", 10, 11, 12, 13, 14, 15, 16.5, 17.5, 18.5, 19.5, 20.5, 21.5);
+  emscripten_audio_worklet_post_function_v(audioContext, lastCallbackOnAudioWorklet);
 }
 
 uint8_t wasmAudioWorkletStack[4096];