Skip to content

Commit a55981e

Browse files
cwoffendencwoffenden
committed
Suggestions following review
1 parent 27a0573 commit a55981e

7 files changed

+21
-38
lines changed

‎test/test_interactive.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -311,35 +311,35 @@ def test_audio_worklet_stereo_io(self):
311311
os.mkdir('audio_files')
312312
shutil.copy(test_file('webaudio/audio_files/emscripten-beat.mp3'), 'audio_files/')
313313
shutil.copy(test_file('webaudio/audio_files/emscripten-bass.mp3'), 'audio_files/')
314-
self.btest_exit('webaudio/audioworklet_in_out_stereo.c', args=['-sAUDIO_WORKLET', '-sWASM_WORKERS', '-DTEST_AND_EXIT=1'])
314+
self.btest_exit('webaudio/audioworklet_in_out_stereo.c', args=['-sAUDIO_WORKLET', '-sWASM_WORKERS'])
315315

316316
# Tests an AudioWorklet with multiple stereo inputs copying in the processor to multiple stereo outputs (6kB stack)
317317
def test_audio_worklet_2x_stereo_io(self):
318318
os.mkdir('audio_files')
319319
shutil.copy(test_file('webaudio/audio_files/emscripten-beat.mp3'), 'audio_files/')
320320
shutil.copy(test_file('webaudio/audio_files/emscripten-bass.mp3'), 'audio_files/')
321-
self.btest_exit('webaudio/audioworklet_2x_in_out_stereo.c', args=['-sAUDIO_WORKLET', '-sWASM_WORKERS', '-DTEST_AND_EXIT=1'])
321+
self.btest_exit('webaudio/audioworklet_2x_in_out_stereo.c', args=['-sAUDIO_WORKLET', '-sWASM_WORKERS'])
322322

323323
# Tests an AudioWorklet with multiple mono inputs mixing in the processor to a single mono output (2kB stack)
324324
def test_audio_worklet_mono_io(self):
325325
os.mkdir('audio_files')
326326
shutil.copy(test_file('webaudio/audio_files/emscripten-beat-mono.mp3'), 'audio_files/')
327327
shutil.copy(test_file('webaudio/audio_files/emscripten-bass-mono.mp3'), 'audio_files/')
328-
self.btest_exit('webaudio/audioworklet_in_out_mono.c', args=['-sAUDIO_WORKLET', '-sWASM_WORKERS', '-DTEST_AND_EXIT=1'])
328+
self.btest_exit('webaudio/audioworklet_in_out_mono.c', args=['-sAUDIO_WORKLET', '-sWASM_WORKERS'])
329329

330330
# Tests an AudioWorklet with multiple mono inputs copying in the processor to L+R stereo outputs (3kB stack)
331331
def test_audio_worklet_2x_hard_pan_io(self):
332332
os.mkdir('audio_files')
333333
shutil.copy(test_file('webaudio/audio_files/emscripten-beat-mono.mp3'), 'audio_files/')
334334
shutil.copy(test_file('webaudio/audio_files/emscripten-bass-mono.mp3'), 'audio_files/')
335-
self.btest_exit('webaudio/audioworklet_2x_in_hard_pan.c', args=['-sAUDIO_WORKLET', '-sWASM_WORKERS', '-DTEST_AND_EXIT=1'])
335+
self.btest_exit('webaudio/audioworklet_2x_in_hard_pan.c', args=['-sAUDIO_WORKLET', '-sWASM_WORKERS'])
336336

337337
# Tests an AudioWorklet with multiple stereo inputs mixing in the processor via a parameter to a single stereo output (6kB stack)
338338
def test_audio_worklet_params_mixing(self):
339339
os.mkdir('audio_files')
340340
shutil.copy(test_file('webaudio/audio_files/emscripten-beat.mp3'), 'audio_files/')
341341
shutil.copy(test_file('webaudio/audio_files/emscripten-bass.mp3'), 'audio_files/')
342-
self.btest_exit('webaudio/audioworklet_params_mixing.c', args=['-sAUDIO_WORKLET', '-sWASM_WORKERS', '-DTEST_AND_EXIT=1'])
342+
self.btest_exit('webaudio/audioworklet_params_mixing.c', args=['-sAUDIO_WORKLET', '-sWASM_WORKERS'])
343343

344344

345345
class interactive64(interactive):

‎test/webaudio/audioworklet_2x_in_hard_pan.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include "audioworklet_test_shared.inc"
1515

1616
// Callback to process and copy the audio tracks
17-
bool process(int numInputs, const AudioSampleFrame* inputs, int numOutputs, AudioSampleFrame* outputs, int __unused numParams, const AudioParamFrame* __unused params, void* __unused data) {
17+
bool process(int numInputs, const AudioSampleFrame* inputs, int numOutputs, AudioSampleFrame* outputs, int numParams, const AudioParamFrame* params, void* data) {
1818
#ifdef TEST_AND_EXIT
1919
audioProcessedCount++;
2020
#endif
@@ -46,7 +46,7 @@ bool process(int numInputs, const AudioSampleFrame* inputs, int numOutputs, Audi
4646
}
4747

4848
// Audio processor created, now register the audio callback
49-
void processorCreated(EMSCRIPTEN_WEBAUDIO_T context, bool success, void* __unused data) {
49+
void processorCreated(EMSCRIPTEN_WEBAUDIO_T context, bool success, void* data) {
5050
assert(success && "Audio worklet failed in processorCreated()");
5151
emscripten_out("Audio worklet processor created");
5252
emscripten_out("Click to toggle audio playback");

‎test/webaudio/audioworklet_2x_in_out_stereo.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include "audioworklet_test_shared.inc"
1414

1515
// Callback to process and copy the audio tracks
16-
bool process(int numInputs, const AudioSampleFrame* inputs, int numOutputs, AudioSampleFrame* outputs, int __unused numParams, const AudioParamFrame* __unused params, void* __unused data) {
16+
bool process(int numInputs, const AudioSampleFrame* inputs, int numOutputs, AudioSampleFrame* outputs, int numParams, const AudioParamFrame* params, void* data) {
1717
#ifdef TEST_AND_EXIT
1818
audioProcessedCount++;
1919
#endif
@@ -45,7 +45,7 @@ bool process(int numInputs, const AudioSampleFrame* inputs, int numOutputs, Audi
4545
}
4646

4747
// Audio processor created, now register the audio callback
48-
void processorCreated(EMSCRIPTEN_WEBAUDIO_T context, bool success, void* __unused data) {
48+
void processorCreated(EMSCRIPTEN_WEBAUDIO_T context, bool success, void* data) {
4949
assert(success && "Audio worklet failed in processorCreated()");
5050
emscripten_out("Audio worklet processor created");
5151
emscripten_out("Click to toggle audio playback");

‎test/webaudio/audioworklet_in_out_mono.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include "audioworklet_test_shared.inc"
1515

1616
// Callback to process and mix the audio tracks
17-
bool process(int numInputs, const AudioSampleFrame* inputs, int numOutputs, AudioSampleFrame* outputs, int __unused numParams, const AudioParamFrame* __unused params, void* __unused data) {
17+
bool process(int numInputs, const AudioSampleFrame* inputs, int numOutputs, AudioSampleFrame* outputs, int numParams, const AudioParamFrame* params, void* data) {
1818
#ifdef TEST_AND_EXIT
1919
audioProcessedCount++;
2020
#endif
@@ -53,7 +53,7 @@ bool process(int numInputs, const AudioSampleFrame* inputs, int numOutputs, Audi
5353
}
5454

5555
// Audio processor created, now register the audio callback
56-
void processorCreated(EMSCRIPTEN_WEBAUDIO_T context, bool success, void* __unused data) {
56+
void processorCreated(EMSCRIPTEN_WEBAUDIO_T context, bool success, void* data) {
5757
assert(success && "Audio worklet failed in processorCreated()");
5858
emscripten_out("Audio worklet processor created");
5959
emscripten_out("Click to toggle audio playback");

‎test/webaudio/audioworklet_in_out_stereo.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include "audioworklet_test_shared.inc"
1515

1616
// Callback to process and mix the audio tracks
17-
bool process(int numInputs, const AudioSampleFrame* inputs, int numOutputs, AudioSampleFrame* outputs, int __unused numParams, const AudioParamFrame* __unused params, void* __unused data) {
17+
bool process(int numInputs, const AudioSampleFrame* inputs, int numOutputs, AudioSampleFrame* outputs, int numParams, const AudioParamFrame* params, void* data) {
1818
#ifdef TEST_AND_EXIT
1919
audioProcessedCount++;
2020
#endif
@@ -53,7 +53,7 @@ bool process(int numInputs, const AudioSampleFrame* inputs, int numOutputs, Audi
5353
}
5454

5555
// Audio processor created, now register the audio callback
56-
void processorCreated(EMSCRIPTEN_WEBAUDIO_T context, bool success, void* __unused data) {
56+
void processorCreated(EMSCRIPTEN_WEBAUDIO_T context, bool success, void* data) {
5757
assert(success && "Audio worklet failed in processorCreated()");
5858
emscripten_out("Audio worklet processor created");
5959
emscripten_out("Click to toggle audio playback");

‎test/webaudio/audioworklet_params_mixing.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include "audioworklet_test_shared.inc"
1717

1818
// Callback to process and mix the audio tracks
19-
bool process(int numInputs, const AudioSampleFrame* inputs, int numOutputs, AudioSampleFrame* outputs, int numParams, const AudioParamFrame* params, void* __unused data) {
19+
bool process(int numInputs, const AudioSampleFrame* inputs, int numOutputs, AudioSampleFrame* outputs, int numParams, const AudioParamFrame* params, void* data) {
2020
#ifdef TEST_AND_EXIT
2121
audioProcessedCount++;
2222
#endif
@@ -92,7 +92,7 @@ EM_JS(void, doFade, (EMSCRIPTEN_AUDIO_WORKLET_NODE_T workletID), {
9292
})
9393

9494
// Registered keypress event to call the JS doFade()
95-
bool onPress(int __unused type, const EmscriptenKeyboardEvent* e, void* data) {
95+
bool onPress(int type, const EmscriptenKeyboardEvent* e, void* data) {
9696
if (!e->repeat && data) {
9797
emscripten_out("Toggling fade");
9898
doFade(VOIDP_2_WA(data));
@@ -101,7 +101,7 @@ bool onPress(int __unused type, const EmscriptenKeyboardEvent* e, void* data) {
101101
}
102102

103103
// Audio processor created, now register the audio callback
104-
void processorCreated(EMSCRIPTEN_WEBAUDIO_T context, bool success, void* __unused data) {
104+
void processorCreated(EMSCRIPTEN_WEBAUDIO_T context, bool success, void* data) {
105105
assert(success && "Audio worklet failed in processorCreated()");
106106
emscripten_out("Audio worklet processor created");
107107
emscripten_out("Click to toggle audio playback");
@@ -140,7 +140,7 @@ void processorCreated(EMSCRIPTEN_WEBAUDIO_T context, bool success, void* __unuse
140140
}
141141

142142
// Worklet thread inited, now create the audio processor
143-
void initialisedWithParams(EMSCRIPTEN_WEBAUDIO_T context, bool success, void* __unused data) {
143+
void initialisedWithParams(EMSCRIPTEN_WEBAUDIO_T context, bool success, void* data) {
144144
assert(success && "Audio worklet failed initialised()");
145145
emscripten_out("Audio worklet initialised");
146146

‎test/webaudio/audioworklet_test_shared.inc‎

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@
55
// Helper for MEMORY64 to cast a void* to an audio context or type
66
#define VOIDP_2_WA(ptr) ((EMSCRIPTEN_WEBAUDIO_T) (intptr_t) ptr)
77

8-
// Attribute that marks a function, parameter, variable, etc., as unused
9-
// (silencing any -Wunused warnings).
10-
#ifndef __unused
11-
#define __unused __attribute__((unused))
12-
#endif
138

149
// Count the audio callbacks and return after 375 frames (1 second with the
1510
// default 128 size).
@@ -18,13 +13,8 @@
1813
//
1914
#ifdef TEST_AND_EXIT
2015
volatile int audioProcessedCount = 0;
21-
bool playedAndMixed(double __unused time, void* __unused data) {
22-
#if TEST_AND_EXIT > 0
23-
// Special interactive case to play for 10 seconds
24-
if (audioProcessedCount >= 3750) {
25-
#else
16+
bool playedAndMixed(double time, void* data) {
2617
if (audioProcessedCount >= 375) {
27-
#endif
2818
emscripten_force_exit(0);
2919
return false;
3020
}
@@ -42,12 +32,9 @@ EM_JS(EMSCRIPTEN_WEBAUDIO_T, createTrack, (EMSCRIPTEN_WEBAUDIO_T ctxID, const ch
4232
var context = emscriptenGetAudioObject(ctxID);
4333
if (context) {
4434
var audio = document.createElement('audio');
45-
#if __wasm64__
4635
// Number() wrapper is a workaround for UTF8ToString() needing a JS number
4736
// and from64() not being available in EM_JS macros. Fix in UTF8ToString?
48-
url = Number(url);
49-
#endif
50-
audio.src = UTF8ToString(url);
37+
audio.src = UTF8ToString(Number(url));
5138
audio.loop = looping;
5239
var track = context.createMediaElementSource(audio);
5340
return emscriptenRegisterAudioObject(track);
@@ -72,7 +59,7 @@ EM_JS(void, toggleTrack, (EMSCRIPTEN_WEBAUDIO_T srcID), {
7259
})
7360

7461
// Registered click event to (1) enable audio playback and (2) toggle playing the tracks
75-
bool onClick(int __unused type, const EmscriptenMouseEvent* __unused e, void* data) {
62+
bool onClick(int type, const EmscriptenMouseEvent* e, void* data) {
7663
EMSCRIPTEN_WEBAUDIO_T ctx = VOIDP_2_WA(data);
7764
if (emscripten_audio_context_state(ctx) != AUDIO_CONTEXT_STATE_RUNNING) {
7865
emscripten_out("Resuming playback");
@@ -88,7 +75,7 @@ bool onClick(int __unused type, const EmscriptenMouseEvent* __unused e, void* da
8875
void processorCreated(EMSCRIPTEN_WEBAUDIO_T context, bool success, void* data);
8976

9077
// Worklet thread inited, now create the audio processor
91-
void initialised(EMSCRIPTEN_WEBAUDIO_T context, bool success, void* __unused data) {
78+
void initialised(EMSCRIPTEN_WEBAUDIO_T context, bool success, void* data) {
9279
assert(success && "Audio worklet failed in initialised()");
9380
emscripten_out("Audio worklet initialised");
9481

@@ -112,13 +99,9 @@ int main(void) {
11299

113100
#ifdef TEST_AND_EXIT
114101
// We're in the test harness and exiting is via playedAndMixed()
115-
#if TEST_AND_EXIT > 0
116-
emscripten_out("In test mode, will exit after 10 seconds of playback");
117-
#else
118102
emscripten_out("In test mode, will exit after 1 second of playback");
119103
#endif
120104
emscripten_exit_with_live_runtime();
121-
#endif
122105

123106
return EXIT_SUCCESS;
124107
}

0 commit comments

Comments
 (0)