nice

remotion-dev · Nov 7, 2024 · 7b0b10e · 7b0b10e
1 parent 2aa1494
commit 7b0b10e
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 5 deletions.
diff --git a/packages/convert/app/components/ConvertUi.tsx b/packages/convert/app/components/ConvertUi.tsx
@@ -89,6 +89,7 @@ export default function ConvertUI({src}: {readonly src: Source}) {
 				// eslint-disable-next-line no-alert
 				alert((e as Error).stack);
 				console.error(e);
+				setState({type: 'idle'});
 			});
 
 		return () => {

diff --git a/packages/webcodecs/src/audio-decoder.ts b/packages/webcodecs/src/audio-decoder.ts
@@ -32,11 +32,27 @@ export const createAudioDecoder = ({
 	const audioDecoder = new AudioDecoder({
 		output(inputFrame) {
 			ioSynchronizer.onOutput(inputFrame.timestamp);
+			const abortHandler = () => {
+				inputFrame.close();
+			};
+
+			signal.addEventListener('abort', abortHandler, {once: true});
 			outputQueue = outputQueue
-				.then(() => onFrame(inputFrame))
+				.then(() => {
+					if (signal.aborted) {
+						return;
+					}
+
+					return onFrame(inputFrame);
+				})
 				.then(() => {
 					ioSynchronizer.onProcessed();
+					signal.removeEventListener('abort', abortHandler);
 					return Promise.resolve();
+				})
+				.catch((err) => {
+					inputFrame.close();
+					onError(err);
 				});
 		},
 		error(error) {
@@ -68,7 +84,7 @@ export const createAudioDecoder = ({
 			return;
 		}
 
-		while (ioSynchronizer.getUnemittedKeyframes() > 1) {
+		while (ioSynchronizer.getUnemittedKeyframes() > 100) {
 			await ioSynchronizer.waitForOutput();
 		}
 

diff --git a/packages/webcodecs/src/audio-encoder.ts b/packages/webcodecs/src/audio-encoder.ts
@@ -36,10 +36,19 @@ export const createAudioEncoder = ({
 		output: (chunk) => {
 			ioSynchronizer.onOutput(chunk.timestamp);
 			prom = prom
-				.then(() => onChunk(chunk))
+				.then(() => {
+					if (signal.aborted) {
+						return;
+					}
+
+					return onChunk(chunk);
+				})
 				.then(() => {
 					ioSynchronizer.onProcessed();
 					return Promise.resolve();
+				})
+				.catch((err) => {
+					onError(err);
 				});
 		},
 		error(error) {

diff --git a/packages/webcodecs/src/on-video-track.ts b/packages/webcodecs/src/on-video-track.ts
@@ -71,8 +71,8 @@ export const makeVideoTrackHandler =
 				codec: track.codecWithoutConfig,
 				codecPrivate: track.codecPrivate,
 			});
-			return (sample) => {
-				state.addSample(
+			return async (sample) => {
+				await state.addSample(
 					new EncodedVideoChunk(sample),
 					videoTrack.trackNumber,
 					true,

diff --git a/packages/webcodecs/src/video-decoder.ts b/packages/webcodecs/src/video-decoder.ts
@@ -28,13 +28,28 @@ export const createVideoDecoder = ({
 		output(inputFrame) {
 			ioSynchronizer.onOutput(inputFrame.timestamp);
 
+			const abortHandler = () => {
+				inputFrame.close();
+			};
+
+			signal.addEventListener('abort', abortHandler, {once: true});
+
 			outputQueue = outputQueue
 				.then(() => {
+					if (signal.aborted) {
+						return;
+					}
+
 					return onFrame(inputFrame);
 				})
 				.then(() => {
 					ioSynchronizer.onProcessed();
+					signal.removeEventListener('abort', abortHandler);
 					return Promise.resolve();
+				})
+				.catch((err) => {
+					inputFrame.close();
+					onError(err);
 				});
 		},
 		error(error) {

diff --git a/packages/webcodecs/src/video-encoder.ts b/packages/webcodecs/src/video-encoder.ts
@@ -44,11 +44,18 @@ export const createVideoEncoder = ({
 
 			outputQueue = outputQueue
 				.then(() => {
+					if (signal.aborted) {
+						return;
+					}
+
 					return onChunk(chunk);
 				})
 				.then(() => {
 					ioSynchronizer.onProcessed();
 					return Promise.resolve();
+				})
+				.catch((err) => {
+					onError(err);
 				});
 		},
 	});