@omnimedia/omnitool 1.1.0-10 → 1.1.0-11

package/x/demo/routines/waveform-test.d.ts

@@ -1 +1,2 @@
-export declare function waveformTest(): Promise<void>;
+import { Driver } from "../../driver/driver.js";
+export declare function waveformTest(driver: Driver): Promise<void>;

package/x/demo/routines/waveform-test.js

@@ -1,8 +1,8 @@
 import { Waveform } from "../../timeline/parts/waveform.js";
-export async function waveformTest() {
+export async function waveformTest(driver) {
     const container = document.querySelector(".waveform-demo");
     const widthSlider = document.querySelector(".width");
-    const waveform = await Waveform.init("/assets/temp/gl.mp4", container);
+    const waveform = await Waveform.init(driver, "/assets/temp/gl.mp4", container);
     widthSlider.addEventListener("change", () => {
         const width = +widthSlider.value;
         waveform.width = width;

package/x/demo/routines/waveform-test.js.map

@@ -1 +1 @@
-{"version":3,"file":"waveform-test.js","sourceRoot":"","sources":["../../../s/demo/routines/waveform-test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,kCAAkC,CAAA;AAEzD,MAAM,CAAC,KAAK,UAAU,YAAY;IACjC,MAAM,SAAS,GAAG,QAAQ,CAAC,aAAa,CAAC,gBAAgB,CAAgB,CAAA;IACzE,MAAM,WAAW,GAAG,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAqB,CAAA;IACxE,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,qBAAqB,EAAE,SAAS,CAAC,CAAA;IAEtE,WAAW,CAAC,gBAAgB,CAAC,QAAQ,EAAE,GAAG,EAAE;QAC3C,MAAM,KAAK,GAAG,CAAC,WAAW,CAAC,KAAK,CAAA;QAChC,QAAQ,CAAC,KAAK,GAAG,KAAK,CAAA;IACvB,CAAC,CAAC,CAAA;AACH,CAAC"}
+{"version":3,"file":"waveform-test.js","sourceRoot":"","sources":["../../../s/demo/routines/waveform-test.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,QAAQ,EAAC,MAAM,kCAAkC,CAAA;AAEzD,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,MAAc;IAChD,MAAM,SAAS,GAAG,QAAQ,CAAC,aAAa,CAAC,gBAAgB,CAAgB,CAAA;IACzE,MAAM,WAAW,GAAG,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAqB,CAAA;IACxE,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,qBAAqB,EAAE,SAAS,CAAC,CAAA;IAE9E,WAAW,CAAC,gBAAgB,CAAC,QAAQ,EAAE,GAAG,EAAE;QAC3C,MAAM,KAAK,GAAG,CAAC,WAAW,CAAC,KAAK,CAAA;QAChC,QAAQ,CAAC,KAAK,GAAG,KAAK,CAAA;IACvB,CAAC,CAAC,CAAA;AACH,CAAC"}

package/x/driver/driver.d.ts

@@ -8,7 +8,7 @@ export declare class Driver {
     #private;
     machina: Machina;
     thread: Thread<DriverSchematic>;
-    static setup(options: DriverOptions): Promise<Driver>;
+    static setup(options?: DriverOptions): Promise<Driver>;
     constructor(machina: Machina, thread: Thread<DriverSchematic>);
     hello(): Promise<void>;
     getAudioDuration(source: DecoderSource): Promise<any>;

package/x/driver/driver.js

@@ -10,7 +10,7 @@ export class Driver {
         const machina = new Machina();
         const thread = await Comrade.thread({
             label: "OmnitoolDriver",
-            workerUrl: options.workerUrl,
+            workerUrl: options?.workerUrl ?? "/node_modules/@omnimedia/omnitool/x/driver/driver.bundle.min.js",
             setupHost: setupDriverHost(machina),
         });
         return new this(machina, thread);

package/x/driver/driver.js.map

@@ -1 +1 @@
-{"version":3,"file":"driver.js","sourceRoot":"","sources":["../../s/driver/driver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"driver.js","sourceRoot":"","sources":["../../s/driver/driver.ts"],"names":[],"mappings":"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"}

package/x/index.html

@@ -65,7 +65,7 @@ canvas {
 }
 
 </style>
-					<script type=module src="demo/demo.bundle.min.js?v=a1a457609cb3"></script>
+					<script type=module src="demo/demo.bundle.min.js?v=edf37f408a28"></script>
 
 
 		<meta name="theme-color" content="#3cff9c">
@@ -85,7 +85,7 @@ canvas {
 				<body>
 
 	<section>
-		<h1>Omnitool <small>v1.1.0-10</small></h1>
+		<h1>Omnitool <small>v1.1.0-11</small></h1>
 		<button class=fetch>fetch</button>
 		<input type="file" class="file-input">
 		<div class=results></div>

package/x/timeline/parts/compositor/export.d.ts

@@ -1,9 +1,11 @@
 import { TimelineFile } from "../basics.js";
+import { Driver } from "../../../driver/driver.js";
 import { DecoderSource } from "../../../driver/fns/schematic.js";
 export declare class Export {
     #private;
+    private driver;
     private framerate;
     private resolveMedia;
-    constructor(framerate?: number, resolveMedia?: (hash: string) => DecoderSource);
+    constructor(driver: Driver, framerate?: number, resolveMedia?: (hash: string) => DecoderSource);
     render(timeline: TimelineFile): Promise<void>;
 }

package/x/timeline/parts/compositor/export.js

@@ -1,15 +1,16 @@
-import { context } from "../../../context.js";
 import { fixedStep } from "./parts/schedulers.js";
 import { makeWebCodecsSampler } from "./samplers/webcodecs.js";
 import { buildWebCodecsNodeTree } from "./parts/webcodecs-tree.js";
 export class Export {
+    driver;
     framerate;
     resolveMedia;
     #sampler;
-    constructor(framerate = 30, resolveMedia = _hash => "/assets/temp/gl.mp4") {
+    constructor(driver, framerate = 30, resolveMedia = _hash => "/assets/temp/gl.mp4") {
+        this.driver = driver;
         this.framerate = framerate;
         this.resolveMedia = resolveMedia;
-        this.#sampler = makeWebCodecsSampler(this.resolveMedia);
+        this.#sampler = makeWebCodecsSampler(this.driver, this.resolveMedia);
     }
     async #build(timeline) {
         const rootItem = new Map(timeline.items.map(i => [i.id, i])).get(timeline.rootId);
@@ -18,10 +19,9 @@ export class Export {
     }
     async render(timeline) {
         const root = await this.#build(timeline);
-        const driver = await context.driver;
         const videoStream = new TransformStream();
         const audioStream = new TransformStream();
-        const encodePromise = driver.encode({
+        const encodePromise = this.driver.encode({
             video: videoStream.readable,
             audio: audioStream.readable,
             config: {
@@ -44,7 +44,7 @@ export class Export {
             const dt = 1 / this.framerate;
             await fixedStep({ fps: this.framerate, duration: root.duration ?? 0 }, async (t) => {
                 const layers = await root.visuals?.sampleAt(t) ?? [];
-                const composed = await driver.composite(layers);
+                const composed = await this.driver.composite(layers);
                 const vf = new VideoFrame(composed, {
                     timestamp: Math.round(i * dt * 1_000_000),
                     duration: Math.round(dt * 1_000_000),

package/x/timeline/parts/compositor/export.js.map

@@ -1 +1 @@
-{"version":3,"file":"export.js","sourceRoot":"","sources":["../../../../s/timeline/parts/compositor/export.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"export.js","sourceRoot":"","sources":["../../../../s/timeline/parts/compositor/export.ts"],"names":[],"mappings":"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"}

package/x/timeline/parts/compositor/playback.d.ts

@@ -1,16 +1,18 @@
 import { TimelineFile } from "../basics.js";
+import { Driver } from "../../../driver/driver.js";
 import { DecoderSource } from "../../../driver/fns/schematic.js";
 import { AudioPlaybackComponent, HTMLSampler, Node } from "./parts/tree-builder.js";
 type ResolveMedia = (hash: string) => DecoderSource;
 export declare class VideoPlayer {
     #private;
+    private driver;
     canvas: HTMLCanvasElement;
     private root;
     private sampler;
     private resolveMedia;
-    constructor(canvas: HTMLCanvasElement, root: Node<AudioPlaybackComponent>, sampler: HTMLSampler, resolveMedia?: ResolveMedia);
+    constructor(driver: Driver, canvas: HTMLCanvasElement, root: Node<AudioPlaybackComponent>, sampler: HTMLSampler, resolveMedia?: ResolveMedia);
     get context(): CanvasRenderingContext2D;
-    static create(timeline: TimelineFile): Promise<VideoPlayer>;
+    static create(driver: Driver, timeline: TimelineFile): Promise<VideoPlayer>;
     play(): Promise<void>;
     pause(): void;
     seek(time: number): Promise<void>;

package/x/timeline/parts/compositor/playback.js

@@ -1,14 +1,15 @@
-import { context } from "../../../context.js";
 import { realtime } from "./parts/schedulers.js";
 import { makeHtmlSampler } from "./samplers/html.js";
 import { buildHTMLNodeTree } from "./parts/html-tree.js";
 export class VideoPlayer {
+    driver;
     canvas;
     root;
     sampler;
     resolveMedia;
     #controller = realtime(t => this.#tick(t));
-    constructor(canvas, root, sampler, resolveMedia = _hash => "/assets/temp/gl.mp4") {
+    constructor(driver, canvas, root, sampler, resolveMedia = _hash => "/assets/temp/gl.mp4") {
+        this.driver = driver;
         this.canvas = canvas;
         this.root = root;
         this.sampler = sampler;
@@ -18,7 +19,7 @@ export class VideoPlayer {
     get context() {
         return this.canvas.getContext("2d");
     }
-    static async create(timeline) {
+    static async create(driver, timeline) {
         const rootItem = new Map(timeline.items.map(i => [i.id, i])).get(timeline.rootId);
         const items = new Map(timeline.items.map(i => [i.id, i]));
         const sampler = makeHtmlSampler(() => "/assets/temp/gl.mp4");
@@ -26,15 +27,14 @@ export class VideoPlayer {
         const canvas = document.createElement("canvas");
         canvas.width = 1920;
         canvas.height = 1080;
-        return new this(canvas, root, sampler);
+        return new this(driver, canvas, root, sampler);
     }
     async #tick(t) {
-        const driver = await context.driver;
         const dur = this.root.duration;
         const tt = t > dur ? dur : t;
         this.root.audio?.onTimeUpdate(tt);
         for (const layer of await this.root.visuals?.sampleAt(tt) ?? []) {
-            const frame = await driver.composite(layer);
+            const frame = await this.driver.composite(layer);
             this.context.drawImage(frame, 0, 0);
             frame.close();
         }
@@ -54,12 +54,11 @@ export class VideoPlayer {
         }
     }
     async seek(time) {
-        const driver = await context.driver;
         this.pause();
         this.#controller.seek(time);
         this.root.audio?.onTimeUpdate(time);
         for (const draw of await this.root.visuals?.sampleAt(time) ?? []) {
-            const frame = await driver.composite(draw);
+            const frame = await this.driver.composite(draw);
             this.context.drawImage(frame, 0, 0);
             frame.close();
         }

package/x/timeline/parts/compositor/playback.js.map

@@ -1 +1 @@
-{"version":3,"file":"playback.js","sourceRoot":"","sources":["../../../../s/timeline/parts/compositor/playback.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"playback.js","sourceRoot":"","sources":["../../../../s/timeline/parts/compositor/playback.ts"],"names":[],"mappings":"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"}

package/x/timeline/parts/compositor/samplers/webcodecs.d.ts

@@ -1,2 +1,3 @@
+import { Driver } from "../../../../driver/driver.js";
 import { WebcodecsSampler } from "../parts/tree-builder.js";
-export declare function makeWebCodecsSampler(resolveMedia: (hash: string) => any): WebcodecsSampler;
+export declare function makeWebCodecsSampler(driver: Driver, resolveMedia: (hash: string) => any): WebcodecsSampler;

package/x/timeline/parts/compositor/samplers/webcodecs.js

@@ -1,14 +1,12 @@
-import { context } from "../../../../context.js";
 import { VideoCursor } from "../../../utils/video-cursor.js";
 import { AudioStream } from "../../../utils/audio-stream.js";
 const toUs = (seconds) => Math.round(seconds * 1_000_000);
-export function makeWebCodecsSampler(resolveMedia) {
+export function makeWebCodecsSampler(driver, resolveMedia) {
     const videoCursors = new Map();
     async function getCursorForVideo(videoItem) {
         const existing = videoCursors.get(videoItem.id);
         if (existing)
             return existing;
-        const driver = await context.driver;
         const source = resolveMedia(videoItem.mediaHash);
         const video = driver.decodeVideo({ source });
         const cursor = new VideoCursor(video.getReader());
@@ -34,7 +32,6 @@ export function makeWebCodecsSampler(resolveMedia) {
                 duration: item.duration,
                 audio: {
                     getStream: async function* () {
-                        const driver = await context.driver;
                         const source = resolveMedia(item.mediaHash);
                         const startUs = item.start;
                         const endUs = (item.start + item.duration);

package/x/timeline/parts/compositor/samplers/webcodecs.js.map

@@ -1 +1 @@
-{"version":3,"file":"webcodecs.js","sourceRoot":"","sources":["../../../../../s/timeline/parts/compositor/samplers/webcodecs.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"webcodecs.js","sourceRoot":"","sources":["../../../../../s/timeline/parts/compositor/samplers/webcodecs.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,WAAW,EAAC,MAAM,gCAAgC,CAAA;AAC1D,OAAO,EAAC,WAAW,EAAC,MAAM,gCAAgC,CAAA;AAE1D,MAAM,IAAI,GAAG,CAAC,OAAe,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,SAAS,CAAC,CAAA;AAEjE,MAAM,UAAU,oBAAoB,CACnC,MAAc,EACd,YAAmC;IAEnC,MAAM,YAAY,GAAG,IAAI,GAAG,EAAuB,CAAA;IAEnD,KAAK,UAAU,iBAAiB,CAAC,SAAqB;QACrD,MAAM,QAAQ,GAAG,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA;QAC/C,IAAI,QAAQ;YAAE,OAAO,QAAQ,CAAA;QAC7B,MAAM,MAAM,GAAG,YAAY,CAAC,SAAS,CAAC,SAAS,CAAC,CAAA;QAChD,MAAM,KAAK,GAAG,MAAM,CAAC,WAAW,CAAC,EAAC,MAAM,EAAC,CAAC,CAAA;QAC1C,MAAM,MAAM,GAAG,IAAI,WAAW,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC,CAAA;QACjD,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,EAAE,MAAM,CAAC,CAAA;QACtC,OAAO,MAAM,CAAA;IACd,CAAC;IAED,OAAO;QACN,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM;YACvB,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,IAAI,CAAC,CAAA;YAC5C,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC,CAAA;YACpC,OAAO;gBACN,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,OAAO,EAAE;oBACR,QAAQ,EAAE,KAAK,EAAE,IAAY,EAAE,EAAE;wBAChC,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;wBACxD,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,EAAC,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;oBACrD,CAAC;iBACD;aACD,CAAA;QACF,CAAC;QACD,KAAK,CAAC,KAAK,CAAC,IAAI;YACf,OAAO;gBACN,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,KAAK,EAAE;oBACN,SAAS,EAAE,KAAK,SAAS,CAAC;wBACzB,MAAM,MAAM,GAAG,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;wBAC3C,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAA;wBAC1B,MAAM,KAAK,GAAG,CAAC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAA;wBAC1C,MAAM,KAAK,GAAG,MAAM,CAAC,WAAW,CAAC,EAAC,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAC,CAAC,CAAA;wBACtE,MAAM,WAAW,GAAG,IAAI,WAAW,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC,CAAA;wBACtD,KAAK,CAAC,CAAC,WAAW,CAAC,MAAM,EAAE,CAAA;oBAC5B,CAAC;iBACD;aACD,CAAA;QACF,CAAC;QACA,KAAK,CAAC,OAAO;YACX,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAA;YACrE,YAAY,CAAC,KAAK,EAAE,CAAA;YACpB,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;QAC1B,CAAC;KACF,CAAA;AACF,CAAC"}

package/x/timeline/parts/waveform.d.ts

@@ -1,8 +1,9 @@
 import WaveSurfer from "wavesurfer.js";
+import { Driver } from "../../driver/driver.js";
 import { DecoderSource } from "../../driver/fns/schematic.js";
 export declare class Waveform {
     wavesurfer: WaveSurfer;
     constructor(peaks: number[], container: HTMLElement, duration: number);
-    static init(source: DecoderSource, container: HTMLElement): Promise<Waveform>;
+    static init(driver: Driver, source: DecoderSource, container: HTMLElement): Promise<Waveform>;
     set width(value: number);
 }

package/x/timeline/parts/waveform.js

@@ -1,5 +1,4 @@
 import WaveSurfer from "wavesurfer.js";
-import { context } from "../../context.js";
 export class Waveform {
     wavesurfer;
     constructor(peaks, container, duration) {
@@ -14,8 +13,7 @@ export class Waveform {
             duration
         });
     }
-    static async init(source, container) {
-        const driver = await context.driver;
+    static async init(driver, source, container) {
         const reader = driver.decodeAudio({ source }).getReader();
         const peaks = [];
         let buffer = [];

package/x/timeline/parts/waveform.js.map

@@ -1 +1 @@
-{"version":3,"file":"waveform.js","sourceRoot":"","sources":["../../../s/timeline/parts/waveform.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,eAAe,CAAA;AAEtC,OAAO,EAAC,OAAO,EAAC,MAAM,kBAAkB,CAAA;AAGxC,MAAM,OAAO,QAAQ;IACpB,UAAU,CAAY;IAEtB,YAAY,KAAe,EAAE,SAAsB,EAAE,QAAgB;QACpE,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC;YAClC,SAAS;YACT,SAAS,EAAE,kBAAkB;YAC7B,aAAa,EAAE,kBAAkB;YACjC,QAAQ,EAAE,EAAE;YACZ,SAAS,EAAE,EAAE;YACb,MAAM,EAAE,CAAC;YACT,KAAK,EAAE,CAAC,KAAK,CAAC;YACd,QAAQ;SACT,CAAC,CAAA;IACH,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAqB,EAAE,SAAsB;QAC9D,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,MAAM,CAAA;QACnC,MAAM,MAAM,GAAG,MAAM,CAAC,WAAW,CAAC,EAAC,MAAM,EAAC,CAAC,CAAC,SAAS,EAAE,CAAA;QAEvD,MAAM,KAAK,GAAa,EAAE,CAAA;QAC1B,IAAI,MAAM,GAAa,EAAE,CAAA;QACzB,MAAM,cAAc,GAAG,IAAI,CAAA;QAC3B,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAA;QAEtD,OAAO,IAAI,EAAE,CAAC;YACb,MAAM,EAAC,IAAI,EAAE,KAAK,EAAE,SAAS,EAAC,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAA;YACpD,IAAI,IAAI;gBAAE,MAAK;YAEf,MAAM,MAAM,GAAG,SAAS,CAAC,cAAc,CAAA;YACvC,MAAM,KAAK,GAAG,IAAI,YAAY,CAAC,MAAM,CAAC,CAAA;YACtC,SAAS,CAAC,MAAM,CAAC,KAAK,EAAE,EAAC,UAAU,EAAE,CAAC,EAAC,CAAC,CAAA,CAAC,wBAAwB;YAEjE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBACvC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;gBACrB,IAAI,MAAM,CAAC,MAAM,IAAI,cAAc,EAAE,CAAC;oBACrC,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,cAAc,CAAC,CAAA;oBAC9C,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,CAAA;oBAC9B,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,CAAA;oBAC9B,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;gBACrB,CAAC;YACF,CAAC;YAED,SAAS,CAAC,KAAK,EAAE,CAAA;QAClB,CAAC;QAED,OAAO,IAAI,QAAQ,CAAC,KAAK,EAAE,SAAS,EAAE,QAAQ,IAAI,CAAC,CAAC,CAAA;IACrD,CAAC;IAED,4BAA4B;IAC5B,+BAA+B;IAC/B,IAAI;IAEJ,IAAI,KAAK,CAAC,KAAa;QACtB,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,EAAC,KAAK,EAAE,KAAK,EAAC,CAAC,CAAA;IAC3C,CAAC;CACD"}
+{"version":3,"file":"waveform.js","sourceRoot":"","sources":["../../../s/timeline/parts/waveform.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,eAAe,CAAA;AAKtC,MAAM,OAAO,QAAQ;IACpB,UAAU,CAAY;IAEtB,YAAY,KAAe,EAAE,SAAsB,EAAE,QAAgB;QACpE,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC;YAClC,SAAS;YACT,SAAS,EAAE,kBAAkB;YAC7B,aAAa,EAAE,kBAAkB;YACjC,QAAQ,EAAE,EAAE;YACZ,SAAS,EAAE,EAAE;YACb,MAAM,EAAE,CAAC;YACT,KAAK,EAAE,CAAC,KAAK,CAAC;YACd,QAAQ;SACT,CAAC,CAAA;IACH,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAc,EAAE,MAAqB,EAAE,SAAsB;QAC9E,MAAM,MAAM,GAAG,MAAM,CAAC,WAAW,CAAC,EAAC,MAAM,EAAC,CAAC,CAAC,SAAS,EAAE,CAAA;QAEvD,MAAM,KAAK,GAAa,EAAE,CAAA;QAC1B,IAAI,MAAM,GAAa,EAAE,CAAA;QACzB,MAAM,cAAc,GAAG,IAAI,CAAA;QAC3B,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAA;QAEtD,OAAO,IAAI,EAAE,CAAC;YACb,MAAM,EAAC,IAAI,EAAE,KAAK,EAAE,SAAS,EAAC,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAA;YACpD,IAAI,IAAI;gBAAE,MAAK;YAEf,MAAM,MAAM,GAAG,SAAS,CAAC,cAAc,CAAA;YACvC,MAAM,KAAK,GAAG,IAAI,YAAY,CAAC,MAAM,CAAC,CAAA;YACtC,SAAS,CAAC,MAAM,CAAC,KAAK,EAAE,EAAC,UAAU,EAAE,CAAC,EAAC,CAAC,CAAA,CAAC,wBAAwB;YAEjE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBACvC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;gBACrB,IAAI,MAAM,CAAC,MAAM,IAAI,cAAc,EAAE,CAAC;oBACrC,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,cAAc,CAAC,CAAA;oBAC9C,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,CAAA;oBAC9B,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,CAAA;oBAC9B,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;gBACrB,CAAC;YACF,CAAC;YAED,SAAS,CAAC,KAAK,EAAE,CAAA;QAClB,CAAC;QAED,OAAO,IAAI,QAAQ,CAAC,KAAK,EAAE,SAAS,EAAE,QAAQ,IAAI,CAAC,CAAC,CAAA;IACrD,CAAC;IAED,4BAA4B;IAC5B,+BAA+B;IAC/B,IAAI;IAEJ,IAAI,KAAK,CAAC,KAAa;QACtB,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,EAAC,KAAK,EAAE,KAAK,EAAC,CAAC,CAAA;IAC3C,CAAC;CACD"}

package/x/timeline/sugar/omni-test.js

@@ -1,9 +1,11 @@
 import { Omni } from "./omni.js";
+import { Driver } from "../../driver/driver.js";
 import { dummyData } from "../utils/dummy-data.js";
+const driver = await Driver.setup();
 //
 // create an omni context
 //
-const omni = new Omni();
+const omni = new Omni(driver);
 //
 // load in some media resources
 //

package/x/timeline/sugar/omni-test.js.map

@@ -1 +1 @@
-{"version":3,"file":"omni-test.js","sourceRoot":"","sources":["../../../s/timeline/sugar/omni-test.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,IAAI,EAAC,MAAM,WAAW,CAAA;AAC9B,OAAO,EAAC,SAAS,EAAC,MAAM,wBAAwB,CAAA;AAEhD,EAAE;AACF,yBAAyB;AACzB,EAAE;AAEF,MAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAA;AAEvB,EAAE;AACF,+BAA+B;AAC/B,EAAE;AAEF,MAAM,EAAC,MAAM,EAAE,MAAM,EAAC,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC;IACxC,MAAM,EAAE,SAAS,EAAE;IACnB,MAAM,EAAE,SAAS,EAAE;CACnB,CAAC,CAAA;AAEF,EAAE;AACF,oBAAoB;AACpB,EAAE;AAEF,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAC7C,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,EACf,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,EAC3B,CAAC,CAAC,KAAK,CACN,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,EACf,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CACrB,CACD,CAAC,CAAA;AAEF,EAAE;AACF,mBAAmB;AACnB,EAAE;AAEF,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC,CAAA"}
+{"version":3,"file":"omni-test.js","sourceRoot":"","sources":["../../../s/timeline/sugar/omni-test.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,IAAI,EAAC,MAAM,WAAW,CAAA;AAC9B,OAAO,EAAC,MAAM,EAAC,MAAM,wBAAwB,CAAA;AAC7C,OAAO,EAAC,SAAS,EAAC,MAAM,wBAAwB,CAAA;AAEhD,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,KAAK,EAAE,CAAA;AACnC,EAAE;AACF,yBAAyB;AACzB,EAAE;AAEF,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,CAAA;AAE7B,EAAE;AACF,+BAA+B;AAC/B,EAAE;AAEF,MAAM,EAAC,MAAM,EAAE,MAAM,EAAC,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC;IACxC,MAAM,EAAE,SAAS,EAAE;IACnB,MAAM,EAAE,SAAS,EAAE;CACnB,CAAC,CAAA;AAEF,EAAE;AACF,oBAAoB;AACpB,EAAE;AAEF,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAC7C,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,EACf,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,EAC3B,CAAC,CAAC,KAAK,CACN,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,EACf,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CACrB,CACD,CAAC,CAAA;AAEF,EAAE;AACF,mBAAmB;AACnB,EAAE;AAEF,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC,CAAA"}

package/x/timeline/sugar/omni.d.ts

@@ -1,13 +1,16 @@
 import { O } from "./o.js";
 import { Item } from "../parts/item.js";
 import { Media } from "../parts/media.js";
+import { Driver } from "../../driver/driver.js";
 import { Datafile } from "../utils/datafile.js";
 import { TimelineFile } from "../parts/basics.js";
 import { ResourcePool } from "../parts/resource-pool.js";
 import { RenderConfig } from "../../driver/fns/schematic.js";
 export declare class Omni {
     #private;
+    private driver;
     resources: ResourcePool;
+    constructor(driver: Driver);
     load: <S extends Record<string, Promise<Datafile>>>(spec: S) => Promise<{ [K in keyof S]: Media; }>;
     timeline: (fn: (o: O) => Item.Any) => TimelineFile;
     render: (timeline: TimelineFile, config: RenderConfig) => Promise<void>;

package/x/timeline/sugar/omni.js

@@ -2,8 +2,13 @@ import { O } from "./o.js";
 import { Export } from "../parts/compositor/export.js";
 import { ResourcePool } from "../parts/resource-pool.js";
 export class Omni {
+    driver;
     resources = new ResourcePool();
-    #export = new Export();
+    #export;
+    constructor(driver) {
+        this.driver = driver;
+        this.#export = new Export(driver);
+    }
     load = async (spec) => {
         return Object.fromEntries(await Promise.all(Object.entries(spec).map(async ([key, value]) => [key, await this.resources.store(await value)])));
     };

package/x/timeline/sugar/omni.js.map

@@ -1 +1 @@
-{"version":3,"file":"omni.js","sourceRoot":"","sources":["../../../s/timeline/sugar/omni.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,CAAC,EAAC,MAAM,QAAQ,CAAA;AAKxB,OAAO,EAAC,MAAM,EAAC,MAAM,+BAA+B,CAAA;AACpD,OAAO,EAAC,YAAY,EAAC,MAAM,2BAA2B,CAAA;AAGtD,MAAM,OAAO,IAAI;IAChB,SAAS,GAAG,IAAI,YAAY,EAAE,CAAA;IAC9B,OAAO,GAAG,IAAI,MAAM,EAAE,CAAA;IAEtB,IAAI,GAAG,KAAK,EAA8C,IAAO,EAAE,EAAE;QACpE,OAAO,MAAM,CAAC,WAAW,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,CACnE,KAAK,EAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC,CACrE,CAAC,CAA4B,CAAA;IAC/B,CAAC,CAAA;IAED,QAAQ,GAAG,CAAC,EAAsB,EAAgB,EAAE;QACnD,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC;YACf,OAAO,EAAE;gBACR,MAAM,EAAE,UAAU;gBAClB,IAAI,EAAE,uBAAuB;gBAC7B,OAAO,EAAE,CAAC;gBACV,KAAK,EAAE,EAAE;gBACT,MAAM,EAAE,CAAC;aACT;SACD,CAAC,CAAA;QACF,MAAM,IAAI,GAAG,EAAE,CAAC,CAAC,CAAC,CAAA;QAClB,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,CAAA;QAChC,OAAO,CAAC,CAAC,KAAK,CAAC,OAAO,CAAA;IACvB,CAAC,CAAA;IAED,MAAM,GAAG,KAAK,EAAE,QAAsB,EAAE,MAAoB,EAAE,EAAE;QAC/D,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;IACpC,CAAC,CAAA;CACD"}
+{"version":3,"file":"omni.js","sourceRoot":"","sources":["../../../s/timeline/sugar/omni.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,CAAC,EAAC,MAAM,QAAQ,CAAA;AAMxB,OAAO,EAAC,MAAM,EAAC,MAAM,+BAA+B,CAAA;AACpD,OAAO,EAAC,YAAY,EAAC,MAAM,2BAA2B,CAAA;AAGtD,MAAM,OAAO,IAAI;IAII;IAHpB,SAAS,GAAG,IAAI,YAAY,EAAE,CAAA;IAC9B,OAAO,CAAQ;IAEf,YAAoB,MAAc;QAAd,WAAM,GAAN,MAAM,CAAQ;QACjC,IAAI,CAAC,OAAO,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,CAAA;IAClC,CAAC;IAED,IAAI,GAAG,KAAK,EAA8C,IAAO,EAAE,EAAE;QACpE,OAAO,MAAM,CAAC,WAAW,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,CACnE,KAAK,EAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC,CACrE,CAAC,CAA4B,CAAA;IAC/B,CAAC,CAAA;IAED,QAAQ,GAAG,CAAC,EAAsB,EAAgB,EAAE;QACnD,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC;YACf,OAAO,EAAE;gBACR,MAAM,EAAE,UAAU;gBAClB,IAAI,EAAE,uBAAuB;gBAC7B,OAAO,EAAE,CAAC;gBACV,KAAK,EAAE,EAAE;gBACT,MAAM,EAAE,CAAC;aACT;SACD,CAAC,CAAA;QACF,MAAM,IAAI,GAAG,EAAE,CAAC,CAAC,CAAC,CAAA;QAClB,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,CAAA;QAChC,OAAO,CAAC,CAAC,KAAK,CAAC,OAAO,CAAA;IACvB,CAAC,CAAA;IAED,MAAM,GAAG,KAAK,EAAE,QAAsB,EAAE,MAAoB,EAAE,EAAE;QAC/D,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;IACpC,CAAC,CAAA;CACD"}

package/s/tools/common/loader.ts

@@ -1,26 +0,0 @@
-import {pub, Pub} from "@e280/stz"
-import {ProgressItem} from "../speech-recognition/whisper/parts/types.js"
-
-export interface LoaderEvents {
-	onModelLoadProgress: Pub<ProgressItem[]>
-	onTpsUpdate: Pub<[number]>
-}
-
-export abstract class Loader {
-	tps = 0
-
-	static loaderEvents = {
-		onModelLoadProgress: pub<ProgressItem[]>(),
-		onTpsUpdate: pub<[number]>()
-	}
-
-	constructor(public readonly name: string, public model: string) {}
-
-	abstract init(): Promise<void>
-
-	abstract setModel(model: string): void
-
-	setTps(value: number) {
-		this.tps = value
-	}
-}

package/s/tools/common/transformer-pipeline.ts

@@ -1,26 +0,0 @@
-//@ts-ignore
-import {pipeline} from "https://cdn.jsdelivr.net/npm/@huggingface/transformers@3.7.0/dist/transformers.min.js"
-
-import {ProgressCallback} from "../speech-recognition/whisper/parts/types.js"
-
-export class PipelineFactory {
-	instance: any = null
-	model: string | null = null
-
-	constructor(public task: string) {}
-
-	async createInstance(model: string, progressCallback?: ProgressCallback) {
-		this.model = model
-		return this.instance = await pipeline(this.task, this.model, {
-			dtype: {
-				encoder_model:
-					this.model === "onnx-community/whisper-large-v3-turbo"
-						? "fp16"
-						: "fp32",
-				decoder_model_merged: "q4",
-			},
-			device: "webgpu",
-			progress_callback: progressCallback,
-		})
-	}
-}

package/s/tools/speech-recognition/common/model.ts

@@ -1,26 +0,0 @@
-import {pub} from "@e280/stz"
-
-import {Loader} from "../../common/loader.js"
-import {DecoderSource} from "../../../driver/fns/schematic.js"
-import {SpeechRecognizerModels, Word, WordGroup} from "../whisper/parts/types.js"
-
-export abstract class SpeechRecognizer extends Loader {
-	multilingual = true
-
-	static speechRecognizerEvents = {
-		onTranscriptionChunk: pub<Word[]>(),
-		onTranscribeProgress: pub<[number]>()
-	}
-
-	abstract transcribe(input: DecoderSource): Promise<WordGroup>
-
-	setMultilingual(value: boolean) {
-		this.multilingual = value
-	}
-
-	detectLanguage?(input: Blob | AudioBuffer): Promise<string>
-
-	setModel(value: SpeechRecognizerModels) {
-		this.model = value
-	}
-}

package/s/tools/speech-recognition/whisper/fns/host.ts

@@ -1,25 +0,0 @@
-
-import {Comrade} from "@e280/comrade"
-import {ProgressItem} from "../parts/types.js"
-import {SpeechRecognizerHostEvents, WhisperSchematic} from "./schematic.js"
-
-export const setupWhisperHost = (events: SpeechRecognizerHostEvents) => (
-	Comrade.host<WhisperSchematic>(_shell => ({
-		async updateModelLoadProgress(item) {
-			events.onModelLoadProgress.pub(item)
-		},
-		async deliverTranscriptionChunk(chunk) {
-			events.onTranscriptionChunk.pub({
-				text: chunk.text,
-				timestamp: chunk.timestamp
-			})
-		},
-		async updateTps(value) {
-			events.onTpsUpdate.pub(value)
-		},
-		async updateTranscribeProgress(value) {
-			events.onTranscribeProgress(value)
-		}
-	}))
-)
-

package/s/tools/speech-recognition/whisper/fns/schematic.ts

@@ -1,23 +0,0 @@
-import {Pub} from "@e280/stz"
-import {AsSchematic} from "@e280/comrade"
-
-import {LoaderEvents} from "../../../common/loader.js"
-import {ProgressItem, TranscriptionChunk, TranscriptionMessage, TranscriptionResult, Word} from "../parts/types.js"
-
-export type WhisperSchematic = AsSchematic<{
-	work: {
-		transcribe(input: TranscriptionMessage): Promise<TranscriptionResult | null>
-	},
-
-	host: {
-		updateModelLoadProgress(item: ProgressItem): Promise<void>
-		deliverTranscriptionChunk(chunk: TranscriptionChunk): Promise<void>
-		updateTps(value: number): Promise<void>
-		updateTranscribeProgress(value: number): Promise<void>
-	}
-}>
-
-export interface SpeechRecognizerHostEvents extends LoaderEvents {
-	onTranscriptionChunk: Pub<Word[]>
-	onTranscribeProgress: Pub<[number]>
-}

package/s/tools/speech-recognition/whisper/fns/work.ts

@@ -1,91 +0,0 @@
-import {Comrade} from "@e280/comrade"
-//@ts-ignore
-import {pipeline, WhisperTextStreamer} from "https://cdn.jsdelivr.net/npm/@huggingface/transformers@3.7.0/dist/transformers.min.js"
-
-import {WhisperSchematic} from "./schematic.js"
-import {TranscriptionChunk} from "../parts/types.js"
-import {PipelineFactory} from "../../../common/transformer-pipeline.js"
-
-// TODO suspicious globals, probably bad
-const pipeline = new PipelineFactory("automatic-speech-recognition")
-let transcriber: any
-
-export const setupWhisperWork = Comrade.work<WhisperSchematic>(shell => ({
-	async transcribe({audio, model, language, duration}) {
-		const isDistil = model.startsWith("distil-whisper/")
-
-		if(!pipeline.model || pipeline.model !== model) {
-			pipeline.instance?.dispose()?.()
-			pipeline.instance = null
-			transcriber = await pipeline.createInstance(
-				model,
-				(data) => {
-					if(data.progress)
-						shell.host.updateModelLoadProgress({
-							id: data.file,
-							progress: data.progress
-						})
-				}
-			)
-		}
-
-		const timePrecision =
-			transcriber.processor.feature_extractor.config.chunk_length /
-			transcriber.model.config.max_source_positions
-
-		const chunkLength = isDistil ? 20 : 30
-		const strideLength = isDistil ? 3 : 5
-
-		let chunkCount = 0
-		let startTime: number | null = null
-		let tokenCount = 0
-		let tps = 0
-
-		const chunkDuration = chunkLength - strideLength
-
-		const estimateProgress = () => {
-			const audioProgressSeconds = chunkCount * chunkDuration
-			return Math.min(audioProgressSeconds / duration, 1)
-		}
-
-		const streamer = new WhisperTextStreamer(transcriber.tokenizer, {
-			time_precision: timePrecision,
-			token_callback_function: () => {
-				startTime ??= performance.now()
-				if (++tokenCount > 1) {
-					tps = (tokenCount / (performance.now() - startTime)) * 1000
-					shell.host.updateTps(tps)
-				}
-			},
-			callback_function: (textChunk: any) => {
-				shell.host.deliverTranscriptionChunk(textChunk)
-			},
-			on_finalize: () => {
-				startTime = null
-				tokenCount = 0
-				chunkCount++
-				const progress = estimateProgress()
-				shell.host.updateTranscribeProgress(progress)
-			},
-		})
-
-		const output = await transcriber(audio, {
-			top_k: 0,
-			do_sample: false,
-			chunk_length_s: chunkLength,
-			stride_length_s: strideLength,
-			language,
-			task: "transcribe",
-			return_timestamps: "word", // if using "word" the on_chunk_start & end is not called thus we cant retrieve timestamps, only after whole thing finishes
-			force_full_sequences: false,
-			streamer,
-		})
-
-		if (!output) return null
-
-		return {
-			tps,
-			...output,
-		}
-	}
-}))