Merge pull request #93 from yuchanns/audio-patch

feat(audio): use ScriptNodeProcessor for WASM

Author: cloudwu

.github/workflows/pages.yml

@@ -38,11 +38,11 @@ jobs:
           soluna_path: "."
           debug: ${{ github.event.inputs.debug }}
 
-      # - name: Build WASM side module (sample)
-      #   uses: ./.github/actions/sample
-      #   id: sample
-      #   with:
-      #     soluna_path: "."
+      - name: Build WASM side module (sample)
+        uses: ./.github/actions/sample
+        id: sample
+        with:
+          soluna_path: "."
 
       - name: Install web build tools
         run: |
@@ -60,9 +60,9 @@ jobs:
             cp "${{ steps.build.outputs.SOLUNA_WASM_MAP_PATH }}" web/static/runtime/soluna.wasm.map
           fi
 
-      # - name: Copy WASM side module into runtime
-      #   run: |
-      #     cp "${{ steps.sample.outputs.SAMPLE_WASM_PATH }}" web/static/runtime/sample.wasm
+      - name: Copy WASM side module into runtime
+        run: |
+          cp "${{ steps.sample.outputs.SAMPLE_WASM_PATH }}" web/static/runtime/sample.wasm
 
       - name: Setup Hugo
         uses: peaceiris/actions-hugo@v3

make.lua

@@ -85,8 +85,9 @@ lm:conf {
 		flags = {
 			"-Wall",
 			"-pthread",
+			"-fPIC",
 			"--use-port=emdawnwebgpu",
-			lm.mode == "debug" and "-fwasm-exceptions",
+			"-fwasm-exceptions",
 		},
 		links = {
 			"idbfs.js",
@@ -101,10 +102,8 @@ lm:conf {
 			"-s USE_PTHREADS=1",
 			"-s PTHREAD_POOL_SIZE='Math.max(2,navigator.hardwareConcurrency)'",
 			"-s PTHREAD_POOL_SIZE_STRICT=2",
-			"-s AUDIO_WORKLET=1",
-			"-s WASM_WORKERS=1",
-			"-s ASYNCIFY=1",
-			lm.mode == "debug" and "-fwasm-exceptions",
+			"-fwasm-exceptions",
+
 			lm.mode == "debug" and "-gsource-map",
 			lm.mode == "debug" and "-s EXCEPTION_STACK_TRACES=1",
 			lm.mode == "debug" and "-s ASSERTIONS=2",
@@ -115,7 +114,6 @@ lm:conf {
 		defines = {
 			"_POSIX_C_SOURCE=200809L",
 			"_GNU_SOURCE",
-			"MA_ENABLE_AUDIO_WORKLETS",
 		},
 	},
 	defines = {
@@ -139,6 +137,13 @@ lm:import "clibs/soluna/make.lua"
 
 lm:exe "soluna" {
 	deps = deps,
+	emcc = {
+		ldflags = {
+			"-s MAIN_MODULE=2",
+			"-Wl,-u,emscripten_builtin_memalign",
+			"-Wl,--export=emscripten_builtin_memalign",
+		},
+	},
 }
 
 lm:dll "sample" {

script/build_web.lua

@@ -310,7 +310,7 @@ local example_paths = exec_lines("find " .. shell_quote(soluna_dir .. "/test") .
 table.sort(example_paths)
 for _, path in ipairs(example_paths) do
   local name = path:match("([^/]+)%.lua$")
-  if name and name ~= "extlua" then
+  if name then
     examples[#examples + 1] = {
       id = name,
       title = titleize(name),

src/audio.c

@@ -168,6 +168,8 @@ laudio_init(lua_State *L) {
 	if (r != MA_SUCCESS) {
 		return luaL_error(L, "ma_engine_init() error : %s", ma_result_description(r));
 	}
+	e->rm.config.decodedFormat = ma_format_f32;
+	e->rm.config.decodedSampleRate = ma_engine_get_sample_rate(&e->engine);
 	lua_pushlightuserdata(L, (void *)e);
 
 	return 2;

src/lualib/main.lua

@@ -51,6 +51,8 @@ local init_func_temp = [=[
 	return load(file.load(filename), "@"..filename)
 ]=]
 
+local api = {}
+
 local function start(config)
 	local boot = require "ltask.bootstrap"
 	local mqueue = require "ltask.mqueue"
@@ -124,6 +126,7 @@ local function start(config)
 		send_log_ud = logger_ud,
 		mqueue = appmsg_queue,
 		cleanup = function()
+			api.deinit()
 			while not send_message "cleanup" do end
 			bootstrap.wait(ctx)
 			mqueue.delete(appmsg_queue)
@@ -158,7 +161,6 @@ if args.cpath then
 	package.cpath = args.cpath
 end
 
-local api = {}
 local audio_device
 
 function api.start(app)
@@ -226,5 +228,12 @@ function api.init(desc)
 	audio.device, audio_device = audio.init()
 end
 
-return api
+function api.deinit()
+	if audio_device then
+		local audio = require "soluna.audio"
+		audio.deinit(audio_device)
+		audio_device = nil
+	end
+end
 
+return api

src/service/audio.lua

@@ -62,9 +62,6 @@ function S.fetch()
 end
 
 function S.quit()
-	if DEVICE then
-		audio.deinit(DEVICE)
-	end
 	DEVICE = nil
 end
 

web/assets/playframe.js

@@ -261,14 +261,14 @@
       return;
     }
 
-    // let sampleWasmBuffer = null;
-    // try {
-    //   sampleWasmBuffer = await loadBuffer(`${base}/runtime/sample.wasm`);
-    // } catch (err) {
-    //   setStatus("Failed to load external module sample.wasm.");
-    //   setNote(err.message);
-    //   return;
-    // }
+    let sampleWasmBuffer = null;
+    try {
+      sampleWasmBuffer = await loadBuffer(`${base}/runtime/sample.wasm`);
+    } catch (err) {
+      setStatus("Failed to load external module sample.wasm.");
+      setNote(err.message);
+      return;
+    }
 
     setStatus("Preparing fonts...");
     let fontZip;
@@ -280,7 +280,7 @@
       return;
     }
 
-    const mainGame = "entry : main.lua\nhigh_dpi : true\ntext_sampler :\n  min_filter : linear\n  mag_filter : linear\n";
+    const mainGame = "entry : main.lua\nhigh_dpi : true\ntext_sampler :\n  min_filter : linear\n  mag_filter : linear\nextlua_entry : extlua_init\nextlua_preload : sample\n";
     const mainLuaBytes = new TextEncoder().encode(sourceText);
     const mainGameBytes = new TextEncoder().encode(mainGame);
     const mainZip = createZip([
@@ -315,15 +315,15 @@
           Module.addRunDependency("asset-zip");
           Module.addRunDependency("main-zip");
           Module.addRunDependency("font-zip");
-          // Module.addRunDependency("sample-wasm");
+          Module.addRunDependency("sample-wasm");
           Module.FS.writeFile("/data/asset.zip", new Uint8Array(assetBuffer), { canOwn: true });
           Module.FS.writeFile("/data/main.zip", mainZip, { canOwn: true });
           Module.FS.writeFile("/data/font.zip", fontZip, { canOwn: true });
-          // Module.FS.writeFile("/data/sample.wasm", new Uint8Array(sampleWasmBuffer), { canOwn: true });
+          Module.FS.writeFile("/data/sample.wasm", new Uint8Array(sampleWasmBuffer), { canOwn: true });
           Module.removeRunDependency("asset-zip");
           Module.removeRunDependency("main-zip");
           Module.removeRunDependency("font-zip");
-          // Module.removeRunDependency("sample-wasm");
+          Module.removeRunDependency("sample-wasm");
         },
       ],
       onAbort(reason) {