@remotion/media-parser 4.0.199 → 4.0.200

package/src/parser-state.ts

@@ -9,9 +9,7 @@ import type {
 	VideoSample,
 } from './webcodec-sample-types';
 
-export type InternalStats = {
-	samplesThatHadToBeQueued: number;
-};
+export type InternalStats = {};
 
 export const makeParserState = ({
 	hasAudioCallbacks,
@@ -43,8 +41,6 @@ export const makeParserState = ({
 	const videoSampleCallbacks: Record<number, OnVideoSample> = {};
 	const audioSampleCallbacks: Record<number, OnAudioSample> = {};
 
-	let samplesThatHadToBeQueued = 0;
-
 	const queuedAudioSamples: Record<number, AudioSample[]> = {};
 	const queuedVideoSamples: Record<number, VideoSample[]> = {};
 
@@ -64,6 +60,30 @@ export const makeParserState = ({
 		timescale = newTimescale;
 	};
 
+	const timestampMap = new Map<number, number>();
+
+	const setTimestampOffset = (byteOffset: number, timestamp: number) => {
+		timestampMap.set(byteOffset, timestamp);
+	};
+
+	const getTimestampOffsetForByteOffset = (byteOffset: number) => {
+		const entries = Array.from(timestampMap.entries());
+		const sortedByByteOffset = entries
+			.sort((a, b) => {
+				return a[0] - b[0];
+			})
+			.reverse();
+		for (const [offset, timestamp] of sortedByByteOffset) {
+			if (offset >= byteOffset) {
+				continue;
+			}
+
+			return timestamp;
+		}
+
+		return timestampMap.get(byteOffset);
+	};
+
 	return {
 		onTrackEntrySegment,
 		getTrackInfoByNumber: (id: number) => trackEntries[id],
@@ -85,6 +105,8 @@ export const makeParserState = ({
 
 			queuedVideoSamples[id] = [];
 		},
+		setTimestampOffset,
+		getTimestampOffsetForByteOffset,
 		registerAudioSampleCallback: async (
 			id: number,
 			callback: OnAudioSample | null,
@@ -112,12 +134,8 @@ export const makeParserState = ({
 				}
 
 				if (!hasAudioCallbacks) {
-					return;
+					throw new Error('No audio callbacks registered');
 				}
-
-				queuedAudioSamples[trackId] ??= [];
-				queuedAudioSamples[trackId].push(audioSample);
-				samplesThatHadToBeQueued++;
 			}
 		},
 		onVideoSample: async (trackId: number, videoSample: VideoSample) => {
@@ -130,19 +148,11 @@ export const makeParserState = ({
 				}
 
 				if (!hasVideoCallbacks) {
-					return;
+					throw new Error('No video callbacks registered');
 				}
-
-				queuedVideoSamples[trackId] ??= [];
-				queuedVideoSamples[trackId].push(videoSample);
-				samplesThatHadToBeQueued++;
 			}
 		},
-		getInternalStats: () => {
-			return {
-				samplesThatHadToBeQueued,
-			};
-		},
+		getInternalStats: () => ({}),
 		getTimescale,
 		setTimescale,
 	};

package/src/test/create-matroska.test.ts

@@ -0,0 +1,14 @@
+import {RenderInternals} from '@remotion/renderer';
+import {expect, test} from 'bun:test';
+import {makeMatroskaHeader} from '../boxes/webm/make-header';
+
+test('Should make Matroska header that is same as input', async () => {
+	const exampleVideo = RenderInternals.exampleVideos.matroskaMp3;
+	const file = await Bun.file(exampleVideo).arrayBuffer();
+
+	const headerInput = new Uint8Array(file.slice(0, 0x23 + 5));
+
+	const headerOutput = makeMatroskaHeader();
+
+	expect(headerInput).toEqual(headerOutput);
+});

package/src/test/matroska.test.ts

@@ -193,279 +193,254 @@ test('Should get duration of AV1 video', async () => {
 							timestamp: 0,
 						},
 						{
-							type: 'simple-block-segment',
+							type: 'simple-block-or-block-segment',
 							length: 279307,
 							trackNumber: 1,
 							timecode: 0,
-							headerFlags: 128,
 							keyframe: true,
-							lacing: [0, 0],
+							lacing: 0,
 							invisible: false,
-							children: [],
+							videoSample: null,
 						},
 						{
-							type: 'simple-block-segment',
+							type: 'simple-block-or-block-segment',
 							length: 96,
 							trackNumber: 1,
 							timecode: 40,
-							headerFlags: 0,
 							keyframe: false,
-							lacing: [0, 0],
+							lacing: 0,
 							invisible: false,
-							children: [],
+							videoSample: null,
 						},
 						{
-							type: 'simple-block-segment',
+							type: 'simple-block-or-block-segment',
 							length: 556,
 							trackNumber: 1,
 							timecode: 80,
-							headerFlags: 0,
 							keyframe: false,
-							lacing: [0, 0],
+							lacing: 0,
 							invisible: false,
-							children: [],
+							videoSample: null,
 						},
 						{
-							type: 'simple-block-segment',
+							type: 'simple-block-or-block-segment',
 							length: 948,
 							trackNumber: 1,
 							timecode: 120,
-							headerFlags: 0,
 							keyframe: false,
-							lacing: [0, 0],
+							lacing: 0,
 							invisible: false,
-							children: [],
+							videoSample: null,
 						},
 						{
-							type: 'simple-block-segment',
+							type: 'simple-block-or-block-segment',
 							length: 577,
 							trackNumber: 1,
 							timecode: 160,
-							headerFlags: 0,
 							keyframe: false,
-							lacing: [0, 0],
+							lacing: 0,
 							invisible: false,
-							children: [],
+							videoSample: null,
 						},
 						{
-							type: 'simple-block-segment',
+							type: 'simple-block-or-block-segment',
 							length: 779,
 							trackNumber: 1,
 							timecode: 200,
-							headerFlags: 0,
 							keyframe: false,
-							lacing: [0, 0],
+							lacing: 0,
 							invisible: false,
-							children: [],
+							videoSample: null,
 						},
 						{
-							type: 'simple-block-segment',
+							type: 'simple-block-or-block-segment',
 							length: 793,
 							trackNumber: 1,
 							timecode: 240,
-							headerFlags: 0,
 							keyframe: false,
-							lacing: [0, 0],
+							lacing: 0,
 							invisible: false,
-							children: [],
+							videoSample: null,
 						},
 						{
-							type: 'simple-block-segment',
+							type: 'simple-block-or-block-segment',
 							length: 740,
 							trackNumber: 1,
 							timecode: 280,
-							headerFlags: 0,
 							keyframe: false,
-							lacing: [0, 0],
+							lacing: 0,
 							invisible: false,
-							children: [],
+							videoSample: null,
 						},
 						{
-							type: 'simple-block-segment',
+							type: 'simple-block-or-block-segment',
 							length: 1095,
 							trackNumber: 1,
 							timecode: 320,
-							headerFlags: 0,
 							keyframe: false,
-							lacing: [0, 0],
+							lacing: 0,
 							invisible: false,
-							children: [],
+							videoSample: null,
 						},
 						{
-							type: 'simple-block-segment',
+							type: 'simple-block-or-block-segment',
 							length: 1097,
 							trackNumber: 1,
 							timecode: 360,
-							headerFlags: 0,
 							keyframe: false,
-							lacing: [0, 0],
+							lacing: 0,
 							invisible: false,
-							children: [],
+							videoSample: null,
 						},
 						{
-							type: 'simple-block-segment',
+							type: 'simple-block-or-block-segment',
 							length: 1155,
 							trackNumber: 1,
 							timecode: 400,
-							headerFlags: 0,
 							keyframe: false,
-							lacing: [0, 0],
+							lacing: 0,
 							invisible: false,
-							children: [],
+							videoSample: null,
 						},
 						{
-							type: 'simple-block-segment',
+							type: 'simple-block-or-block-segment',
 							length: 1526,
 							trackNumber: 1,
 							timecode: 440,
-							headerFlags: 0,
 							keyframe: false,
-							lacing: [0, 0],
+							lacing: 0,
 							invisible: false,
-							children: [],
+							videoSample: null,
 						},
 						{
-							type: 'simple-block-segment',
+							type: 'simple-block-or-block-segment',
 							length: 1487,
 							trackNumber: 1,
 							timecode: 480,
-							headerFlags: 0,
 							keyframe: false,
-							lacing: [0, 0],
+							lacing: 0,
 							invisible: false,
-							children: [],
+							videoSample: null,
 						},
 						{
-							type: 'simple-block-segment',
+							type: 'simple-block-or-block-segment',
 							length: 2046,
 							trackNumber: 1,
 							timecode: 520,
-							headerFlags: 0,
 							keyframe: false,
-							lacing: [0, 0],
+							lacing: 0,
 							invisible: false,
-							children: [],
+							videoSample: null,
 						},
 						{
-							type: 'simple-block-segment',
+							type: 'simple-block-or-block-segment',
 							length: 1372,
 							trackNumber: 1,
 							timecode: 560,
-							headerFlags: 0,
 							keyframe: false,
-							lacing: [0, 0],
+							lacing: 0,
 							invisible: false,
-							children: [],
+							videoSample: null,
 						},
 						{
-							type: 'simple-block-segment',
+							type: 'simple-block-or-block-segment',
 							length: 1441,
 							trackNumber: 1,
 							timecode: 600,
-							headerFlags: 0,
 							keyframe: false,
-							lacing: [0, 0],
+							lacing: 0,
 							invisible: false,
-							children: [],
+							videoSample: null,
 						},
 						{
-							type: 'simple-block-segment',
+							type: 'simple-block-or-block-segment',
 							length: 2947,
 							trackNumber: 1,
 							timecode: 640,
-							headerFlags: 0,
 							keyframe: false,
-							lacing: [0, 0],
+							lacing: 0,
 							invisible: false,
-							children: [],
+							videoSample: null,
 						},
 						{
-							type: 'simple-block-segment',
+							type: 'simple-block-or-block-segment',
 							length: 2652,
 							trackNumber: 1,
 							timecode: 680,
-							headerFlags: 0,
 							keyframe: false,
-							lacing: [0, 0],
+							lacing: 0,
 							invisible: false,
-							children: [],
+							videoSample: null,
 						},
 						{
-							type: 'simple-block-segment',
+							type: 'simple-block-or-block-segment',
 							length: 4199,
 							trackNumber: 1,
 							timecode: 720,
-							headerFlags: 0,
 							keyframe: false,
-							lacing: [0, 0],
+							lacing: 0,
 							invisible: false,
-							children: [],
+							videoSample: null,
 						},
 						{
-							type: 'simple-block-segment',
+							type: 'simple-block-or-block-segment',
 							length: 3998,
 							trackNumber: 1,
 							timecode: 760,
-							headerFlags: 0,
 							keyframe: false,
-							lacing: [0, 0],
+							lacing: 0,
 							invisible: false,
-							children: [],
+							videoSample: null,
 						},
 						{
-							type: 'simple-block-segment',
+							type: 'simple-block-or-block-segment',
 							length: 6373,
 							trackNumber: 1,
 							timecode: 800,
-							headerFlags: 0,
 							keyframe: false,
-							lacing: [0, 0],
+							lacing: 0,
 							invisible: false,
-							children: [],
+							videoSample: null,
 						},
 						{
-							type: 'simple-block-segment',
+							type: 'simple-block-or-block-segment',
 							length: 5955,
 							trackNumber: 1,
 							timecode: 840,
-							headerFlags: 0,
 							keyframe: false,
-							lacing: [0, 0],
+							lacing: 0,
 							invisible: false,
-							children: [],
+							videoSample: null,
 						},
 						{
-							type: 'simple-block-segment',
+							type: 'simple-block-or-block-segment',
 							length: 7943,
 							trackNumber: 1,
 							timecode: 880,
-							headerFlags: 0,
 							keyframe: false,
-							lacing: [0, 0],
+							lacing: 0,
 							invisible: false,
-							children: [],
+							videoSample: null,
 						},
 						{
-							type: 'simple-block-segment',
+							type: 'simple-block-or-block-segment',
 							length: 8241,
 							trackNumber: 1,
 							timecode: 920,
-							headerFlags: 0,
 							keyframe: false,
-							lacing: [0, 0],
+							lacing: 0,
 							invisible: false,
-							children: [],
+							videoSample: null,
 						},
 						{
-							type: 'simple-block-segment',
+							type: 'simple-block-or-block-segment',
 							length: 9506,
 							trackNumber: 1,
 							timecode: 960,
-							headerFlags: 0,
 							keyframe: false,
-							lacing: [0, 0],
+							lacing: 0,
 							invisible: false,
-							children: [],
+							videoSample: null,
 						},
 					],
 				},

package/src/test/stream-local.test.ts

@@ -248,6 +248,7 @@ test('Should stream ProRes video', async () => {
 
 test('Should stream variable fps video', async () => {
 	let audioTracks = 0;
+	let samples = 0;
 	const parsed = await parseMedia({
 		src: RenderInternals.exampleVideos.variablefps,
 		fields: {
@@ -269,8 +270,9 @@ test('Should stream variable fps video', async () => {
 			expect(track.numberOfChannels).toBe(1);
 			expect(track.sampleRate).toBe(48000);
 			audioTracks++;
-			// TODO: Get samples
-			return null;
+			return () => {
+				samples++;
+			};
 		},
 	});
 
@@ -314,6 +316,7 @@ test('Should stream variable fps video', async () => {
 		description: undefined,
 	});
 	expect(audioTracks).toBe(1);
+	expect(samples).toBe(381);
 });
 
 test('Should stream MKV video', async () => {
@@ -357,7 +360,7 @@ test('Should stream MKV video', async () => {
 
 	expect(videoSamples).toBe(10);
 	expect(audioSamples).toBe(16);
-	expect(parsed.internalStats.samplesThatHadToBeQueued).toBe(0);
+	expect(parsed.internalStats).toEqual({});
 });
 
 test('Should stream MP3 in MP4 video', async () => {
@@ -660,7 +663,7 @@ test('MP3 in matroska', async () => {
 	expect(parsed.audioCodec).toEqual('mp3');
 	expect(parsed.videoTracks.length).toBe(1);
 	expect(parsed.audioTracks.length).toBe(1);
-	expect(audioSamples).toBe(139);
+	expect(audioSamples).toBe(140);
 	expect(videoSamples).toBe(100);
 });
 
@@ -685,5 +688,44 @@ test('Should stream OPUS', async () => {
 
 	expect(parsed.audioCodec).toEqual('opus');
 	expect(parsed.audioTracks.length).toBe(1);
-	expect(audioSamples).toBe(166);
+	expect(audioSamples).toBe(167);
+});
+
+test('Should stream transparent video', async () => {
+	let videoTracks = 0;
+	let audioTracks = 0;
+	let videoSamples = 0;
+	let keyFrames = 0;
+
+	await parseMedia({
+		src: RenderInternals.exampleVideos.transparentwithdar,
+		reader: nodeReader,
+		onVideoTrack: (track) => {
+			expect(track.codedHeight).toBe(512);
+			expect(track.codedWidth).toBe(512);
+			videoTracks++;
+			return (sample) => {
+				// https://ffmpeg.org/pipermail/ffmpeg-devel/2015-June/173825.html
+				// For Blocks, keyframes is
+				// inferred by the absence of ReferenceBlock element (as done by matroskadec).
+				if (sample.type === 'key') {
+					keyFrames++;
+				}
+
+				videoSamples++;
+			};
+		},
+		onAudioTrack: () => {
+			audioTracks++;
+			return null;
+		},
+		fields: {
+			tracks: true,
+		},
+	});
+
+	expect(videoTracks).toBe(1);
+	expect(audioTracks).toBe(0);
+	expect(videoSamples).toBe(39);
+	expect(keyFrames).toBe(1);
 });

package/src/webcodec-sample-types.ts

@@ -3,7 +3,6 @@ import type {AudioTrack, VideoTrack} from './get-tracks';
 export type AudioSample = {
 	data: Uint8Array;
 	timestamp: number;
-	offset: number;
 	trackId: number;
 	type: 'key' | 'delta';
 };