@remotion/media-parser 4.0.191 → 4.0.193

package/dist/parse-media.js

@@ -3,23 +3,35 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseMedia = void 0;
 const buffer_iterator_1 = require("./buffer-iterator");
 const from_web_1 = require("./from-web");
+const get_audio_codec_1 = require("./get-audio-codec");
 const get_dimensions_1 = require("./get-dimensions");
 const get_duration_1 = require("./get-duration");
 const get_fps_1 = require("./get-fps");
+const get_video_codec_1 = require("./get-video-codec");
 const has_all_info_1 = require("./has-all-info");
 const parse_video_1 = require("./parse-video");
 const parseMedia = async (src, options, readerInterface = from_web_1.webReader) => {
-    const reader = await readerInterface.read(src, null);
+    const { reader, contentLength } = await readerInterface.read(src, null);
     const returnValue = {};
-    const iterator = (0, buffer_iterator_1.getArrayBufferIterator)(new Uint8Array([]));
-    let parseResult = (0, parse_video_1.parseVideo)(iterator);
-    while (parseResult.status === 'incomplete') {
+    let iterator = null;
+    let parseResult = null;
+    while (parseResult === null || parseResult.status === 'incomplete') {
         const result = await reader.read();
         if (result.done) {
             break;
         }
-        iterator.addData(result.value);
-        parseResult = parseResult.continueParsing();
+        if (iterator) {
+            iterator.addData(result.value);
+        }
+        else {
+            iterator = (0, buffer_iterator_1.getArrayBufferIterator)(result.value, contentLength !== null && contentLength !== void 0 ? contentLength : undefined);
+        }
+        if (parseResult) {
+            parseResult = parseResult.continueParsing();
+        }
+        else {
+            parseResult = (0, parse_video_1.parseVideo)(iterator);
+        }
         if ((0, has_all_info_1.hasAllInfo)(options, parseResult)) {
             if (!reader.closed) {
                 reader.cancel(new Error('has all information'));
@@ -27,6 +39,9 @@ const parseMedia = async (src, options, readerInterface = from_web_1.webReader)
             break;
         }
     }
+    if (!parseResult) {
+        throw new Error('Could not parse video');
+    }
     if (options.dimensions) {
         returnValue.dimensions = (0, get_dimensions_1.getDimensions)(parseResult.segments);
     }
@@ -36,6 +51,12 @@ const parseMedia = async (src, options, readerInterface = from_web_1.webReader)
     if (options.fps) {
         returnValue.fps = (0, get_fps_1.getFps)(parseResult.segments);
     }
+    if (options.videoCodec) {
+        returnValue.videoCodec = (0, get_video_codec_1.getVideoCodec)(parseResult.segments);
+    }
+    if (options.audioCodec) {
+        returnValue.audioCodec = (0, get_audio_codec_1.getAudioCodec)(parseResult.segments);
+    }
     if (options.boxes) {
         returnValue.boxes = parseResult.segments;
     }

package/dist/parse-result.d.ts

@@ -1,5 +1,7 @@
 import type { BaseBox } from './boxes/iso-base-media/base-type';
+import type { EsdsBox } from './boxes/iso-base-media/esds/esds';
 import type { FtypBox } from './boxes/iso-base-media/ftyp';
+import type { MdhdBox } from './boxes/iso-base-media/mdhd';
 import type { MoovBox } from './boxes/iso-base-media/moov/moov';
 import type { MvhdBox } from './boxes/iso-base-media/mvhd';
 import type { KeysBox } from './boxes/iso-base-media/stsd/keys';
@@ -16,7 +18,7 @@ interface RegularBox extends BaseBox {
     offset: number;
     type: 'regular-box';
 }
-export type IsoBaseMediaBox = RegularBox | FtypBox | MvhdBox | TkhdBox | StsdBox | MebxBox | KeysBox | MoovBox | TrakBox | SttsBox;
+export type IsoBaseMediaBox = RegularBox | FtypBox | MvhdBox | TkhdBox | StsdBox | MebxBox | KeysBox | MoovBox | TrakBox | SttsBox | MdhdBox | EsdsBox;
 export type AnySegment = MatroskaSegment | IsoBaseMediaBox;
 export type ParseResult = {
     status: 'done';

package/dist/read-and-increment-offset.d.ts

@@ -0,0 +1,28 @@
+export declare class OffsetCounter {
+    #private;
+    constructor(initial: number);
+    increment(amount: number): void;
+    getOffset(): number;
+}
+export declare const getArrayBufferIterator: (data: ArrayBuffer, initialOffset: number) => {
+    view: DataView;
+    counter: OffsetCounter;
+    data: ArrayBuffer;
+    discard: (length: number) => void;
+    getSlice: (amount: number) => ArrayBuffer;
+    getAtom: () => string;
+    getMatroskaSegmentId: () => string;
+    getVint: (bytes: number) => number;
+    getUint8: () => number;
+    getEBML: () => number;
+    getInt8: () => number;
+    getUint16: () => number;
+    getInt16: () => number;
+    getUint32: () => number;
+    getFixedPoint1616Number: () => number;
+    getPascalString: () => number[];
+    getDecimalBytes(length: number): number;
+    getByteString(length: number): string;
+    getFloat64: () => number;
+};
+export type BufferIterator = ReturnType<typeof getArrayBufferIterator>;

package/dist/read-and-increment-offset.js

@@ -0,0 +1,177 @@
+"use strict";
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _OffsetCounter_offset;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getArrayBufferIterator = exports.OffsetCounter = void 0;
+class OffsetCounter {
+    constructor(initial) {
+        _OffsetCounter_offset.set(this, void 0);
+        __classPrivateFieldSet(this, _OffsetCounter_offset, initial, "f");
+    }
+    increment(amount) {
+        if (amount < 0) {
+            throw new Error('Cannot increment by a negative amount');
+        }
+        __classPrivateFieldSet(this, _OffsetCounter_offset, __classPrivateFieldGet(this, _OffsetCounter_offset, "f") + amount, "f");
+    }
+    getOffset() {
+        return __classPrivateFieldGet(this, _OffsetCounter_offset, "f");
+    }
+}
+exports.OffsetCounter = OffsetCounter;
+_OffsetCounter_offset = new WeakMap();
+const makeOffsetCounter = (initial) => {
+    return new OffsetCounter(initial);
+};
+const getArrayBufferIterator = (data, initialOffset) => {
+    const view = new DataView(data);
+    const counter = makeOffsetCounter(initialOffset);
+    const getSlice = (amount) => {
+        const value = data.slice(counter.getOffset(), counter.getOffset() + amount);
+        counter.increment(amount);
+        return value;
+    };
+    const getUint8 = () => {
+        const val = view.getUint8(counter.getOffset());
+        counter.increment(1);
+        return val;
+    };
+    const getUint32 = () => {
+        const val = view.getUint32(counter.getOffset());
+        counter.increment(4);
+        return val;
+    };
+    return {
+        view,
+        counter,
+        data,
+        discard: (length) => {
+            counter.increment(length);
+        },
+        getSlice,
+        getAtom: () => {
+            const atom = getSlice(4);
+            return new TextDecoder().decode(atom);
+        },
+        getMatroskaSegmentId: () => {
+            const first = getSlice(1);
+            const firstOneString = `0x${Array.from(new Uint8Array(first))
+                .map((b) => {
+                return b.toString(16).padStart(2, '0');
+            })
+                .join('')}`;
+            // Catch void block
+            const knownIdsWithOneLength = ['0xec', '0xae'];
+            if (knownIdsWithOneLength.includes(firstOneString)) {
+                return firstOneString;
+            }
+            const firstTwo = getSlice(1);
+            const knownIdsWithTwoLength = ['0x4dbb', '0x53ac', '0xec01'];
+            const firstTwoString = `${firstOneString}${Array.from(new Uint8Array(firstTwo))
+                .map((b) => {
+                return b.toString(16).padStart(2, '0');
+            })
+                .join('')}`;
+            if (knownIdsWithTwoLength.includes(firstTwoString)) {
+                return firstTwoString;
+            }
+            const knownIdsWithThreeLength = ['0x4d808c', '0x57418c', '0x448988'];
+            const firstThree = getSlice(1);
+            const firstThreeString = `${firstTwoString}${Array.from(new Uint8Array(firstThree))
+                .map((b) => {
+                return b.toString(16).padStart(2, '0');
+            })
+                .join('')}`;
+            if (knownIdsWithThreeLength.includes(firstThreeString)) {
+                return firstThreeString;
+            }
+            const segmentId = getSlice(1);
+            return `${firstThreeString}${Array.from(new Uint8Array(segmentId))
+                .map((b) => {
+                return b.toString(16).padStart(2, '0');
+            })
+                .join('')}`;
+        },
+        getVint: (bytes) => {
+            const slice = getSlice(bytes);
+            const d = [...Array.from(new Uint8Array(slice))];
+            const totalLength = d[0];
+            if (totalLength === 0) {
+                return 0;
+            }
+            // Calculate the actual length of the data based on the first set bit
+            let actualLength = 0;
+            while (((totalLength >> (7 - actualLength)) & 0x01) === 0) {
+                actualLength++;
+            }
+            actualLength += 1; // Include the first byte set as 1
+            // Combine the numbers to form the integer value
+            let value = 0;
+            // Mask the first byte properly then start combining
+            value = totalLength & (0xff >> actualLength);
+            for (let i = 1; i < actualLength; i++) {
+                value = (value << 8) | d[i];
+            }
+            return value;
+        },
+        getUint8,
+        getEBML: () => {
+            const val = getUint8();
+            // https://darkcoding.net/software/reading-mediarecorders-webm-opus-output/#:~:text=The%20first%20four%20bytes%20(%201A,%E2%80%93%20read%20on%20for%20why).
+            // You drop the initial 0 bits and the first 1 bit to get the value. 0x81 is 0b10000001, so there are zero inital 0 bits, meaning length one byte, and the value is 1. The 0x9F value for length of the EBML header we saw earlier is 0b10011111, still one byte, value is 0b0011111, which is 31 (the python repl is very helpful for these conversions).
+            const actualValue = val & 0x7f; // 0x7F is binary 01111111, which masks out the first bit
+            return actualValue;
+        },
+        getInt8: () => {
+            const val = view.getInt8(counter.getOffset());
+            counter.increment(1);
+            return val;
+        },
+        getUint16: () => {
+            const val = view.getUint16(counter.getOffset());
+            counter.increment(2);
+            return val;
+        },
+        getInt16: () => {
+            const val = view.getInt16(counter.getOffset());
+            counter.increment(2);
+            return val;
+        },
+        getUint32,
+        // https://developer.apple.com/documentation/quicktime-file-format/sound_sample_description_version_1
+        // A 32-bit unsigned fixed-point number (16.16) that indicates the rate at which the sound samples were obtained.
+        getFixedPoint1616Number: () => {
+            const val = getUint32();
+            return val / 2 ** 16;
+        },
+        getPascalString: () => {
+            const val = getSlice(32);
+            return [...Array.from(new Uint8Array(val))];
+        },
+        getDecimalBytes(length) {
+            const bytes = getSlice(length);
+            const numbers = [...Array.from(new Uint8Array(bytes))];
+            return numbers.reduce((acc, byte, index) => acc + (byte << (8 * (numbers.length - index - 1))), 0);
+        },
+        getByteString(length) {
+            const bytes = getSlice(length);
+            return new TextDecoder().decode(bytes);
+        },
+        getFloat64: () => {
+            const val = view.getFloat64(counter.getOffset());
+            counter.increment(8);
+            return val;
+        },
+    };
+};
+exports.getArrayBufferIterator = getArrayBufferIterator;

package/dist/reader.d.ts

@@ -1,4 +1,8 @@
-type ReadContent = (src: string, range: [number, number] | null) => Promise<ReadableStreamDefaultReader<Uint8Array>>;
+type ReadResult = {
+    reader: ReadableStreamDefaultReader<Uint8Array>;
+    contentLength: number | null;
+};
+type ReadContent = (src: string, range: [number, number] | null) => Promise<ReadResult>;
 type GetLength = (src: string) => Promise<number>;
 export type ReaderInterface = {
     read: ReadContent;

package/package.json

@@ -3,11 +3,11 @@
     "url": "https://github.com/remotion-dev/remotion/tree/main/packages/media-parser"
   },
   "name": "@remotion/media-parser",
-  "version": "4.0.191",
+  "version": "4.0.193",
   "main": "dist/index.js",
   "sideEffects": false,
   "devDependencies": {
-    "@remotion/renderer": "4.0.191"
+    "@remotion/renderer": "4.0.193"
   },
   "publishConfig": {
     "access": "public"

package/src/boxes/iso-base-media/esds/esds-descriptors.ts

@@ -0,0 +1,104 @@
+import type {BufferIterator} from '../../../buffer-iterator';
+
+type AudioObjectType = 'aac' | 'mp3' | 'unknown';
+
+type DecoderConfigDescriptor = {
+	type: 'decoder-config-descriptor';
+	objectTypeIndication: AudioObjectType;
+};
+
+const mapToObjectAudioIndicator = (num: number): AudioObjectType => {
+	// https://chromium.googlesource.com/chromium/src/media/+/master/formats/mp4/es_descriptor.h
+	// http://netmedia.zju.edu.cn/multimedia2013/mpeg-4/ISO%20IEC%2014496-1%20MPEG-4%20System%20Standard.pdf
+	// Page 42, table 8
+	if (num === 0x40) {
+		return 'aac';
+	}
+
+	if (num === 0x6b) {
+		return 'mp3';
+	}
+
+	return 'unknown';
+};
+
+type SlConfigDescriptor = {
+	type: 'sl-config-descriptor';
+};
+
+type UnknownDescriptor = {
+	type: 'unknown-descriptor';
+};
+
+export type Descriptor =
+	| DecoderConfigDescriptor
+	| SlConfigDescriptor
+	| UnknownDescriptor;
+
+type DescriptorAndNext = {
+	descriptor: Descriptor | null;
+};
+
+export const processDescriptor = ({
+	iterator,
+}: {
+	iterator: BufferIterator;
+}): DescriptorAndNext => {
+	const tag = iterator.getUint8();
+
+	if (tag === 4) {
+		const size = iterator.getPaddedFourByteNumber();
+		const initialOffset = iterator.counter.getOffset();
+
+		const objectTypeIndication = iterator.getUint8();
+
+		const remaining = size - (iterator.counter.getOffset() - initialOffset);
+		iterator.discard(remaining);
+		return {
+			descriptor: {
+				type: 'decoder-config-descriptor',
+				objectTypeIndication: mapToObjectAudioIndicator(objectTypeIndication),
+			},
+		};
+	}
+
+	if (tag === 6) {
+		const size = iterator.getPaddedFourByteNumber();
+
+		iterator.discard(size);
+		return {
+			descriptor: {
+				type: 'sl-config-descriptor',
+			},
+		};
+	}
+
+	return {
+		descriptor: null,
+	};
+};
+
+export const parseDescriptors = (
+	iterator: BufferIterator,
+	maxBytes: number,
+): Descriptor[] => {
+	const descriptors: Descriptor[] = [];
+	const initialOffset = iterator.counter.getOffset();
+
+	while (
+		iterator.bytesRemaining() > 0 &&
+		iterator.counter.getOffset() - initialOffset < maxBytes
+	) {
+		const {descriptor} = processDescriptor({
+			iterator,
+		});
+
+		if (descriptor) {
+			descriptors.push(descriptor);
+		} else {
+			break;
+		}
+	}
+
+	return descriptors;
+};

package/src/boxes/iso-base-media/esds/esds.ts

@@ -0,0 +1,49 @@
+import type {BufferIterator} from '../../../buffer-iterator';
+import type {Descriptor} from './esds-descriptors';
+import {parseDescriptors} from './esds-descriptors';
+
+export interface EsdsBox {
+	type: 'esds-box';
+	version: number;
+	tag: number;
+	sizeOfInstance: number;
+	esId: number;
+	descriptors: Descriptor[];
+}
+
+export const parseEsds = ({
+	data,
+	size,
+	fileOffset,
+}: {
+	data: BufferIterator;
+	size: number;
+	fileOffset: number;
+}): EsdsBox => {
+	const version = data.getUint8();
+	// Flags, we discard them
+	data.discard(3);
+	const tag = data.getUint8();
+
+	const sizeOfInstance = data.getPaddedFourByteNumber();
+	const esId = data.getUint16();
+
+	// disard 1 byte, currently unknown
+	data.discard(1);
+
+	const remaining = size - (data.counter.getOffset() - fileOffset);
+	const descriptors = parseDescriptors(data, remaining);
+
+	const remainingNow = size - (data.counter.getOffset() - fileOffset);
+
+	data.discard(remainingNow);
+
+	return {
+		type: 'esds-box',
+		version,
+		tag,
+		sizeOfInstance,
+		esId,
+		descriptors,
+	};
+};

package/src/boxes/iso-base-media/mdhd.ts

@@ -0,0 +1,56 @@
+import type {BufferIterator} from '../../buffer-iterator';
+
+export interface MdhdBox {
+	type: 'mdhd-box';
+	version: number;
+	timescale: number;
+	duration: number;
+	language: number;
+	quality: number;
+}
+
+export const parseMdhd = ({
+	data,
+	size,
+	fileOffset,
+}: {
+	data: BufferIterator;
+	size: number;
+	fileOffset: number;
+}): MdhdBox => {
+	const version = data.getUint8();
+	if (version !== 0) {
+		throw new Error(`Unsupported MDHD version ${version}`);
+	}
+
+	// flags, we discard them
+	data.discard(3);
+
+	// creation time
+	data.discard(4);
+
+	// modification time
+	data.discard(4);
+
+	const timescale = data.getUint32();
+	const duration = data.getUint32();
+
+	const language = data.getUint16();
+
+	// quality
+	const quality = data.getUint16();
+
+	const remaining = size - (data.counter.getOffset() - fileOffset);
+	if (remaining !== 0) {
+		throw new Error(`Expected remaining bytes to be 0, got ${remaining}`);
+	}
+
+	return {
+		type: 'mdhd-box',
+		duration,
+		timescale,
+		version,
+		language,
+		quality,
+	};
+};

package/src/boxes/iso-base-media/process-box.ts

@@ -1,7 +1,9 @@
 import type {BufferIterator} from '../../buffer-iterator';
 import type {IsoBaseMediaBox, ParseResult} from '../../parse-result';
 import type {BoxAndNext} from '../../parse-video';
+import {parseEsds} from './esds/esds';
 import {parseFtyp} from './ftyp';
+import {parseMdhd} from './mdhd';
 import {parseMoov} from './moov/moov';
 import {parseMvhd} from './mvhd';
 import {parseMebx} from './stsd/mebx';
@@ -24,6 +26,7 @@ const getChildren = ({
 		boxType === 'minf' ||
 		boxType === 'stbl' ||
 		boxType === 'dims' ||
+		boxType === 'wave' ||
 		boxType === 'stsb';
 
 	if (parseChildren) {
@@ -41,6 +44,10 @@ const getChildren = ({
 		return parsed.segments;
 	}
 
+	if (bytesRemainingInBox < 0) {
+		throw new Error('Box size is too big ' + JSON.stringify({boxType}));
+	}
+
 	iterator.discard(bytesRemainingInBox);
 	return [];
 };
@@ -162,6 +169,34 @@ const processBox = ({
 		};
 	}
 
+	if (boxType === 'mdhd') {
+		const box = parseMdhd({
+			data: iterator,
+			size: boxSize,
+			fileOffset,
+		});
+
+		return {
+			type: 'complete',
+			box,
+			size: boxSize,
+		};
+	}
+
+	if (boxType === 'esds') {
+		const box = parseEsds({
+			data: iterator,
+			size: boxSize,
+			fileOffset,
+		});
+
+		return {
+			type: 'complete',
+			box,
+			size: boxSize,
+		};
+	}
+
 	const bytesRemainingInBox =
 		boxSize - (iterator.counter.getOffset() - fileOffset);
 

package/src/boxes/iso-base-media/stsd/samples.ts

@@ -1,4 +1,6 @@
 import type {BufferIterator} from '../../../buffer-iterator';
+import type {AnySegment} from '../../../parse-result';
+import {parseBoxes} from '../process-box';
 
 type SampleBase = {
 	format: string;
@@ -21,6 +23,7 @@ type AudioSample = SampleBase & {
 	bytesPerPacket: number | null;
 	bytesPerFrame: number | null;
 	bitsPerSample: number | null;
+	children: AnySegment[];
 };
 
 type VideoSample = SampleBase & {
@@ -77,6 +80,7 @@ const videoTags = [
 	'v410',
 	'v210',
 	'hvc1',
+	'ap4h',
 ];
 
 // https://developer.apple.com/documentation/quicktime-file-format/sound_sample_descriptions
@@ -163,7 +167,16 @@ export const processSample = ({
 
 			const bytesRemainingInBox =
 				boxSize - (iterator.counter.getOffset() - fileOffset);
-			iterator.discard(bytesRemainingInBox);
+			const children = parseBoxes({
+				iterator,
+				allowIncompleteBoxes: false,
+				maxBytes: bytesRemainingInBox,
+				initialBoxes: [],
+			});
+
+			if (children.status === 'incomplete') {
+				throw new Error('Incomplete boxes are not allowed');
+			}
 
 			return {
 				sample: {
@@ -184,6 +197,7 @@ export const processSample = ({
 					bytesPerPacket: null,
 					bytesPerFrame: null,
 					bitsPerSample: null,
+					children: children.segments,
 				},
 			};
 		}
@@ -191,17 +205,29 @@ export const processSample = ({
 		if (version === 1) {
 			const numberOfChannels = iterator.getUint16();
 			const sampleSize = iterator.getUint16();
-			const compressionId = iterator.getUint16();
+			const compressionId = iterator.getInt16();
 			const packetSize = iterator.getUint16();
 			const sampleRate = iterator.getFixedPoint1616Number();
-			const samplesPerPacket = iterator.getUint16();
-			const bytesPerPacket = iterator.getUint16();
-			const bytesPerFrame = iterator.getUint16();
-			const bitsPerSample = iterator.getUint16();
+
+			const samplesPerPacket = iterator.getUint32();
+
+			const bytesPerPacket = iterator.getUint32();
+			const bytesPerFrame = iterator.getUint32();
+			const bytesPerSample = iterator.getUint32();
 
 			const bytesRemainingInBox =
 				boxSize - (iterator.counter.getOffset() - fileOffset);
-			iterator.discard(bytesRemainingInBox);
+
+			const children = parseBoxes({
+				iterator,
+				allowIncompleteBoxes: false,
+				maxBytes: bytesRemainingInBox,
+				initialBoxes: [],
+			});
+
+			if (children.status === 'incomplete') {
+				throw new Error('Incomplete boxes are not allowed');
+			}
 
 			return {
 				sample: {
@@ -221,7 +247,8 @@ export const processSample = ({
 					samplesPerPacket,
 					bytesPerPacket,
 					bytesPerFrame,
-					bitsPerSample,
+					bitsPerSample: bytesPerSample,
+					children: children.segments,
 				},
 			};
 		}
@@ -244,6 +271,7 @@ export const processSample = ({
 
 		const bytesRemainingInBox =
 			boxSize - (iterator.counter.getOffset() - fileOffset);
+
 		iterator.discard(bytesRemainingInBox);
 
 		return {