@remotion/media-parser 4.0.200 → 4.0.202

package/src/test/mvhd.test.ts

@@ -64,7 +64,7 @@ test('Should be able to parse a MVHD box correctly', () => {
 		0, 0, 0, 2,
 	]);
 
-	const iterator = getArrayBufferIterator(buffer);
+	const iterator = getArrayBufferIterator(buffer, null);
 	iterator.discard(8);
 
 	const mvhd = parseMvhd({

package/src/test/parse-esds.test.ts

@@ -11,7 +11,7 @@ test('Parse ESDS box', () => {
 		0, 0, 0, 4, 226, 0, 0, 4, 226, 0, 6, 128, 128, 128, 1, 2,
 	]);
 
-	const iter = getArrayBufferIterator(buf);
+	const iter = getArrayBufferIterator(buf, null);
 	iter.counter.increment(8);
 
 	expect(
@@ -55,7 +55,7 @@ test('Parse two ESDS', () => {
 		226, 0, 5, 2, 17, 144, 6, 1, 2, 0, 0, 0, 24, 115, 116, 116, 115,
 	]);
 
-	const iter = getArrayBufferIterator(buf);
+	const iter = getArrayBufferIterator(buf, null);
 	iter.counter.increment(8);
 
 	expect(

package/src/test/parse-stco.test.ts

@@ -12,12 +12,13 @@ test('Parse stco box', () => {
 		246,
 	]);
 
-	const iterator = getArrayBufferIterator(buf);
+	const iterator = getArrayBufferIterator(buf, null);
 	iterator.counter.increment(8);
 	const result = parseStco({
 		iterator,
 		size: buf.length - 8,
 		offset: 0,
+		mode64Bit: false,
 	});
 	expect(result).toEqual({
 		type: 'stco-box',
@@ -40,12 +41,13 @@ test('Parse stco box with empty chunk', () => {
 		172,
 	]);
 
-	const iterator = getArrayBufferIterator(buf);
+	const iterator = getArrayBufferIterator(buf, null);
 	iterator.counter.increment(8);
 	const result = parseStco({
 		iterator,
 		size: buf.length - 8,
 		offset: 0,
+		mode64Bit: false,
 	});
 	expect(result).toEqual({
 		type: 'stco-box',

package/src/test/parse-stsc.test.ts

@@ -11,7 +11,7 @@ test('Parse stsc box', () => {
 		0, 0, 1, 0, 0, 0, 1,
 	]);
 
-	const iterator = getArrayBufferIterator(buffer);
+	const iterator = getArrayBufferIterator(buffer, null);
 	iterator.counter.increment(8);
 	const result = parseStsc({
 		iterator,
@@ -51,7 +51,7 @@ test('Parse stsc box 2', () => {
 		0, 0, 0, 1,
 	]);
 
-	const iterator = getArrayBufferIterator(buffer);
+	const iterator = getArrayBufferIterator(buffer, null);
 	iterator.counter.increment(8);
 	const result = parseStsc({
 		iterator,

package/src/test/parse-stsz.test.ts

@@ -11,7 +11,7 @@ test('parse stsz box 1', () => {
 		186, 0, 0, 2, 83, 0, 0, 2, 36, 0, 0, 2, 99, 0, 0, 2, 189, 0, 0, 2, 23, 0, 0,
 		3, 8, 0, 0, 2, 74, 0, 0, 0, 52, 115, 116, 99, 111,
 	]);
-	const iterator = getArrayBufferIterator(buf);
+	const iterator = getArrayBufferIterator(buf, null);
 	iterator.counter.increment(8);
 	const result = parseStsz({
 		iterator,
@@ -37,7 +37,7 @@ test('parse stsz box 2', () => {
 		// actual box
 		0, 0, 0, 0, 0, 0, 3, 192, 0, 0, 0, 15, 0, 0, 0, 52, 115, 116, 99, 111,
 	]);
-	const iterator = getArrayBufferIterator(buf);
+	const iterator = getArrayBufferIterator(buf, null);
 	iterator.counter.increment(8);
 	const result = parseStsz({
 		iterator,

package/src/test/parse-stts.test.ts

@@ -11,7 +11,7 @@ const buffer = new Uint8Array([
 ]);
 
 test('Should parse stts box', () => {
-	const iterator = getArrayBufferIterator(buffer);
+	const iterator = getArrayBufferIterator(buffer, null);
 	iterator.counter.increment(8);
 	const result = parseStts({
 		data: iterator,

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

@@ -18,7 +18,7 @@ test('Should stream ISO base media', async () => {
 			tracks: true,
 			dimensions: true,
 			rotation: true,
-			unrotatedDimension: true,
+			unrotatedDimensions: true,
 		},
 		reader: nodeReader,
 		onVideoTrack: (track) => {
@@ -46,7 +46,7 @@ test('Should stream ISO base media', async () => {
 	expect(result.videoTracks.length).toBe(1);
 	expect(result.videoTracks[0].codec).toBe('hvc1.2.4.L150.b0');
 	expect(result.rotation).toBe(-90);
-	expect(result.unrotatedDimension).toEqual({
+	expect(result.unrotatedDimensions).toEqual({
 		height: 2160,
 		width: 3840,
 	});
@@ -258,7 +258,7 @@ test('Should stream variable fps video', async () => {
 			videoCodec: true,
 			audioCodec: true,
 			rotation: true,
-			unrotatedDimension: true,
+			unrotatedDimensions: true,
 			tracks: true,
 			boxes: true,
 		},
@@ -278,8 +278,8 @@ test('Should stream variable fps video', async () => {
 
 	expect(parsed.dimensions.width).toBe(1280);
 	expect(parsed.dimensions.height).toBe(720);
-	expect(parsed.unrotatedDimension.width).toBe(1280);
-	expect(parsed.unrotatedDimension.height).toBe(720);
+	expect(parsed.unrotatedDimensions.width).toBe(1280);
+	expect(parsed.unrotatedDimensions.height).toBe(720);
 	expect(parsed.durationInSeconds).toBe(22.901);
 	expect(parsed.videoCodec).toBe('vp8');
 	expect(parsed.audioCodec).toBe('opus');
@@ -413,7 +413,7 @@ test('Should get duration of HEVC video', async () => {
 			audioCodec: true,
 			rotation: true,
 			tracks: true,
-			unrotatedDimension: true,
+			unrotatedDimensions: true,
 			videoCodec: true,
 		},
 		onVideoTrack: () => {
@@ -437,7 +437,7 @@ test('Should get duration of HEVC video', async () => {
 	expect(parsed.audioTracks.length).toBe(1);
 	expect(parsed.audioTracks[0].codec).toBe('mp4a.40.02');
 	expect(parsed.audioTracks[0].description).toEqual(new Uint8Array([18, 16]));
-	expect(parsed.unrotatedDimension).toEqual({
+	expect(parsed.unrotatedDimensions).toEqual({
 		width: 1920,
 		height: 1080,
 	});
@@ -456,7 +456,7 @@ test('Custom DAR', async () => {
 			tracks: true,
 			dimensions: true,
 			rotation: true,
-			unrotatedDimension: true,
+			unrotatedDimensions: true,
 		},
 		reader: nodeReader,
 	});
@@ -480,7 +480,7 @@ test('Custom DAR', async () => {
 	expect(parsed.videoTracks[0].codedWidth).toBe(1280);
 	expect(parsed.videoTracks[0].codedHeight).toBe(720);
 	expect(parsed.rotation).toBe(0);
-	expect(parsed.unrotatedDimension).toEqual({
+	expect(parsed.unrotatedDimensions).toEqual({
 		height: 720,
 		width: 405,
 	});
@@ -729,3 +729,17 @@ test('Should stream transparent video', async () => {
 	expect(videoSamples).toBe(39);
 	expect(keyFrames).toBe(1);
 });
+
+test('Acknowledge there are .avi file', () => {
+	const parsed = parseMedia({
+		src: RenderInternals.exampleVideos.avi,
+		fields: {
+			tracks: true,
+			boxes: true,
+		},
+		reader: nodeReader,
+	});
+
+	expect(parsed).rejects.toThrow('AVI');
+	expect(parsed).rejects.toThrow('not yet supported');
+});

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

@@ -20,25 +20,29 @@ test('Should stream', async () => {
 	expect(result.videoCodec).toEqual('h264');
 });
 
-test('Should stream from Wikipedia', async () => {
-	const result = await parseMedia({
-		src: 'https://upload.wikimedia.org/wikipedia/commons/transcoded/c/c0/Big_Buck_Bunny_4K.webm/Big_Buck_Bunny_4K.webm.720p.vp9.webm',
-		fields: {
-			durationInSeconds: true,
-			fps: true,
-			dimensions: true,
-			videoCodec: true,
-		},
-	});
-	expect(result.durationInSeconds).toBe(634.571);
-	// TODO: Not yet implemented
-	expect(result.fps).toBe(null);
-	expect(result.dimensions).toEqual({
-		width: 1280,
-		height: 720,
-	});
-	expect(result.videoCodec).toEqual('vp9');
-});
+test(
+	'Should stream from Wikipedia',
+	async () => {
+		const result = await parseMedia({
+			src: 'https://upload.wikimedia.org/wikipedia/commons/transcoded/c/c0/Big_Buck_Bunny_4K.webm/Big_Buck_Bunny_4K.webm.720p.vp9.webm',
+			fields: {
+				durationInSeconds: true,
+				fps: true,
+				dimensions: true,
+				videoCodec: true,
+			},
+		});
+		expect(result.durationInSeconds).toBe(634.571);
+		// TODO: Not yet implemented
+		expect(result.fps).toBe(null);
+		expect(result.dimensions).toEqual({
+			width: 1280,
+			height: 720,
+		});
+		expect(result.videoCodec).toEqual('vp9');
+	},
+	{timeout: 10000},
+);
 
 test('Should handle redirect', async () => {
 	const result = await parseMedia({

package/src/test/stsd.test.ts

@@ -35,7 +35,7 @@ test('Should be able to parse a STSD audio box correctly', async () => {
 		2, 18, 16, 6, 128, 128, 128, 1, 2, 0, 0, 0, 8, 0, 0, 0, 0,
 	]);
 
-	const iterator = getArrayBufferIterator(buffer);
+	const iterator = getArrayBufferIterator(buffer, null);
 	iterator.discard(8);
 
 	const parsed = await parseStsd({
@@ -49,7 +49,9 @@ test('Should be able to parse a STSD audio box correctly', async () => {
 			parserState: makeParserState({
 				hasAudioCallbacks: false,
 				hasVideoCallbacks: false,
+				signal: undefined,
 			}),
+			nullifySamples: false,
 		},
 	});
 
@@ -205,7 +207,7 @@ test('Should be able to parse a STSD video box correctly', async () => {
 	]);
 
 	const parsed = await processSample({
-		iterator: getArrayBufferIterator(buffer),
+		iterator: getArrayBufferIterator(buffer, null),
 		options: {
 			canSkipVideoData: true,
 			onAudioTrack: null,
@@ -213,7 +215,9 @@ test('Should be able to parse a STSD video box correctly', async () => {
 			parserState: makeParserState({
 				hasAudioCallbacks: false,
 				hasVideoCallbacks: false,
+				signal: undefined,
 			}),
+			nullifySamples: false,
 		},
 	});
 	expect(parsed.sample).toEqual({

package/src/test/tkhd.test.ts

@@ -58,7 +58,7 @@ test('Should be able to parse a TKHD box', () => {
 		0, 0, 0, 0,
 	]);
 
-	const iterator = getArrayBufferIterator(buffer);
+	const iterator = getArrayBufferIterator(buffer, null);
 	iterator.discard(8);
 	const mvhd = parseTkhd({
 		iterator,

package/src/traversal.ts

@@ -11,20 +11,20 @@ import type {StszBox} from './boxes/iso-base-media/stsd/stsz';
 import type {SttsBox} from './boxes/iso-base-media/stsd/stts';
 import type {TkhdBox} from './boxes/iso-base-media/tkhd';
 import type {TrakBox} from './boxes/iso-base-media/trak/trak';
-import type {MainSegment} from './boxes/webm/segments/main';
-import type {TimestampScaleSegment} from './boxes/webm/segments/timestamp-scale';
 import type {
 	AudioSegment,
 	ClusterSegment,
-	CodecSegment,
+	CodecIdSegment,
 	DisplayHeightSegment,
 	DisplayWidthSegment,
 	HeightSegment,
-	TrackEntrySegment,
+	MainSegment,
+	TimestampScaleSegment,
+	TrackEntry,
 	TrackTypeSegment,
 	VideoSegment,
 	WidthSegment,
-} from './boxes/webm/segments/track-entry';
+} from './boxes/webm/segments/all-segments';
 import type {AnySegment, RegularBox} from './parse-result';
 
 export const getFtypBox = (segments: AnySegment[]): FtypBox | null => {
@@ -242,18 +242,16 @@ export const getStssBox = (trakBox: TrakBox): StssBox | null => {
 export const getClusterSegment = (
 	segment: MainSegment,
 ): ClusterSegment | null => {
-	const clusterSegment = segment.children.find(
-		(b) => b.type === 'cluster-segment',
-	) as ClusterSegment | undefined;
+	const clusterSegment = segment.value.find((b) => b.type === 'Cluster') as
+		| ClusterSegment
+		| undefined;
 
 	return clusterSegment ?? null;
 };
 
 export const getTracksSegment = (segment: MainSegment) => {
-	const tracksSegment = segment.children.find(
-		(b) => b.type === 'tracks-segment',
-	);
-	if (!tracksSegment || tracksSegment.type !== 'tracks-segment') {
+	const tracksSegment = segment.value.find((b) => b.type === 'Tracks');
+	if (!tracksSegment || tracksSegment.type !== 'Tracks') {
 		return null;
 	}
 
@@ -263,139 +261,120 @@ export const getTracksSegment = (segment: MainSegment) => {
 export const getTimescaleSegment = (
 	segment: MainSegment,
 ): TimestampScaleSegment | null => {
-	const infoSegment = segment.children.find((b) => b.type === 'info-segment');
+	const infoSegment = segment.value.find((b) => b.type === 'Info');
 
-	if (!infoSegment || infoSegment.type !== 'info-segment') {
+	if (!infoSegment || infoSegment.type !== 'Info') {
 		return null;
 	}
 
-	const timescale = infoSegment.children.find(
-		(b) => b.type === 'timestamp-scale-segment',
-	);
+	const timescale = infoSegment.value.find((b) => b.type === 'TimestampScale');
 
-	if (!timescale || timescale.type !== 'timestamp-scale-segment') {
+	if (!timescale || timescale.type !== 'TimestampScale') {
 		return null;
 	}
 
-	return timescale;
+	return timescale as TimestampScaleSegment;
 };
 
-export const getVideoSegment = (
-	track: TrackEntrySegment,
-): VideoSegment | null => {
-	const videoSegment = track.children.find((b) => b.type === 'video-segment');
-	if (!videoSegment || videoSegment.type !== 'video-segment') {
+export const getVideoSegment = (track: TrackEntry): VideoSegment | null => {
+	const videoSegment = track.value.find((b) => b.type === 'Video');
+	if (!videoSegment || videoSegment.type !== 'Video') {
 		return null;
 	}
 
 	return videoSegment ?? null;
 };
 
-export const getAudioSegment = (
-	track: TrackEntrySegment,
-): AudioSegment | null => {
-	const audioSegment = track.children.find((b) => b.type === 'audio-segment');
-	if (!audioSegment || audioSegment.type !== 'audio-segment') {
+export const getAudioSegment = (track: TrackEntry): AudioSegment | null => {
+	const audioSegment = track.value.find((b) => b.type === 'Audio');
+	if (!audioSegment || audioSegment.type !== 'Audio') {
 		return null;
 	}
 
 	return audioSegment ?? null;
 };
 
-export const getSampleRate = (track: TrackEntrySegment): number | null => {
+export const getSampleRate = (track: TrackEntry): number | null => {
 	const audioSegment = getAudioSegment(track);
 	if (!audioSegment) {
 		return null;
 	}
 
-	const samplingFrequency = audioSegment.children.find(
-		(b) => b.type === 'sampling-frequency-segment',
+	const samplingFrequency = audioSegment.value.find(
+		(b) => b.type === 'SamplingFrequency',
 	);
 
-	if (
-		!samplingFrequency ||
-		samplingFrequency.type !== 'sampling-frequency-segment'
-	) {
+	if (!samplingFrequency || samplingFrequency.type !== 'SamplingFrequency') {
 		return null;
 	}
 
-	return samplingFrequency.samplingFrequency;
+	return samplingFrequency.value.value;
 };
 
-export const getNumberOfChannels = (track: TrackEntrySegment): number => {
+export const getNumberOfChannels = (track: TrackEntry): number => {
 	const audioSegment = getAudioSegment(track);
 	if (!audioSegment) {
 		throw new Error('Could not find audio segment');
 	}
 
-	const channels = audioSegment.children.find(
-		(b) => b.type === 'channels-segment',
-	);
+	const channels = audioSegment.value.find((b) => b.type === 'Channels');
 
-	if (!channels || channels.type !== 'channels-segment') {
+	if (!channels || channels.type !== 'Channels') {
 		return 1;
 	}
 
-	return channels.channels;
+	return channels.value.value;
 };
 
-export const getBitDepth = (track: TrackEntrySegment): number | null => {
+export const getBitDepth = (track: TrackEntry): number | null => {
 	const audioSegment = getAudioSegment(track);
 	if (!audioSegment) {
 		return null;
 	}
 
-	const bitDepth = audioSegment.children.find(
-		(b) => b.type === 'bit-depth-segment',
-	);
+	const bitDepth = audioSegment.value.find((b) => b.type === 'BitDepth');
 
-	if (!bitDepth || bitDepth.type !== 'bit-depth-segment') {
+	if (!bitDepth || bitDepth.type !== 'BitDepth') {
 		return null;
 	}
 
-	return bitDepth.bitDepth;
+	return bitDepth.value.value;
 };
 
-export const getPrivateData = (track: TrackEntrySegment): Uint8Array | null => {
-	const privateData = track.children.find(
-		(b) => b.type === 'codec-private-segment',
-	);
+export const getPrivateData = (track: TrackEntry): Uint8Array | null => {
+	const privateData = track.value.find((b) => b.type === 'CodecPrivate');
 
-	if (!privateData || privateData.type !== 'codec-private-segment') {
+	if (!privateData || privateData.type !== 'CodecPrivate') {
 		return null;
 	}
 
-	return privateData.codecPrivateData;
+	return privateData.value;
 };
 
-export const getWidthSegment = (
-	track: TrackEntrySegment,
-): WidthSegment | null => {
+export const getWidthSegment = (track: TrackEntry): WidthSegment | null => {
 	const videoSegment = getVideoSegment(track);
 	if (!videoSegment) {
 		return null;
 	}
 
-	const width = videoSegment.children.find((b) => b.type === 'width-segment');
+	const width = videoSegment.value.find((b) => b.type === 'PixelWidth');
 
-	if (!width || width.type !== 'width-segment') {
+	if (!width || width.type !== 'PixelWidth') {
 		return null;
 	}
 
 	return width;
 };
 
-export const getHeightSegment = (
-	track: TrackEntrySegment,
-): HeightSegment | null => {
+export const getHeightSegment = (track: TrackEntry): HeightSegment | null => {
 	const videoSegment = getVideoSegment(track);
 	if (!videoSegment) {
 		return null;
 	}
 
-	const height = videoSegment.children.find((b) => b.type === 'height-segment');
+	const height = videoSegment.value.find((b) => b.type === 'PixelHeight');
 
-	if (!height || height.type !== 'height-segment') {
+	if (!height || height.type !== 'PixelHeight') {
 		return null;
 	}
 
@@ -403,18 +382,18 @@ export const getHeightSegment = (
 };
 
 export const getDisplayWidthSegment = (
-	track: TrackEntrySegment,
+	track: TrackEntry,
 ): DisplayWidthSegment | null => {
 	const videoSegment = getVideoSegment(track);
 	if (!videoSegment) {
 		return null;
 	}
 
-	const displayWidth = videoSegment.children.find(
-		(b) => b.type === 'display-width-segment',
+	const displayWidth = videoSegment.value.find(
+		(b) => b.type === 'DisplayWidth',
 	);
 
-	if (!displayWidth || displayWidth.type !== 'display-width-segment') {
+	if (!displayWidth || displayWidth.type !== 'DisplayWidth') {
 		return null;
 	}
 
@@ -422,18 +401,18 @@ export const getDisplayWidthSegment = (
 };
 
 export const getDisplayHeightSegment = (
-	track: TrackEntrySegment,
+	track: TrackEntry,
 ): DisplayHeightSegment | null => {
 	const videoSegment = getVideoSegment(track);
 	if (!videoSegment) {
 		return null;
 	}
 
-	const displayHeight = videoSegment.children.find(
-		(b) => b.type === 'display-height-segment',
+	const displayHeight = videoSegment.value.find(
+		(b) => b.type === 'DisplayHeight',
 	);
 
-	if (!displayHeight || displayHeight.type !== 'display-height-segment') {
+	if (!displayHeight || displayHeight.type !== 'DisplayHeight') {
 		return null;
 	}
 
@@ -441,30 +420,28 @@ export const getDisplayHeightSegment = (
 };
 
 export const getTrackTypeSegment = (
-	track: TrackEntrySegment,
+	track: TrackEntry,
 ): TrackTypeSegment | null => {
-	const trackType = track.children.find((b) => b.type === 'track-type-segment');
-	if (!trackType || trackType.type !== 'track-type-segment') {
+	const trackType = track.value.find((b) => b.type === 'TrackType');
+	if (!trackType || trackType.type !== 'TrackType') {
 		return null;
 	}
 
 	return trackType;
 };
 
-export const getTrackId = (track: TrackEntrySegment): number => {
-	const trackId = track.children.find((b) => b.type === 'track-number-segment');
-	if (!trackId || trackId.type !== 'track-number-segment') {
+export const getTrackId = (track: TrackEntry): number => {
+	const trackId = track.value.find((b) => b.type === 'TrackNumber');
+	if (!trackId || trackId.type !== 'TrackNumber') {
 		throw new Error('Expected track number segment');
 	}
 
-	return trackId.trackNumber;
+	return trackId.value.value;
 };
 
-export const getCodecSegment = (
-	track: TrackEntrySegment,
-): CodecSegment | null => {
-	const codec = track.children.find((b) => b.type === 'codec-segment');
-	if (!codec || codec.type !== 'codec-segment') {
+export const getCodecSegment = (track: TrackEntry): CodecIdSegment | null => {
+	const codec = track.value.find((b) => b.type === 'CodecID');
+	if (!codec || codec.type !== 'CodecID') {
 		return null;
 	}