Re-adding f32 to extras, as needed by tests

Yahweasel · Feb 21, 2024 · df33003 · df33003
1 parent 09bf653
commit df33003
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/configs/configs/all/ffmpeg-config.txt b/configs/configs/all/ffmpeg-config.txt
@@ -96,6 +96,10 @@
 --enable-encoder=png
 --enable-parser=webp
 --enable-decoder=webp
+--enable-demuxer=pcm_f32le
+--enable-muxer=pcm_f32le
+--enable-decoder=pcm_f32le
+--enable-encoder=pcm_f32le
 --enable-decoder=alac
 --enable-encoder=alac
 --enable-decoder=prores

diff --git a/configs/configs/extras/ffmpeg-config.txt b/configs/configs/extras/ffmpeg-config.txt
@@ -17,6 +17,10 @@
 --enable-encoder=png
 --enable-parser=webp
 --enable-decoder=webp
+--enable-demuxer=pcm_f32le
+--enable-muxer=pcm_f32le
+--enable-decoder=pcm_f32le
+--enable-encoder=pcm_f32le
 --enable-decoder=alac
 --enable-encoder=alac
 --enable-decoder=prores

diff --git a/configs/mkconfigs.js b/configs/mkconfigs.js
@@ -102,6 +102,9 @@ const configsRaw = [
         "parser-gif", "codec-gif", "parser-mjpeg",
         "codec-mjpeg", "parser-png", "codec-png", "parser-webp", "decoder-webp",
 
+        // Raw float32
+        "format-pcm_f32le", "codec-pcm_f32le",
+
         // Apple-flavored lossless
         "codec-alac", "codec-prores", "codec-qtrle",
 

diff --git a/libav.in.js b/libav.in.js
@@ -230,11 +230,12 @@
         opts = opts || {};
         var base = opts.base || libav.base;
         var t = target(opts);
-        var toImport = libav.toImport ||  base + "/libav-@VER-@CONFIG@DBG." + t + ".js";
+        var toImport = opts.toImport || libav.toImport ||
+            base + "/libav-@VER-@CONFIG@DBG." + t + ".js";
         var ret;
 
         var mode = "direct";
-        if (t.indexOf("thr") === 0)
+        if (t === "thr")
             mode = "threads";
         else if (!nodejs && !opts.noworker && typeof Worker !== "undefined")
             mode = "worker";