@remotion/media-parser 4.0.210 → 4.0.212

package/dist/boxes/iso-base-media/mdat/mdat.d.ts

@@ -1,17 +1,25 @@
 import type { BufferIterator } from '../../../buffer-iterator';
 import type { AnySegment } from '../../../parse-result';
 import type { ParserContext } from '../../../parser-context';
-export interface MdatBox {
+type MdatStatus = {
+    status: 'samples-buffered';
+} | {
+    status: 'samples-skipped';
+} | {
+    status: 'samples-processed';
+};
+export type MdatBox = {
     type: 'mdat-box';
-    samplesProcessed: boolean;
     boxSize: number;
     fileOffset: number;
-}
-export declare const parseMdat: ({ data, size, fileOffset, existingBoxes, options, signal, }: {
+} & MdatStatus;
+export declare const parseMdat: ({ data, size, fileOffset, existingBoxes, options, signal, maySkipSampleProcessing, }: {
     data: BufferIterator;
     size: number;
     fileOffset: number;
     existingBoxes: AnySegment[];
     options: ParserContext;
     signal: AbortSignal | null;
+    maySkipSampleProcessing: boolean;
 }) => Promise<MdatBox>;
+export {};

package/dist/boxes/iso-base-media/mdat/mdat.js

@@ -4,14 +4,24 @@ exports.parseMdat = void 0;
 const get_tracks_1 = require("../../../get-tracks");
 const get_sample_positions_from_track_1 = require("../get-sample-positions-from-track");
 const traversal_1 = require("../traversal");
-const parseMdat = async ({ data, size, fileOffset, existingBoxes, options, signal, }) => {
+const parseMdat = async ({ data, size, fileOffset, existingBoxes, options, signal, maySkipSampleProcessing, }) => {
     const alreadyHas = (0, get_tracks_1.hasTracks)(existingBoxes);
     if (!alreadyHas) {
+        if (maySkipSampleProcessing) {
+            data.discard(size - (data.counter.getOffset() - fileOffset));
+            return Promise.resolve({
+                type: 'mdat-box',
+                boxSize: size,
+                status: 'samples-skipped',
+                fileOffset,
+            });
+        }
         data.discard(size - (data.counter.getOffset() - fileOffset));
+        data.disallowDiscard();
         return Promise.resolve({
             type: 'mdat-box',
             boxSize: size,
-            samplesProcessed: false,
+            status: 'samples-buffered',
             fileOffset,
         });
     }
@@ -98,7 +108,7 @@ const parseMdat = async ({ data, size, fileOffset, existingBoxes, options, signa
     return Promise.resolve({
         type: 'mdat-box',
         boxSize: size,
-        samplesProcessed: true,
+        status: 'samples-processed',
         fileOffset,
     });
 };

package/dist/boxes/iso-base-media/process-box.js

@@ -67,8 +67,9 @@ const parseMdatPartially = async ({ iterator, boxSize, fileOffset, parsedBoxes,
         existingBoxes: parsedBoxes,
         options,
         signal,
+        maySkipSampleProcessing: options.supportsContentRange,
     });
-    if (box.samplesProcessed &&
+    if ((box.status === 'samples-processed' || box.status === 'samples-buffered') &&
         box.fileOffset + boxSize === iterator.counter.getOffset()) {
         return {
             type: 'complete',
@@ -115,7 +116,8 @@ const processBox = async ({ iterator, allowIncompleteBoxes, parsedBoxes, options
     const boxSize = boxSizeRaw === 1 ? iterator.getEightByteNumber(littleEndian) : boxSizeRaw;
     if (bytesRemaining < boxSize) {
         if (boxType === 'mdat') {
-            const shouldSkip = options.canSkipVideoData || !(0, get_tracks_1.hasTracks)(parsedBoxes);
+            const shouldSkip = (options.canSkipVideoData || !(0, get_tracks_1.hasTracks)(parsedBoxes)) &&
+                options.supportsContentRange;
             if (shouldSkip) {
                 const skipTo = fileOffset + boxSize;
                 const bytesToSkip = skipTo - iterator.counter.getOffset();
@@ -127,7 +129,7 @@ const processBox = async ({ iterator, allowIncompleteBoxes, parsedBoxes, options
                             type: 'mdat-box',
                             boxSize,
                             fileOffset,
-                            samplesProcessed: false,
+                            status: 'samples-skipped',
                         },
                         size: boxSize,
                         skipTo: fileOffset + boxSize,
@@ -457,7 +459,11 @@ const processBox = async ({ iterator, allowIncompleteBoxes, parsedBoxes, options
             existingBoxes: parsedBoxes,
             options,
             signal,
+            maySkipSampleProcessing: options.supportsContentRange,
         });
+        if (box === null) {
+            throw new Error('Unexpected null');
+        }
         return {
             type: 'complete',
             box,
@@ -555,12 +561,19 @@ const parseBoxes = async ({ iterator, maxBytes, allowIncompleteBoxes, initialBox
         if (result.box.type === 'mdat-box' && alreadyHasMdat) {
             boxes = boxes.filter((b) => b.type !== 'mdat-box');
             boxes.push(result.box);
+            iterator.allowDiscard();
+            if (result.box.status !== 'samples-processed') {
+                throw new Error('unexpected');
+            }
             break;
         }
         else {
             boxes.push(result.box);
         }
         if (result.skipTo !== null) {
+            if (!options.supportsContentRange) {
+                throw new Error('Content-Range header is not supported by the reader, but was asked to seek');
+            }
             return {
                 status: 'incomplete',
                 segments: boxes,
@@ -579,18 +592,44 @@ const parseBoxes = async ({ iterator, maxBytes, allowIncompleteBoxes, initialBox
                 skipTo: result.skipTo,
             };
         }
+        if (iterator.bytesRemaining() < 0) {
+            return {
+                status: 'incomplete',
+                segments: boxes,
+                continueParsing: () => {
+                    return (0, exports.parseBoxes)({
+                        iterator,
+                        maxBytes,
+                        allowIncompleteBoxes,
+                        initialBoxes: boxes,
+                        options,
+                        continueMdat: false,
+                        littleEndian,
+                        signal,
+                    });
+                },
+                skipTo: null,
+            };
+        }
         iterator.removeBytesRead();
     }
-    const mdatState = (0, traversal_1.hasSkippedMdatProcessing)(boxes);
-    if (mdatState.skipped && !options.canSkipVideoData) {
+    const mdatState = (0, traversal_1.getMdatBox)(boxes);
+    const skipped = (mdatState === null || mdatState === void 0 ? void 0 : mdatState.status) === 'samples-skipped' &&
+        !options.canSkipVideoData &&
+        options.supportsContentRange;
+    const buffered = (mdatState === null || mdatState === void 0 ? void 0 : mdatState.status) === 'samples-buffered' && !options.canSkipVideoData;
+    if (skipped || buffered) {
         return {
             status: 'incomplete',
             segments: boxes,
             continueParsing: () => {
+                if (buffered) {
+                    iterator.skipTo(mdatState.fileOffset, false);
+                }
                 return (0, exports.parseBoxes)({
                     iterator,
                     maxBytes,
-                    allowIncompleteBoxes,
+                    allowIncompleteBoxes: false,
                     initialBoxes: boxes,
                     options,
                     continueMdat: false,
@@ -598,7 +637,7 @@ const parseBoxes = async ({ iterator, maxBytes, allowIncompleteBoxes, initialBox
                     signal,
                 });
             },
-            skipTo: mdatState.fileOffset,
+            skipTo: skipped ? mdatState.fileOffset : null,
         };
     }
     return {

package/dist/boxes/iso-base-media/traversal.d.ts

@@ -1,5 +1,6 @@
 import type { AnySegment, IsoBaseMediaBox, RegularBox } from '../../parse-result';
 import type { FtypBox } from './ftyp';
+import type { MdatBox } from './mdat/mdat';
 import type { MdhdBox } from './mdhd';
 import type { MoovBox } from './moov/moov';
 import type { MvhdBox } from './mvhd';
@@ -35,10 +36,4 @@ export declare const getStssBox: (trakBox: TrakBox) => StssBox | null;
 export declare const getTfdtBox: (segment: IsoBaseMediaBox) => TfdtBox | null;
 export declare const getTfhdBox: (segment: IsoBaseMediaBox) => TfhdBox | null;
 export declare const getTrunBoxes: (segment: IsoBaseMediaBox) => TrunBox[];
-export declare const hasSkippedMdatProcessing: (anySegment: AnySegment[]) => {
-    skipped: false;
-    fileOffset?: undefined;
-} | {
-    skipped: boolean;
-    fileOffset: number;
-};
+export declare const getMdatBox: (anySegment: AnySegment[]) => MdatBox | null;

package/dist/boxes/iso-base-media/traversal.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hasSkippedMdatProcessing = exports.getTrunBoxes = exports.getTfhdBox = exports.getTfdtBox = exports.getStssBox = exports.getStscBox = exports.getStszBox = exports.getCttsBox = exports.getSttsBox = exports.getStcoBox = exports.getVideoDescriptors = exports.getStsdBox = exports.getStblBox = exports.getMdhdBox = exports.getMdiaBox = exports.getTkhdBox = exports.getTraks = exports.getMvhdBox = exports.getMoofBox = exports.getMoovBox = exports.getFtypBox = void 0;
+exports.getMdatBox = exports.getTrunBoxes = exports.getTfhdBox = exports.getTfdtBox = exports.getStssBox = exports.getStscBox = exports.getStszBox = exports.getCttsBox = exports.getSttsBox = exports.getStcoBox = exports.getVideoDescriptors = exports.getStsdBox = exports.getStblBox = exports.getMdhdBox = exports.getMdiaBox = exports.getTkhdBox = exports.getTraks = exports.getMvhdBox = exports.getMoofBox = exports.getMoovBox = exports.getFtypBox = void 0;
 const getFtypBox = (segments) => {
     const ftypBox = segments.find((s) => s.type === 'ftyp-box');
     if (!ftypBox || ftypBox.type !== 'ftyp-box') {
@@ -188,24 +188,14 @@ const getTrunBoxes = (segment) => {
     return trunBoxes;
 };
 exports.getTrunBoxes = getTrunBoxes;
-const hasSkippedMdatProcessing = (anySegment) => {
+const getMdatBox = (anySegment) => {
     const mdat = anySegment.find((b) => b.type === 'mdat-box');
     if (!mdat) {
-        return {
-            skipped: false,
-        };
+        return null;
     }
     if (mdat.type !== 'mdat-box') {
         throw new Error('Expected mdat-box');
     }
-    if (mdat.samplesProcessed) {
-        return {
-            skipped: false,
-        };
-    }
-    return {
-        skipped: true,
-        fileOffset: mdat.fileOffset,
-    };
+    return mdat;
 };
-exports.hasSkippedMdatProcessing = hasSkippedMdatProcessing;
+exports.getMdatBox = getMdatBox;

package/dist/boxes/webm/color.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeMatroskaColorBytes = exports.parseColorSegment = void 0;
+const truthy_1 = require("../../truthy");
 const make_header_1 = require("./make-header");
 const traversal_1 = require("./traversal");
 const parseColorSegment = (colourSegment) => {
@@ -82,30 +83,36 @@ const makeMatroskaColorBytes = ({ transferCharacteristics, matrixCoefficients, p
         type: 'Colour',
         minVintWidth: null,
         value: [
-            {
-                type: 'TransferCharacteristics',
-                value: {
-                    value: transferChracteristicsValue,
-                    byteLength: null,
+            transferChracteristicsValue === 2
+                ? null
+                : {
+                    type: 'TransferCharacteristics',
+                    value: {
+                        value: transferChracteristicsValue,
+                        byteLength: null,
+                    },
+                    minVintWidth: null,
                 },
-                minVintWidth: null,
-            },
-            {
-                type: 'MatrixCoefficients',
-                value: {
-                    value: matrixCoefficientsValue,
-                    byteLength: null,
+            matrixCoefficientsValue === 2
+                ? null
+                : {
+                    type: 'MatrixCoefficients',
+                    value: {
+                        value: matrixCoefficientsValue,
+                        byteLength: null,
+                    },
+                    minVintWidth: null,
                 },
-                minVintWidth: null,
-            },
-            {
-                type: 'Primaries',
-                value: {
-                    value: primariesValue,
-                    byteLength: null,
+            primariesValue === 2
+                ? null
+                : {
+                    type: 'Primaries',
+                    value: {
+                        value: primariesValue,
+                        byteLength: null,
+                    },
+                    minVintWidth: null,
                 },
-                minVintWidth: null,
-            },
             {
                 type: 'Range',
                 value: {
@@ -114,7 +121,7 @@ const makeMatroskaColorBytes = ({ transferCharacteristics, matrixCoefficients, p
                 },
                 minVintWidth: null,
             },
-        ],
+        ].filter(truthy_1.truthy),
     });
 };
 exports.makeMatroskaColorBytes = makeMatroskaColorBytes;

package/dist/boxes/webm/get-track.js

@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTrack = void 0;
 const buffer_iterator_1 = require("../../buffer-iterator");
 const make_hvc1_codec_strings_1 = require("../../make-hvc1-codec-strings");
+const traversal_1 = require("../../traversal");
 const av1_codec_private_1 = require("./av1-codec-private");
 const description_1 = require("./description");
 const track_entry_1 = require("./segments/track-entry");
-const traversal_1 = require("./traversal");
 const getDescription = (track) => {
     const codec = (0, traversal_1.getCodecSegment)(track);
     if (!codec) {
@@ -128,7 +128,6 @@ const getTrack = ({ timescale, track, }) => {
         const displayHeight = (0, traversal_1.getDisplayHeightSegment)(track);
         const displayWidth = (0, traversal_1.getDisplayWidthSegment)(track);
         const codec = (0, traversal_1.getCodecSegment)(track);
-        const codecPrivate = (0, traversal_1.getPrivateData)(track);
         if (!codec) {
             return null;
         }
@@ -161,24 +160,11 @@ const getTrack = ({ timescale, track, }) => {
                 : width.value.value,
             rotation: 0,
             trakBox: null,
-            codecPrivate,
-            // TODO: Parse colors
-            color: {
-                // TODO: Set transferCharacteristics
-                transferCharacteristics: null,
-                // TODO matrixCoefficients
-                matrixCoefficients: null,
-                // TODO primaries
-                primaries: null,
-                // TODO fullRange
-                fullRange: null,
-            },
         };
     }
     if ((0, track_entry_1.trackTypeToString)(trackType.value.value) === 'audio') {
         const sampleRate = (0, traversal_1.getSampleRate)(track);
         const numberOfChannels = (0, traversal_1.getNumberOfChannels)(track);
-        const codecPrivate = (0, traversal_1.getPrivateData)(track);
         if (sampleRate === null) {
             throw new Error('Could not find sample rate or number of channels');
         }
@@ -191,7 +177,6 @@ const getTrack = ({ timescale, track, }) => {
             sampleRate,
             description: (0, description_1.getAudioDescription)(track),
             trakBox: null,
-            codecPrivate,
         };
     }
     return null;

package/dist/boxes/webm/segments/parse-children.js

@@ -34,6 +34,9 @@ const continueParsingfunction = ({ result, iterator, children, wrap, parserConte
     const offset = iterator.counter.getOffset();
     const continued = await result.continueParsing();
     if (continued.status === 'incomplete') {
+        if (!parserContext.supportsContentRange) {
+            throw new Error('Content-Range header is not supported by the reader, but was asked to seek');
+        }
         return {
             status: 'incomplete',
             continueParsing: continueParsingfunction({
@@ -70,6 +73,9 @@ const expectChildren = async ({ iterator, length, initialChildren, wrap, parserC
             wrap,
         });
         if (child.status === 'incomplete') {
+            if (!parserContext.supportsContentRange) {
+                throw new Error('Content-Range header is not supported by the reader, but was asked to seek');
+            }
             return {
                 status: 'incomplete',
                 continueParsing: continueParsingfunction({

package/dist/buffer-iterator.d.ts

@@ -5,13 +5,14 @@ export declare class OffsetCounter {
     getOffset(): number;
     getDiscardedOffset(): number;
     setDiscardedOffset(offset: number): void;
+    getDiscardedBytes(): number;
     discardBytes(amount: number): void;
     decrement(amount: number): void;
 }
 export declare const getArrayBufferIterator: (initialData: Uint8Array, maxBytes: number | null) => {
     startReadingBits: () => void;
     stopReadingBits: () => void;
-    skipTo: (offset: number) => void;
+    skipTo: (offset: number, reset: boolean) => void;
     addData: (newData: Uint8Array) => void;
     counter: OffsetCounter;
     peekB: (length: number) => void;
@@ -53,5 +54,7 @@ export declare const getArrayBufferIterator: (initialData: Uint8Array, maxBytes:
     getInt32: () => number;
     destroy: () => void;
     isMp3: () => boolean;
+    disallowDiscard: () => void;
+    allowDiscard: () => void;
 };
 export type BufferIterator = ReturnType<typeof getArrayBufferIterator>;

package/dist/buffer-iterator.js

@@ -37,6 +37,9 @@ class OffsetCounter {
     setDiscardedOffset(offset) {
         __classPrivateFieldSet(this, _OffsetCounter_discardedBytes, offset, "f");
     }
+    getDiscardedBytes() {
+        return __classPrivateFieldGet(this, _OffsetCounter_discardedBytes, "f");
+    }
     discardBytes(amount) {
         __classPrivateFieldSet(this, _OffsetCounter_discardedBytes, __classPrivateFieldGet(this, _OffsetCounter_discardedBytes, "f") + amount, "f");
     }
@@ -73,11 +76,18 @@ const getArrayBufferIterator = (initialData, maxBytes) => {
     data.set(initialData);
     let view = new DataView(data.buffer);
     const counter = makeOffsetCounter();
+    let discardAllowed = true;
     const getSlice = (amount) => {
         const value = data.slice(counter.getDiscardedOffset(), counter.getDiscardedOffset() + amount);
         counter.increment(amount);
         return value;
     };
+    const disallowDiscard = () => {
+        discardAllowed = false;
+    };
+    const allowDiscard = () => {
+        discardAllowed = true;
+    };
     const getUint8 = () => {
         const val = view.getUint8(counter.getDiscardedOffset());
         counter.increment(1);
@@ -191,8 +201,11 @@ const getArrayBufferIterator = (initialData, maxBytes) => {
         return matchesPattern(mpegPattern)(data.subarray(0, 4));
     };
     const removeBytesRead = () => {
+        if (!discardAllowed) {
+            return;
+        }
         const bytesToRemove = counter.getDiscardedOffset();
-        // Only to this operation if it is really worth it 😇
+        // Only do this operation if it is really worth it 😇
         if (bytesToRemove < 100000) {
             return;
         }
@@ -202,12 +215,23 @@ const getArrayBufferIterator = (initialData, maxBytes) => {
         buf.resize(newData.byteLength);
         view = new DataView(data.buffer);
     };
-    const skipTo = (offset) => {
+    const skipTo = (offset, reset) => {
         const becomesSmaller = offset < counter.getOffset();
         if (becomesSmaller) {
-            buf.resize(0);
-            counter.decrement(counter.getOffset() - offset);
-            counter.setDiscardedOffset(offset);
+            if (reset) {
+                buf.resize(0);
+                counter.decrement(counter.getOffset() - offset);
+                counter.setDiscardedOffset(offset);
+            }
+            else {
+                const toDecrement = counter.getOffset() - offset;
+                const newOffset = counter.getOffset() - toDecrement;
+                counter.decrement(toDecrement);
+                const c = counter.getDiscardedBytes();
+                if (c > newOffset) {
+                    throw new Error('already discarded too many bytes');
+                }
+            }
         }
         else {
             const currentOffset = counter.getOffset();
@@ -452,6 +476,8 @@ const getArrayBufferIterator = (initialData, maxBytes) => {
         getInt32,
         destroy,
         isMp3,
+        disallowDiscard,
+        allowDiscard,
     };
 };
 exports.getArrayBufferIterator = getArrayBufferIterator;

package/dist/create/cluster.d.ts

@@ -8,6 +8,12 @@ export type AudioOrVideoSample = {
 };
 export declare const timestampToClusterTimestamp: (timestamp: number) => number;
 export declare const makeCluster: (w: Writer, timestamp: number) => Promise<{
-    addSample: (chunk: AudioOrVideoSample, trackNumber: number) => Promise<void>;
-    shouldMakeNewCluster: (newT: number, keyframe: boolean) => boolean;
+    addSample: (chunk: AudioOrVideoSample, trackNumber: number) => Promise<{
+        timecodeRelativeToCluster: number;
+    }>;
+    shouldMakeNewCluster: ({ isVideo, keyframe, newT, }: {
+        newT: number;
+        keyframe: boolean;
+        isVideo: boolean;
+    }) => boolean;
 }>;

package/dist/create/cluster.js

@@ -43,11 +43,12 @@ const makeCluster = async (w, timestamp) => {
         clusterSize += simpleBlock.byteLength;
         await w.updateDataAt(clusterVIntPosition, (0, ebml_1.getVariableInt)(clusterSize, cluster_segment_1.CLUSTER_MIN_VINT_WIDTH));
         await w.write(simpleBlock);
+        return { timecodeRelativeToCluster };
     };
-    const shouldMakeNewCluster = (newT, keyframe) => {
+    const shouldMakeNewCluster = ({ isVideo, keyframe, newT, }) => {
         const newTimestamp = (0, exports.timestampToClusterTimestamp)(newT);
         const oldTimestamp = (0, exports.timestampToClusterTimestamp)(timestamp);
-        return newTimestamp - oldTimestamp >= 2000 && keyframe;
+        return newTimestamp - oldTimestamp >= 2000 && keyframe && isVideo;
     };
     return { addSample, shouldMakeNewCluster };
 };

package/dist/create/create-media.d.ts

@@ -4,7 +4,7 @@ import type { MakeTrackAudio, MakeTrackVideo } from './matroska-trackentry';
 export type MediaFn = {
     save: () => Promise<File>;
     remove: () => Promise<void>;
-    addSample: (chunk: AudioOrVideoSample, trackNumber: number) => Promise<void>;
+    addSample: (chunk: AudioOrVideoSample, trackNumber: number, isVideo: boolean) => Promise<void>;
     updateDuration: (duration: number) => Promise<void>;
     addTrack: (track: Omit<MakeTrackAudio, 'trackNumber'> | Omit<MakeTrackVideo, 'trackNumber'>) => Promise<{
         trackNumber: number;