Skip to content

[AUDIO_WORKLET] Support locateFile when loading audio worklet js file #20318

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
FrancoisRecisio wants to merge 2 commits into from
Closed

[AUDIO_WORKLET] Support locateFile when loading audio worklet js file #20318

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3648eb5
main .js cannot find the audio worklet .js file, if it's not in the r…
FrancoisRecisio Sep 22, 2023
f14dd8a
Merge branch 'main' of https://github.com/FrancoisRecisio/emscripten …
FrancoisRecisio Mar 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/lib/libwebaudio.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ let LibraryWebAudio = {

// TODO: In MINIMAL_RUNTIME builds, read this file off of a preloaded Blob,
// and/or embed from a string like with WASM_WORKERS==2 mode.
audioWorklet.addModule('{{{ TARGET_BASENAME }}}.aw.js').then(() => {
audioWorklet.addModule(locateFile('{{{ TARGET_BASENAME }}}.aw.js')).then(() => {
Copy link
Collaborator

@juj juj Apr 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about

audioWorklet.addModule(
#if MINIMAL_RUNTIME
  '{{{ TARGET_BASENAME }}}.aw.js'
#else
  locateFile('{{{ TARGET_BASENAME }}}.aw.js')
#endif
).then(() => {

The locateFile function does not currently exist in MINIMAL_RUNTIME.

Copy link
Collaborator

@RReverser RReverser Apr 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we also need the new URL(...) pattern here as well for ES6 bundlers.

Essentially copy the pattern from regular ww.js workers.

Copy link
Collaborator

@RReverser RReverser Apr 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sbc100 At this point, maybe this should be a parseTools macro for arbitrary resources?

Copy link
Collaborator

@sbc100 sbc100 Apr 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you can think of way to express that that SGTM

Copy link
Collaborator

@juj juj Apr 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since original PR author might not be around, I posted a PR #24044 to gate the MINIMAL_RUNTIME part, and add a test.

parseTools macro and ES6 bundlers are good ideas that can be added in later PRs.

#if WEBAUDIO_DEBUG
console.log(`emscripten_start_wasm_audio_worklet_thread_async() addModule('audioworklet.js') completed`);
#endif
Expand Down