@omnimedia/omnitool 1.1.0-52 → 1.1.0-55

package/x/driver/fns/host.d.ts

@@ -4,12 +4,14 @@ export declare const setupDriverHost: (machina: Machina) => import("@e280/comrad
         hello(): Promise<void>;
         decodeAudio(input: {
             source: import("./schematic.js").DecoderSource;
+            cancel: MessagePort;
             audio: WritableStream<AudioData>;
             start?: number;
             end?: number;
         }): Promise<void>;
         decodeVideo(input: {
             source: import("./schematic.js").DecoderSource;
+            cancel: MessagePort;
             video: WritableStream<VideoFrame>;
             start?: number;
             end?: number;

package/x/driver/fns/schematic.d.ts

@@ -8,12 +8,14 @@ export type DriverSchematic = AsSchematic<{
         hello(): Promise<void>;
         decodeAudio(input: {
             source: DecoderSource;
+            cancel: MessagePort;
             audio: WritableStream<AudioData>;
             start?: number;
             end?: number;
         }): Promise<void>;
         decodeVideo(input: {
             source: DecoderSource;
+            cancel: MessagePort;
             video: WritableStream<VideoFrame>;
             start?: number;
             end?: number;

package/x/driver/fns/work.d.ts

@@ -4,12 +4,14 @@ export declare const setupDriverWork: import("@e280/comrade").SetupWork<{
         hello(): Promise<void>;
         decodeAudio(input: {
             source: DecoderSource;
+            cancel: MessagePort;
             audio: WritableStream<AudioData>;
             start?: number;
             end?: number;
         }): Promise<void>;
         decodeVideo(input: {
             source: DecoderSource;
+            cancel: MessagePort;
             video: WritableStream<VideoFrame>;
             start?: number;
             end?: number;

package/x/driver/fns/work.js

@@ -14,7 +14,7 @@ export const setupDriverWork = (Comrade.work(shell => ({
     async hello() {
         await shell.host.world();
     },
-    async decodeAudio({ source, audio, start, end }) {
+    async decodeAudio({ source, audio, start, end, cancel }) {
         const input = new Input({
             source: await loadSource(source),
             formats: ALL_FORMATS
@@ -22,18 +22,24 @@ export const setupDriverWork = (Comrade.work(shell => ({
         const audioTrack = await input.getPrimaryAudioTrack();
         const audioDecodable = await audioTrack?.canDecode();
         const audioWriter = audio.getWriter();
-        if (audioDecodable && audioTrack) {
-            const sink = new AudioSampleSink(audioTrack);
-            for await (const sample of sink.samples(start, end)) {
-                const frame = sample.toAudioData();
-                await audioWriter.write(frame);
-                sample.close();
-                frame.close();
-            }
-            await audioWriter.close();
+        if (!audioDecodable || !audioTrack)
+            return;
+        const sink = new AudioSampleSink(audioTrack);
+        const samples = sink.samples(start, end);
+        cancel.onmessage = async () => {
+            samples.return();
+            input.dispose();
+            cancel.close();
+        };
+        for await (const sample of samples) {
+            const frame = sample.toAudioData();
+            sample.close();
+            await audioWriter.write(frame);
+            frame.close();
         }
+        await audioWriter.close();
     },
-    async decodeVideo({ source, video, start, end }) {
+    async decodeVideo({ source, video, start, end, cancel }) {
         const input = new Input({
             source: await loadSource(source),
             formats: ALL_FORMATS
@@ -41,16 +47,22 @@ export const setupDriverWork = (Comrade.work(shell => ({
         const videoTrack = await input.getPrimaryVideoTrack();
         const videoDecodable = await videoTrack?.canDecode();
         const videoWriter = video.getWriter();
-        if (videoDecodable && videoTrack) {
-            const sink = new VideoSampleSink(videoTrack);
-            for await (const sample of sink.samples(start, end)) {
-                const frame = sample.toVideoFrame();
-                await videoWriter.write(frame);
-                sample.close();
-                frame.close();
-            }
-            await videoWriter.close();
+        if (!videoDecodable || !videoTrack)
+            return;
+        const sink = new VideoSampleSink(videoTrack);
+        const samples = sink.samples(start, end);
+        cancel.onmessage = async () => {
+            samples.return();
+            input.dispose();
+            cancel.close();
+        };
+        for await (const sample of samples) {
+            const frame = sample.toVideoFrame();
+            sample.close();
+            await videoWriter.write(frame);
+            frame.close();
         }
+        await videoWriter.close();
     },
     async encode({ video, audio, config, writable }) {
         const output = new Output({
@@ -66,6 +78,7 @@ export const setupDriverWork = (Comrade.work(shell => ({
                 const sample = new VideoSample(frame);
                 await videoSource.add(sample);
                 sample.close();
+                frame.close();
             }
         }
         async function encodeAudio() {

package/x/driver/fns/work.js.map

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

package/x/index.html

@@ -295,7 +295,7 @@ canvas {
 }
 }
 </style>
-					<script type=module src="demo/demo.bundle.min.js?v=7d5608e68c81"></script>
+					<script type=module src="demo/demo.bundle.min.js?v=e5ad0d42200e"></script>
 
 
 		<meta name="theme-color" content="#3cff9c">
@@ -317,7 +317,7 @@ canvas {
 	<section>
 		<header class="hero">
 			<div>
-				<h1>Omnitool <small>v1.1.0-52</small></h1>
+				<h1>Omnitool <small>v1.1.0-55</small></h1>
 				<p>Developer demos for decoding, preview, waveform, playback, and export.</p>
 			</div>
 		</header>