@tongue-core/engine 0.1.0-rc.5 → 0.1.0-rc.6

package/dist/assets/codecs/wav.d.ts

@@ -1,3 +1,6 @@
 import type { PcmAudio } from "./types.js";
 export declare function readWav(bytes: Uint8Array): PcmAudio;
+/** 32-bit float WAV: every sample kept exactly as it is, with no dither and no clipping. For audio
+ *  between steps (a stem on its way to a processor), where 16 bits would round it each time. */
+export declare function writeFloatWav(audio: PcmAudio): Uint8Array;
 export declare function writeWav(audio: PcmAudio, seed?: number): Uint8Array;

package/dist/assets/codecs/wav.js

@@ -96,7 +96,9 @@ function random(seed) {
         return ((t ^ (t >>> 14)) >>> 0) / 4294967296;
     };
 }
-export function writeWav(audio, seed = 0x5eed) {
+/** A WAV header for `frames` of `channels` samples of `bits` each, in the given format; the
+ *  samples go after it, at byte 44. */
+function header(audio, format, bits) {
     const channels = audio.channels.length;
     const frames = audio.channels[0]?.length ?? 0;
     if (channels === 0)
@@ -105,21 +107,39 @@ export function writeWav(audio, seed = 0x5eed) {
         fail("channels have different lengths");
     if (!Number.isInteger(audio.sampleRate) || audio.sampleRate <= 0)
         fail(`bad sample rate ${audio.sampleRate}`);
-    const dataLength = frames * channels * 2;
+    const bytes = bits / 8;
+    const dataLength = frames * channels * bytes;
     const out = new Uint8Array(44 + dataLength);
     const view = new DataView(out.buffer);
     out.set([0x52, 0x49, 0x46, 0x46]); // RIFF
     view.setUint32(4, 36 + dataLength, true);
     out.set([0x57, 0x41, 0x56, 0x45, 0x66, 0x6d, 0x74, 0x20], 8); // WAVEfmt␠
     view.setUint32(16, 16, true);
-    view.setUint16(20, FORMAT_PCM, true);
+    view.setUint16(20, format, true);
     view.setUint16(22, channels, true);
     view.setUint32(24, audio.sampleRate, true);
-    view.setUint32(28, audio.sampleRate * channels * 2, true);
-    view.setUint16(32, channels * 2, true);
-    view.setUint16(34, 16, true);
+    view.setUint32(28, audio.sampleRate * channels * bytes, true);
+    view.setUint16(32, channels * bytes, true);
+    view.setUint16(34, bits, true);
     out.set([0x64, 0x61, 0x74, 0x61], 36); // data
     view.setUint32(40, dataLength, true);
+    return { out, view, frames };
+}
+/** 32-bit float WAV: every sample kept exactly as it is, with no dither and no clipping. For audio
+ *  between steps (a stem on its way to a processor), where 16 bits would round it each time. */
+export function writeFloatWav(audio) {
+    const { out, view, frames } = header(audio, FORMAT_FLOAT, 32);
+    let at = 44;
+    for (let f = 0; f < frames; f++) {
+        for (const channel of audio.channels) {
+            view.setFloat32(at, channel[f] ?? 0, true);
+            at += 4;
+        }
+    }
+    return out;
+}
+export function writeWav(audio, seed = 0x5eed) {
+    const { view, out, frames } = header(audio, FORMAT_PCM, 16);
     // TPDF dither: the difference of two uniform variables spans ±1 LSB with a triangular
     // distribution, which decorrelates the rounding error from the signal.
     const next = random(seed);

package/dist/audio/mix.d.ts

@@ -43,4 +43,10 @@ export interface WindowInput {
 /** The part of the soundtrack between two frames: what a player mixes a few seconds at a time, so
  *  an hour-long film never needs its whole soundtrack in memory. Exactly that part of `mix`, except
  *  where a clip changes speed (time-stretching is padded, not continued from the window before). */
-export declare function mixWindow({ fps, clips, sounds, from, to }: WindowInput): PcmAudio;
+export declare function mixWindow(input: WindowInput): PcmAudio;
+/** The peak limiter the soundtrack ends with, on audio summed some other way (stems mixed
+ *  separately, then added together). Per sample, so `limitAudio(busWindow(x))` is `mixWindow(x)`. */
+export declare function limitAudio(audio: PcmAudio): PcmAudio;
+/** What `mixWindow` sums before it limits: the clips and sounds between two frames, stereo at
+ *  48 kHz, unlimited. A stem (some of a film's clips, mixed on their own) is this over those clips. */
+export declare function busWindow({ fps, clips, sounds, from, to }: WindowInput): PcmAudio;

package/dist/audio/mix.js

@@ -216,7 +216,17 @@ const STRETCH_PAD = 4 * WINDOW;
 /** The part of the soundtrack between two frames: what a player mixes a few seconds at a time, so
  *  an hour-long film never needs its whole soundtrack in memory. Exactly that part of `mix`, except
  *  where a clip changes speed (time-stretching is padded, not continued from the window before). */
-export function mixWindow({ fps, clips, sounds, from, to }) {
+export function mixWindow(input) {
+    return limitAudio(busWindow(input));
+}
+/** The peak limiter the soundtrack ends with, on audio summed some other way (stems mixed
+ *  separately, then added together). Per sample, so `limitAudio(busWindow(x))` is `mixWindow(x)`. */
+export function limitAudio(audio) {
+    return { sampleRate: audio.sampleRate, channels: audio.channels.map(limit) };
+}
+/** What `mixWindow` sums before it limits: the clips and sounds between two frames, stereo at
+ *  48 kHz, unlimited. A stem (some of a film's clips, mixed on their own) is this over those clips. */
+export function busWindow({ fps, clips, sounds, from, to }) {
     const start = Math.round((from / fps) * SAMPLE_RATE);
     const length = Math.max(0, Math.ceil((to / fps) * SAMPLE_RATE) - start);
     const left = new Float32Array(length), right = new Float32Array(length);
@@ -242,5 +252,5 @@ export function mixWindow({ fps, clips, sounds, from, to }) {
         add(left, sound, at, gain);
         add(right, sound, at, gain);
     }
-    return { sampleRate: SAMPLE_RATE, channels: [limit(left), limit(right)] };
+    return { sampleRate: SAMPLE_RATE, channels: [left, right] };
 }

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 export { FilmRenderer, sizeAtScale, type FrameOptions, type FrameSize, type DrawnFrame, type ImageUpload } from "./render/renderer.js";
 export { collectSounds, audioClips } from "./render/sounds.js";
-export { mix, mixWindow, SAMPLE_RATE, SOUND_SECONDS, type MixInput, type WindowInput, type ClipAudio } from "./audio/mix.js";
+export { mix, mixWindow, busWindow, limitAudio, SAMPLE_RATE, SOUND_SECONDS, type MixInput, type WindowInput, type ClipAudio } from "./audio/mix.js";
 export { loadAssets, AssetShelf, ImageNotLoaded, imageOf, videoOf, audioOf, parseVideoInfo, parseProxyInfo, qoiSize, imageSize, AssetError, type LoadedAssets, type LoadedImage, type LoadedVideo, type VideoInfo, type ProxyInfo, type Fetcher, type LoadOptions } from "./assets/store.js";
 export { importedPath, importedFiles, videoInfoPath, videoPosterPath, videoProxyDir, videoProxyPath, PROXY_SEGMENT_SECONDS, PROXY_KEYFRAME_SECONDS, type AssetKey } from "./assets/paths.js";
 export { demuxMp4, sampleData, Mp4Error, type Mp4Video, type Mp4Sample } from "./media/mp4.js";
@@ -15,7 +15,7 @@ export { decodePng } from "./assets/codecs/png.js";
 export { decodeJpeg } from "./assets/codecs/jpeg.js";
 export { encodeQoi, decodeQoi } from "./assets/codecs/qoi.js";
 export { resizeImage } from "./assets/codecs/resize.js";
-export { readWav, writeWav } from "./assets/codecs/wav.js";
+export { readWav, writeWav, writeFloatWav } from "./assets/codecs/wav.js";
 export { woff2ToSfnt } from "./text/woff2.js";
 export { parseFont } from "./text/ttf.js";
 export type { RgbaImage, PcmAudio } from "./assets/codecs/types.js";

package/dist/index.js

@@ -3,7 +3,7 @@
 // raster), so the same frame is byte-identical in Bun, browsers and Workers.
 export { FilmRenderer, sizeAtScale } from "./render/renderer.js";
 export { collectSounds, audioClips } from "./render/sounds.js";
-export { mix, mixWindow, SAMPLE_RATE, SOUND_SECONDS } from "./audio/mix.js";
+export { mix, mixWindow, busWindow, limitAudio, SAMPLE_RATE, SOUND_SECONDS } from "./audio/mix.js";
 export { loadAssets, AssetShelf, ImageNotLoaded, imageOf, videoOf, audioOf, parseVideoInfo, parseProxyInfo, qoiSize, imageSize, AssetError } from "./assets/store.js";
 export { importedPath, importedFiles, videoInfoPath, videoPosterPath, videoProxyDir, videoProxyPath, PROXY_SEGMENT_SECONDS, PROXY_KEYFRAME_SECONDS } from "./assets/paths.js";
 export { demuxMp4, sampleData, Mp4Error } from "./media/mp4.js";
@@ -16,6 +16,6 @@ export { decodePng } from "./assets/codecs/png.js";
 export { decodeJpeg } from "./assets/codecs/jpeg.js";
 export { encodeQoi, decodeQoi } from "./assets/codecs/qoi.js";
 export { resizeImage } from "./assets/codecs/resize.js";
-export { readWav, writeWav } from "./assets/codecs/wav.js";
+export { readWav, writeWav, writeFloatWav } from "./assets/codecs/wav.js";
 export { woff2ToSfnt } from "./text/woff2.js";
 export { parseFont } from "./text/ttf.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tongue-core/engine",
-  "version": "0.1.0-rc.5",
+  "version": "0.1.0-rc.6",
   "description": "Frame to pixels for Tongue films: evaluate, layout, paint and rasterize, deterministic everywhere.",
   "type": "module",
   "license": "MIT",
@@ -26,7 +26,7 @@
     "README.md"
   ],
   "dependencies": {
-    "@tongue-core/film": "0.1.0-rc.5"
+    "@tongue-core/film": "0.1.0-rc.6"
   },
   "publishConfig": {
     "access": "public"