Work-in-progress 64-bit changes

Mostly getting things to compile, which is does but now we have an assert in process().

Author: cwoffenden

src/audio_worklet.js

@@ -112,7 +112,7 @@ function createWasmAudioWorkletProcessor(audioParams) {
 
       // Copy input audio descriptor structs and data to Wasm
       inputsPtr = dataPtr;
-      k = inputsPtr >> 2;
+      k = inputsPtr >>> 2;
       dataPtr += numInputs * {{{ C_STRUCTS.AudioSampleFrame.__size__ }}};
       for (i of inputList) {
         // Write the AudioSampleFrame struct instance
@@ -122,7 +122,7 @@ function createWasmAudioWorkletProcessor(audioParams) {
         k += {{{ C_STRUCTS.AudioSampleFrame.__size__ / 4 }}};
         // Marshal the input audio sample data for each audio channel of this input
         for (j of i) {
-          HEAPF32.set(j, dataPtr>>2);
+          HEAPF32.set(j, dataPtr>>>2);
           dataPtr += bytesPerChannel;
         }
       }
@@ -179,7 +179,7 @@ function createWasmAudioWorkletProcessor(audioParams) {
 #endif
 
       // Call out to Wasm callback to perform audio processing
-      if (didProduceAudio = this.callbackFunction(numInputs, inputsPtr, numOutputs, outputsPtr, numParams, paramsPtr, this.userData)) {
+      if (didProduceAudio = this.callbackFunction(numInputs, BigInt(inputsPtr), numOutputs, BigInt(outputsPtr), numParams, BigInt(paramsPtr), this.userData)) {
         // Read back the produced audio data to all outputs and their channels.
         // The preallocated 'outputViews' already have the correct offsets and
         // sizes into the stack (recall from the ctor that they run backwards).

src/lib/libwebaudio.js

@@ -78,7 +78,7 @@ let LibraryWebAudio = {
 #if WEBAUDIO_DEBUG
       console.log(`emscripten_resume_audio_context_async() callback: New audio state="${EmAudio[contextHandle].state}", ID=${state}`);
 #endif
-      {{{ makeDynCall('viii', 'callback') }}}(contextHandle, state, userData);
+      {{{ makeDynCall('viip', 'callback') }}}(contextHandle, state, userData);
     }
 #if WEBAUDIO_DEBUG
     console.log(`emscripten_resume_audio_context_async() resuming...`);
@@ -162,12 +162,13 @@ let LibraryWebAudio = {
     console.log(`emscripten_start_wasm_audio_worklet_thread_async() adding audioworklet.js...`);
 #endif
 
-    let audioWorkletCreationFailed = () => {
+    let audioWorkletCreationFailed = (err) => {
 #if WEBAUDIO_DEBUG
       // Note about Cross-Origin here: a lack of Cross-Origin-Opener-Policy and
       // Cross-Origin-Embedder-Policy headers to the client request will result
       // in the worklet file failing to load.
       console.error(`emscripten_start_wasm_audio_worklet_thread_async() addModule() failed! Are the Cross-Origin headers being set?`);
+      if (err) console.error(err);
 #endif
       {{{ makeDynCall('viip', 'callback') }}}(contextHandle, 0/*EM_FALSE*/, userData);
     };
@@ -225,7 +226,7 @@ let LibraryWebAudio = {
 #if WEBAUDIO_DEBUG
       console.log(`emscripten_start_wasm_audio_worklet_thread_async() addModule() of main application JS completed`);
 #endif
-      {{{ makeDynCall('viii', 'callback') }}}(contextHandle, 1/*EM_TRUE*/, userData);
+      {{{ makeDynCall('viip', 'callback') }}}(contextHandle, 1/*EM_TRUE*/, userData);
     }).catch(audioWorkletCreationFailed);
   },
 
@@ -272,8 +273,8 @@ let LibraryWebAudio = {
       '_wpn': UTF8ToString(HEAPU32[options]),
       'ap': audioParams,
       'ch': contextHandle,
-      'cb': callback,
-      'ud': userData
+      'cb': BigInt(callback),
+      'ud': BigInt(userData)
     });
   },
 
@@ -297,8 +298,8 @@ let LibraryWebAudio = {
       numberOfOutputs: HEAP32[options+1],
       outputChannelCount: HEAPU32[options+2] ? readChannelCountArray(HEAPU32[options+2]>>2, HEAP32[options+1]) : void 0,
       processorOptions: {
-        'cb': callback,
-        'ud': userData,
+        'cb': BigInt(callback),
+        'ud': BigInt(userData),
         'sc': emscriptenGetContextQuantumSize(contextHandle)
       }
     } : void 0;

test/webaudio/audioworklet_test_shared.inc

@@ -28,6 +28,10 @@ EM_JS(EMSCRIPTEN_WEBAUDIO_T, createTrack, (EMSCRIPTEN_WEBAUDIO_T ctxID, const ch
   var context = emscriptenGetAudioObject(ctxID);
   if (context) {
     var audio = document.createElement('audio');
+
+    // Workaround for UTF8ToString() needing a JS number
+    url = Number(BigInt.asUintN(53, url));
+
     audio.src = UTF8ToString(url);
     audio.loop = looping;
     var track = context.createMediaElementSource(audio);
@@ -82,11 +86,15 @@ void initialised(EMSCRIPTEN_WEBAUDIO_T context, bool success, void* data) {
   emscripten_create_wasm_audio_worklet_processor_async(context, &opts, &processorCreated, NULL);
 }
 
+
 // Common entry point for the mixer tests
 int main() {
-  static char workletStack[AUDIO_STACK_SIZE];
+  char* const emptySpace = malloc(2147483648);
+  (void) emptySpace;
+  char* const workletStack = malloc(AUDIO_STACK_SIZE);
+  //static char workletStack[AUDIO_STACK_SIZE];
   EMSCRIPTEN_WEBAUDIO_T context = emscripten_create_audio_context(NULL);
-  emscripten_start_wasm_audio_worklet_thread_async(context, workletStack, sizeof workletStack, &initialised, NULL);
+  emscripten_start_wasm_audio_worklet_thread_async(context, workletStack, AUDIO_STACK_SIZE, &initialised, NULL);
 #ifndef BROWSER_TEST
   // Special case: browser tests need to exit instantly, interactive tests need to wait
   emscripten_runtime_keepalive_push();