@remotion/media-parser: parseAndDownloadMedia() done

packages/media-parser/src/internal-parse-media.ts

@@ -128,7 +128,7 @@ export const internalParseMedia: InternalParseMedia = async function <
 		});
 	};
 
-	const checkIfDone = () => {
+	const checkIfDone = async () => {
 		const startCheck = Date.now();
 		const hasAll = hasAllInfo({
 			fields,
@@ -149,7 +149,7 @@ export const internalParseMedia: InternalParseMedia = async function <
 
 		if (state.iterator.counter.getOffset() === contentLength) {
 			Log.verbose(logLevel, 'Reached end of file');
-			state.discardReadBytes(true);
+			await state.discardReadBytes(true);
 
 			return true;
 		}
@@ -160,7 +160,7 @@ export const internalParseMedia: InternalParseMedia = async function <
 	triggerInfoEmit();
 
 	let iterationWithThisOffset = 0;
-	while (!checkIfDone()) {
+	while (!(await checkIfDone())) {
 		if (signal?.aborted) {
 			throw new Error('Aborted');
 		}
@@ -247,7 +247,7 @@ export const internalParseMedia: InternalParseMedia = async function <
 		}
 
 		const timeFreeStart = Date.now();
-		state.discardReadBytes(false);
+		await state.discardReadBytes(false);
 
 		timeFreeingData += Date.now() - timeFreeStart;
 	}

packages/media-parser/src/parse-and-download-media.ts

@@ -7,7 +7,7 @@ export const parseAndDownloadMedia: ParseAndDownloadMedia = async (options) => {
 		filename: 'hmm',
 		mimeType: 'shouldnotmatter',
 	});
-	return internalParseMedia({
+	const returnValue = await internalParseMedia({
 		fields: options.fields ?? null,
 		logLevel: options.logLevel ?? 'info',
 		mode: 'download',
@@ -49,4 +49,8 @@ export const parseAndDownloadMedia: ParseAndDownloadMedia = async (options) => {
 		signal: options.signal ?? undefined,
 		src: options.src,
 	});
+
+	await content.finish();
+
+	return returnValue;
 };

packages/media-parser/src/perform-seek.ts

@@ -24,27 +24,18 @@ export const performSeek = async ({
 		mode,
 		contentLength,
 	} = state;
-	const skippingAhead = seekTo > iterator.counter.getOffset();
-	if (mode === 'download' && !skippingAhead) {
-		throw new Error(
-			`Cannot seek backwards in download mode. Current position: ${iterator.counter.getOffset()}, seekTo: ${seekTo}`,
-		);
-	}
 
-	if (!skippingAhead && !supportsContentRange) {
+	if (seekTo <= iterator.counter.getOffset()) {
 		throw new Error(
-			'Content-Range header is not supported by the reader, but was asked to seek',
+			`Seeking backwards is not supported. Current position: ${iterator.counter.getOffset()}, seekTo: ${seekTo}`,
 		);
 	}
 
 	if (seekTo > state.contentLength) {
 		throw new Error(`Unexpected seek: ${seekTo} > ${contentLength}`);
 	}
 
-	if (
-		skippingAhead &&
-		iterator.counter.getOffset() + iterator.bytesRemaining() >= seekTo
-	) {
+	if (iterator.counter.getOffset() + iterator.bytesRemaining() >= seekTo) {
 		Log.verbose(
 			logLevel,
 			`Skipping over video data from position ${iterator.counter.getOffset()} -> ${seekTo}. Data already fetched`,
@@ -53,7 +44,7 @@ export const performSeek = async ({
 		return currentReader;
 	}
 
-	if (skippingAhead && !supportsContentRange) {
+	if (!supportsContentRange) {
 		Log.verbose(
 			logLevel,
 			`Skipping over video data from position ${iterator.counter.getOffset()} -> ${seekTo}. Fetching but not reading all the data inbetween because Content-Range is not supported`,
@@ -62,6 +53,15 @@ export const performSeek = async ({
 		return currentReader;
 	}
 
+	if (mode === 'download') {
+		Log.verbose(
+			logLevel,
+			`Skipping over video data from position ${iterator.counter.getOffset()} -> ${seekTo}. Fetching but not reading all the data inbetween because in download mode`,
+		);
+		iterator.discard(seekTo - iterator.counter.getOffset());
+		return currentReader;
+	}
+
 	const time = Date.now();
 	Log.verbose(
 		logLevel,
@@ -75,7 +75,7 @@ export const performSeek = async ({
 		signal,
 	});
 	iterator.skipTo(seekTo);
-	state.discardReadBytes(true);
+	await state.discardReadBytes(true);
 
 	Log.verbose(
 		logLevel,

packages/media-parser/src/state/parser-state.ts

@@ -83,18 +83,14 @@ export const makeParserState = ({
 	const mp3Info = makeMp3State();
 	const images = imagesState();
 
-	const discardReadBytes = (force: boolean) => {
+	const discardReadBytes = async (force: boolean) => {
 		const {bytesRemoved, removedData} = iterator.removeBytesRead(force, mode);
 		if (bytesRemoved) {
 			Log.verbose(logLevel, `Freed ${bytesRemoved} bytes`);
 		}
 
 		if (removedData && onDiscardedData) {
-			onDiscardedData(removedData);
-		}
-
-		if (bytesRemoved) {
-			Log.verbose(logLevel, `Freed ${bytesRemoved} bytes`);
+			await onDiscardedData(removedData);
 		}
 	};
 

packages/media-parser/src/test/parse-and-download-video.test.ts

@@ -1,13 +1,56 @@
 import {exampleVideos} from '@remotion/example-videos';
-import {test} from 'bun:test';
+import {expect, test} from 'bun:test';
 import {parseAndDownloadMedia} from '../parse-and-download-media';
 import {nodeReader} from '../readers/from-node';
 import {nodeWriter} from '../writers/node';
 
 test('should be able to parse and download video', async () => {
-	await parseAndDownloadMedia({
+	const {size} = await parseAndDownloadMedia({
 		src: exampleVideos.avi,
 		reader: nodeReader,
+		fields: {
+			size: true,
+		},
 		writer: nodeWriter('output.avi'),
 	});
+
+	const s = Bun.file('output.avi');
+	expect(s.size).toBe(742478);
+	expect(size).toBe(742478);
+	await s.unlink();
 });
+
+test('should be able to parse and download video', async () => {
+	const {size} = await parseAndDownloadMedia({
+		src: exampleVideos.iphonehevc,
+		reader: nodeReader,
+		fields: {
+			size: true,
+		},
+		writer: nodeWriter('iphonehevc.mp4'),
+	});
+
+	const s = Bun.file('iphonehevc.mp4');
+	expect(size).toBe(7418901);
+	expect(s.size).toBe(7418901);
+	await s.unlink();
+});
+
+test(
+	'should be able to parse and download remote video',
+	async () => {
+		const {size} = await parseAndDownloadMedia({
+			src: 'https://remotion-assets.s3.eu-central-1.amazonaws.com/example-videos/transportstream.ts',
+			fields: {
+				size: true,
+			},
+			writer: nodeWriter('output2'),
+		});
+
+		const s = Bun.file('output2');
+		expect(s.size).toBe(1913464);
+		expect(size).toBe(1913464);
+		await s.unlink();
+	},
+	{timeout: 30_000},
+);

packages/media-parser/src/writers/node.ts

@@ -56,20 +56,21 @@ const createContent = (filename: string): CreateContent => {
 				writPromise.then(() => updateDataAt(position, data));
 				return writPromise;
 			},
-			waitForFinish: async () => {
-				await writPromise;
-			},
 			getWrittenByteCount: () => written,
 			remove,
-			save: async () => {
+			finish: async () => {
+				await writPromise;
 				try {
 					fs.closeSync(writeStream);
-					const file = await fs.promises.readFile(filename);
-					return new Blob([file]);
+					return Promise.resolve();
 				} catch (e) {
 					return Promise.reject(e);
 				}
 			},
+			getBlob: async () => {
+				const file = await fs.promises.readFile(filename);
+				return new Blob([file]);
+			},
 		};
 
 		return writer;

packages/media-parser/src/writers/writer.ts

@@ -1,10 +1,10 @@
 export type Writer = {
 	write: (arr: Uint8Array) => Promise<void>;
-	save: () => Promise<Blob>;
+	finish: () => Promise<void>;
 	getWrittenByteCount: () => number;
 	updateDataAt: (position: number, data: Uint8Array) => Promise<void>;
-	waitForFinish: () => Promise<void>;
 	remove: () => Promise<void>;
+	getBlob: () => Promise<Blob>;
 };
 
 export type CreateContent = (options: {

packages/webcodecs/src/convert-media.ts

@@ -259,7 +259,7 @@ export const convertMedia = async function <
 		})
 		.then(() => {
 			resolve({
-				save: state.save,
+				save: state.getBlob,
 				remove: state.remove,
 				finalState: throttledState.get(),
 			});

packages/webcodecs/src/create/iso-base-media/create-iso-base-media.ts

@@ -217,8 +217,8 @@ export const createIsoBaseMedia = async ({
 	const waitForFinishPromises: (() => Promise<void>)[] = [];
 
 	return {
-		save: () => {
-			return w.save();
+		getBlob: () => {
+			return w.getBlob();
 		},
 		remove: async () => {
 			await w.remove();
@@ -273,7 +273,7 @@ export const createIsoBaseMedia = async ({
 				logLevel,
 				'All write operations done. Waiting for finish...',
 			);
-			await w.waitForFinish();
+			await w.finish();
 		},
 	};
 };

packages/webcodecs/src/create/matroska/create-matroska-media.ts

@@ -239,8 +239,8 @@ export const createMatroskaMedia = async ({
 				}
 			});
 		},
-		save: () => {
-			return w.save();
+		getBlob: async () => {
+			return w.getBlob();
 		},
 		remove: async () => {
 			await w.remove();
@@ -274,13 +274,13 @@ export const createMatroskaMedia = async ({
 			await updateSeekWrite();
 
 			await w.write(createMatroskaCues(cues).bytes);
-			await w.waitForFinish();
 			const segmentSize =
 				w.getWrittenByteCount() -
 				segmentOffset -
 				matroskaToHex(matroskaElements.Segment).byteLength -
 				MATROSKA_SEGMENT_MIN_VINT_WIDTH;
 			await updateSegmentSize(segmentSize);
+			await w.finish();
 		},
 	};
 };

packages/webcodecs/src/create/media-fn.ts

@@ -4,7 +4,7 @@ import type {MakeTrackAudio, MakeTrackVideo} from './make-track-info';
 import type {ProgressTracker} from './progress-tracker';
 
 export type MediaFn = {
-	save: () => Promise<Blob>;
+	getBlob: () => Promise<Blob>;
 	remove: () => Promise<void>;
 	addSample: (options: {
 		chunk: AudioOrVideoSample;

packages/webcodecs/src/create/wav/create-wav.ts

@@ -109,8 +109,8 @@ export const createWav = async ({
 	const waitForFinishPromises: (() => Promise<void>)[] = [];
 
 	return {
-		save: () => {
-			return w.save();
+		getBlob: () => {
+			return w.getBlob();
 		},
 		remove: () => {
 			return w.remove();
@@ -144,7 +144,7 @@ export const createWav = async ({
 			await Promise.all(waitForFinishPromises.map((p) => p()));
 			await operationProm.current;
 			await updateSize();
-			await w.waitForFinish();
+			await w.finish();
 		},
 		addTrack: async (track) => {
 			if (track.type !== 'audio') {

packages/webcodecs/src/writers/buffer-implementation/writer.ts

@@ -31,13 +31,18 @@ export const createContent: CreateContent = ({filename, mimeType}) => {
 			writPromise = writPromise.then(() => write(arr));
 			return writPromise;
 		},
-		save: () => {
+		finish: async () => {
+			await writPromise;
+
 			if (removed) {
 				return Promise.reject(
 					new Error('Already called .remove() on the result'),
 				);
 			}
 
+			return Promise.resolve();
+		},
+		getBlob() {
 			const arr = new Uint8Array(buf);
 			return Promise.resolve(
 				// TODO: Unhardcode MIME type and file name
@@ -53,9 +58,6 @@ export const createContent: CreateContent = ({filename, mimeType}) => {
 			writPromise = writPromise.then(() => updateDataAt(position, newData));
 			return writPromise;
 		},
-		waitForFinish: async () => {
-			await writPromise;
-		},
 	};
 	return Promise.resolve(writer);
 };

packages/webcodecs/src/writers/web-fs.ts

@@ -43,13 +43,16 @@ const createContent: CreateContent = async ({filename}) => {
 			writPromise = writPromise.then(() => write(arr));
 			return writPromise;
 		},
-		save: async () => {
+		finish: async () => {
+			await writPromise;
+
 			try {
 				await writable.close();
 			} catch {
 				// Ignore, could already be closed
 			}
-
+		},
+		async getBlob() {
 			const newHandle = await directoryHandle.getFileHandle(actualFilename, {
 				create: true,
 			});
@@ -61,9 +64,6 @@ const createContent: CreateContent = async ({filename}) => {
 			writPromise = writPromise.then(() => updateDataAt(position, data));
 			return writPromise;
 		},
-		waitForFinish: async () => {
-			await writPromise;
-		},
 		remove,
 	};