@remotion/media-parser 4.0.249 → 4.0.250

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

@@ -1,129 +1,46 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseIsoBaseMediaBoxes = void 0;
-const continue_mdat_routine_1 = require("../../continue-mdat-routine");
-const has_all_info_1 = require("../../has-all-info");
-const may_skip_video_data_1 = require("../../may-skip-video-data/may-skip-video-data");
+exports.parseIsoBaseMedia = void 0;
+const mdat_1 = require("./mdat/mdat");
 const process_box_1 = require("./process-box");
-const traversal_1 = require("./traversal");
-const parseIsoBaseMediaBoxes = async ({ iterator, maxBytes, allowIncompleteBoxes, initialBoxes, state, signal, logLevel, fields, }) => {
-    var _a;
-    const initialOffset = iterator.counter.getOffset();
-    const continueParsing = () => {
-        return (0, exports.parseIsoBaseMediaBoxes)({
+const parseIsoBaseMedia = async ({ iterator, state, }) => {
+    const videoSectionState = state.videoSection.isInVideoSectionState(iterator);
+    if (videoSectionState === 'in-section') {
+        const skipTo = await (0, mdat_1.parseMdatSection)({
             iterator,
-            maxBytes,
-            allowIncompleteBoxes,
-            initialBoxes,
             state,
-            signal,
-            logLevel,
-            fields,
         });
-    };
-    const alreadyHasMdat = (_a = state.structure
-        .getStructureOrNull()) === null || _a === void 0 ? void 0 : _a.boxes.find((b) => b.type === 'mdat-box');
-    while (iterator.bytesRemaining() > 0 &&
-        iterator.counter.getOffset() - initialOffset < maxBytes) {
-        const result = await (0, process_box_1.processBox)({
-            iterator,
-            allowIncompleteBoxes,
-            parsedBoxes: initialBoxes,
-            state,
-            signal,
-            logLevel,
-            fields,
-        });
-        if (result.type === 'incomplete') {
-            if (Number.isFinite(maxBytes)) {
-                throw new Error('maxBytes must be Infinity for top-level boxes');
-            }
-            return {
-                status: 'incomplete',
-                continueParsing,
-                skipTo: null,
-            };
-        }
-        if (result.type === 'partial-mdat-box') {
-            return {
-                status: 'incomplete',
-                continueParsing: () => {
-                    return Promise.resolve((0, continue_mdat_routine_1.continueMdatRoutine)({
-                        iterator,
-                        maxBytes,
-                        allowIncompleteBoxes,
-                        initialBoxes,
-                        state,
-                        continueMdat: result,
-                        signal,
-                        logLevel,
-                        fields,
-                    }));
-                },
-                skipTo: null,
-            };
-        }
-        if (result.box.type === 'mdat-box' && alreadyHasMdat) {
-            initialBoxes = initialBoxes.filter((b) => b.type !== 'mdat-box');
-            initialBoxes.push(result.box);
-            iterator.allowDiscard();
-            break;
-        }
-        else {
-            initialBoxes.push(result.box);
-            if ((0, has_all_info_1.hasAllInfo)({ fields, state })) {
-                return {
-                    status: 'done',
-                };
-            }
-        }
-        if (result.skipTo !== null) {
-            if (!state.supportsContentRange) {
-                throw new Error('Content-Range header is not supported by the reader, but was asked to seek');
-            }
-            return {
-                status: 'incomplete',
-                continueParsing,
-                skipTo: result.skipTo,
-            };
-        }
-        if (iterator.bytesRemaining() < 0) {
-            return {
-                status: 'incomplete',
-                continueParsing,
-                skipTo: null,
-            };
-        }
-        iterator.removeBytesRead();
+        return {
+            skipTo,
+        };
+    }
+    const result = await (0, process_box_1.processBox)({
+        iterator,
+        state,
+    });
+    if (result.box) {
+        state.structure.getStructure().boxes.push(result.box);
+    }
+    if (iterator.counter.getOffset() === state.contentLength &&
+        state.iso.getShouldReturnToVideoSectionAfterEnd()) {
+        state.iso.setShouldReturnToVideoSectionAfterEnd(false);
+        return {
+            skipTo: state.videoSection.getVideoSection().start,
+        };
+    }
+    if (result.skipTo !== null) {
+        return {
+            skipTo: result.skipTo,
+        };
     }
-    const mdatState = (0, traversal_1.getMdatBox)(initialBoxes);
-    const skipped = (mdatState === null || mdatState === void 0 ? void 0 : mdatState.status) === 'samples-skipped' &&
-        !(0, may_skip_video_data_1.maySkipVideoData)({ state }) &&
-        state.supportsContentRange;
-    const buffered = (mdatState === null || mdatState === void 0 ? void 0 : mdatState.status) === 'samples-buffered' && !(0, may_skip_video_data_1.maySkipVideoData)({ state });
-    if (skipped || buffered) {
+    if (iterator.bytesRemaining() < 0) {
         return {
-            status: 'incomplete',
-            continueParsing: () => {
-                if (buffered) {
-                    iterator.skipTo(mdatState.fileOffset, false);
-                }
-                return (0, exports.parseIsoBaseMediaBoxes)({
-                    iterator,
-                    maxBytes,
-                    allowIncompleteBoxes: false,
-                    initialBoxes,
-                    state,
-                    signal,
-                    logLevel,
-                    fields,
-                });
-            },
-            skipTo: skipped ? mdatState.fileOffset : null,
+            skipTo: null,
         };
     }
+    iterator.removeBytesRead();
     return {
-        status: 'done',
+        skipTo: null,
     };
 };
-exports.parseIsoBaseMediaBoxes = parseIsoBaseMediaBoxes;
+exports.parseIsoBaseMedia = parseIsoBaseMedia;

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

@@ -1,12 +1,9 @@
 import type { BufferIterator } from '../../buffer-iterator';
-import type { IsoBaseMediaBox } from '../../parse-result';
 import type { BoxAndNext } from '../../parse-video';
 import type { ParserState } from '../../state/parser-state';
-export declare const parseMdatPartially: ({ iterator, boxSize, fileOffset, parsedBoxes, state, signal, }: {
+export declare const parseMdatPartially: ({ iterator, boxSize, fileOffset, state, }: {
     iterator: BufferIterator;
     boxSize: number;
     fileOffset: number;
-    parsedBoxes: IsoBaseMediaBox[];
     state: ParserState;
-    signal: AbortSignal | null;
 }) => Promise<BoxAndNext>;

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

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseMdatPartially = void 0;
 const mdat_1 = require("./mdat/mdat");
-const parseMdatPartially = async ({ iterator, boxSize, fileOffset, parsedBoxes, state, signal, }) => {
-    const box = await (0, mdat_1.parseMdat)({
+const parseMdatPartially = async ({ iterator, boxSize, fileOffset, state, }) => {
+    const box = await (0, mdat_1.parseMdatSection)({
         data: iterator,
         size: boxSize,
         fileOffset,
@@ -15,15 +15,6 @@ const parseMdatPartially = async ({ iterator, boxSize, fileOffset, parsedBoxes,
     if (box.type === 'partial-mdat-box') {
         return box;
     }
-    if ((box.status === 'samples-processed' || box.status === 'samples-buffered') &&
-        box.fileOffset + boxSize === iterator.counter.getOffset()) {
-        return {
-            type: 'complete',
-            box,
-            size: boxSize,
-            skipTo: null,
-        };
-    }
     return {
         type: 'partial-mdat-box',
         boxSize,

package/dist/boxes/iso-base-media/process-box.d.ts

@@ -1,15 +1,7 @@
 import type { BufferIterator } from '../../buffer-iterator';
-import type { LogLevel } from '../../log';
-import type { Options, ParseMediaFields } from '../../options';
-import type { IsoBaseMediaBox } from '../../parse-result';
 import type { BoxAndNext } from '../../parse-video';
 import type { ParserState } from '../../state/parser-state';
-export declare const processBox: ({ iterator, allowIncompleteBoxes, parsedBoxes, state, signal, logLevel, fields, }: {
+export declare const processBox: ({ iterator, state, }: {
     iterator: BufferIterator;
-    allowIncompleteBoxes: boolean;
-    parsedBoxes: IsoBaseMediaBox[];
     state: ParserState;
-    signal: AbortSignal | null;
-    logLevel: LogLevel;
-    fields: Options<ParseMediaFields>;
 }) => Promise<BoxAndNext>;

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

@@ -1,20 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.processBox = void 0;
-const get_tracks_1 = require("../../get-tracks");
-const may_skip_video_data_1 = require("../../may-skip-video-data/may-skip-video-data");
+const log_1 = require("../../log");
 const register_track_1 = require("../../register-track");
 const esds_1 = require("./esds/esds");
 const ftyp_1 = require("./ftyp");
 const get_children_1 = require("./get-children");
 const make_track_1 = require("./make-track");
-const mdat_1 = require("./mdat/mdat");
 const mdhd_1 = require("./mdhd");
 const hdlr_1 = require("./meta/hdlr");
 const ilst_1 = require("./meta/ilst");
 const moov_1 = require("./moov/moov");
 const mvhd_1 = require("./mvhd");
-const parse_mdat_partially_1 = require("./parse-mdat-partially");
 const av1c_1 = require("./stsd/av1c");
 const avcc_1 = require("./stsd/avcc");
 const colr_1 = require("./stsd/colr");
@@ -34,18 +31,17 @@ const tfhd_1 = require("./tfhd");
 const tkhd_1 = require("./tkhd");
 const trak_1 = require("./trak/trak");
 const trun_1 = require("./trun");
-const processBox = async ({ iterator, allowIncompleteBoxes, parsedBoxes, state, signal, logLevel, fields, }) => {
+const processBox = async ({ iterator, state, }) => {
     const fileOffset = iterator.counter.getOffset();
+    const { returnToCheckpoint } = iterator.startCheckpoint();
     const bytesRemaining = iterator.bytesRemaining();
     const boxSizeRaw = iterator.getFourByteNumber();
     if (boxSizeRaw === 0) {
         return {
-            type: 'complete',
             box: {
                 type: 'void-box',
                 boxSize: 0,
             },
-            size: 4,
             skipTo: null,
         };
     }
@@ -53,64 +49,32 @@ const processBox = async ({ iterator, allowIncompleteBoxes, parsedBoxes, state,
     if ((boxSizeRaw === 1 && iterator.bytesRemaining() < 12) ||
         iterator.bytesRemaining() < 4) {
         iterator.counter.decrement(iterator.counter.getOffset() - fileOffset);
-        if (!allowIncompleteBoxes) {
-            throw new Error(`Expected box size of ${bytesRemaining}, got ${boxSizeRaw}. Incomplete boxes are not allowed.`);
-        }
-        return {
-            type: 'incomplete',
-        };
+        throw new Error(`Expected box size of ${bytesRemaining}, got ${boxSizeRaw}. Incomplete boxes are not allowed.`);
     }
     const boxType = iterator.getByteString(4, false);
     const boxSize = boxSizeRaw === 1 ? iterator.getEightByteNumber() : boxSizeRaw;
+    log_1.Log.trace(state.logLevel, 'Found box', boxType, boxSize);
+    if (boxType === 'mdat') {
+        state.videoSection.setVideoSection({
+            size: boxSize - 8,
+            start: iterator.counter.getOffset(),
+        });
+        return {
+            box: null,
+            skipTo: null,
+        };
+    }
     if (bytesRemaining < boxSize) {
-        if (boxType !== 'mdat') {
-            iterator.counter.decrement(iterator.counter.getOffset() - fileOffset);
-            if (!allowIncompleteBoxes) {
-                throw new Error(`Expected box size of ${bytesRemaining}, got ${boxSize}. Incomplete boxes are not allowed.`);
-            }
-            return {
-                type: 'incomplete',
-            };
-        }
-        // Check if the moov atom is at the end
-        const shouldSkip = (0, may_skip_video_data_1.maySkipVideoData)({ state }) ||
-            (!(0, get_tracks_1.getHasTracks)({ type: 'iso-base-media', boxes: parsedBoxes }, state) &&
-                state.supportsContentRange);
-        if (shouldSkip) {
-            const skipTo = fileOffset + boxSize;
-            const bytesToSkip = skipTo - iterator.counter.getOffset();
-            // If there is a huge mdat chunk, we can skip it because we don't need it for the metadata
-            if (bytesToSkip > 1000000) {
-                return {
-                    type: 'complete',
-                    box: {
-                        type: 'mdat-box',
-                        boxSize,
-                        fileOffset,
-                        status: 'samples-skipped',
-                    },
-                    size: boxSize,
-                    skipTo: fileOffset + boxSize,
-                };
-            }
-        }
-        else {
-            return (0, parse_mdat_partially_1.parseMdatPartially)({
-                iterator,
-                boxSize,
-                fileOffset,
-                parsedBoxes,
-                state,
-                signal,
-            });
-        }
+        returnToCheckpoint();
+        return {
+            box: null,
+            skipTo: null,
+        };
     }
     if (boxType === 'ftyp') {
         const box = (0, ftyp_1.parseFtyp)({ iterator, size: boxSize, offset: fileOffset });
         return {
-            type: 'complete',
             box,
-            size: boxSize,
             skipTo: null,
         };
     }
@@ -120,45 +84,35 @@ const processBox = async ({ iterator, allowIncompleteBoxes, parsedBoxes, state,
             size: boxSize,
         });
         return {
-            type: 'complete',
             box,
-            size: boxSize,
             skipTo: null,
         };
     }
     if (boxType === 'mvhd') {
         const box = (0, mvhd_1.parseMvhd)({ iterator, offset: fileOffset, size: boxSize });
         return {
-            type: 'complete',
             box,
-            size: boxSize,
             skipTo: null,
         };
     }
     if (boxType === 'tkhd') {
         const box = (0, tkhd_1.parseTkhd)({ iterator, offset: fileOffset, size: boxSize });
         return {
-            type: 'complete',
             box,
-            size: boxSize,
             skipTo: null,
         };
     }
     if (boxType === 'trun') {
         const box = (0, trun_1.parseTrun)({ iterator, offset: fileOffset, size: boxSize });
         return {
-            type: 'complete',
             box,
-            size: boxSize,
             skipTo: null,
         };
     }
     if (boxType === 'tfdt') {
         const box = (0, tfdt_1.parseTfdt)({ iterator, size: boxSize, offset: fileOffset });
         return {
-            type: 'complete',
             box,
-            size: boxSize,
             skipTo: null,
         };
     }
@@ -168,13 +122,9 @@ const processBox = async ({ iterator, allowIncompleteBoxes, parsedBoxes, state,
             offset: fileOffset,
             size: boxSize,
             state,
-            signal,
-            fields,
         });
         return {
-            type: 'complete',
             box,
-            size: boxSize,
             skipTo: null,
         };
     }
@@ -185,9 +135,7 @@ const processBox = async ({ iterator, allowIncompleteBoxes, parsedBoxes, state,
             size: boxSize,
         });
         return {
-            type: 'complete',
             box,
-            size: boxSize,
             skipTo: null,
         };
     }
@@ -199,9 +147,7 @@ const processBox = async ({ iterator, allowIncompleteBoxes, parsedBoxes, state,
             mode64Bit: boxType === 'co64',
         });
         return {
-            type: 'complete',
             box,
-            size: boxSize,
             skipTo: null,
         };
     }
@@ -212,9 +158,7 @@ const processBox = async ({ iterator, allowIncompleteBoxes, parsedBoxes, state,
             size: boxSize,
         });
         return {
-            type: 'complete',
             box,
-            size: boxSize,
             skipTo: null,
         };
     }
@@ -225,9 +169,7 @@ const processBox = async ({ iterator, allowIncompleteBoxes, parsedBoxes, state,
             boxSize,
         });
         return {
-            type: 'complete',
             box,
-            size: boxSize,
             skipTo: null,
         };
     }
@@ -238,9 +180,7 @@ const processBox = async ({ iterator, allowIncompleteBoxes, parsedBoxes, state,
             size: boxSize,
         });
         return {
-            type: 'complete',
             box,
-            size: boxSize,
             skipTo: null,
         };
     }
@@ -251,9 +191,7 @@ const processBox = async ({ iterator, allowIncompleteBoxes, parsedBoxes, state,
             size: boxSize,
         });
         return {
-            type: 'complete',
             box,
-            size: boxSize,
             skipTo: null,
         };
     }
@@ -263,31 +201,23 @@ const processBox = async ({ iterator, allowIncompleteBoxes, parsedBoxes, state,
             offset: fileOffset,
             size: boxSize,
             state,
-            signal,
-            fields,
         });
         return {
-            type: 'complete',
             box,
-            size: boxSize,
             skipTo: null,
         };
     }
     if (boxType === 'hdlr') {
         const box = await (0, hdlr_1.parseHdlr)({ iterator, size: boxSize, offset: fileOffset });
         return {
-            type: 'complete',
             box,
-            size: boxSize,
             skipTo: null,
         };
     }
     if (boxType === 'keys') {
         const box = (0, keys_1.parseKeys)({ iterator, size: boxSize, offset: fileOffset });
         return {
-            type: 'complete',
             box,
-            size: boxSize,
             skipTo: null,
         };
     }
@@ -298,27 +228,27 @@ const processBox = async ({ iterator, allowIncompleteBoxes, parsedBoxes, state,
             size: boxSize,
         });
         return {
-            type: 'complete',
             box,
-            size: boxSize,
             skipTo: null,
         };
     }
     if (boxType === 'moov') {
+        if (state.callbacks.tracks.hasAllTracks()) {
+            iterator.discard(boxSize - 8);
+            return {
+                box: null,
+                skipTo: null,
+            };
+        }
         const box = await (0, moov_1.parseMoov)({
             iterator,
             offset: fileOffset,
             size: boxSize,
             state,
-            signal,
-            logLevel,
-            fields,
         });
         state.callbacks.tracks.setIsDone();
         return {
-            type: 'complete',
             box,
-            size: boxSize,
             skipTo: null,
         };
     }
@@ -328,9 +258,6 @@ const processBox = async ({ iterator, allowIncompleteBoxes, parsedBoxes, state,
             size: boxSize,
             offsetAtStart: fileOffset,
             state,
-            signal,
-            logLevel,
-            fields,
         });
         const transformedTrack = (0, make_track_1.makeBaseMediaTrack)(box);
         if (transformedTrack) {
@@ -341,9 +268,7 @@ const processBox = async ({ iterator, allowIncompleteBoxes, parsedBoxes, state,
             });
         }
         return {
-            type: 'complete',
             box,
-            size: boxSize,
             skipTo: null,
         };
     }
@@ -354,9 +279,7 @@ const processBox = async ({ iterator, allowIncompleteBoxes, parsedBoxes, state,
             fileOffset,
         });
         return {
-            type: 'complete',
             box,
-            size: boxSize,
             skipTo: null,
         };
     }
@@ -366,9 +289,7 @@ const processBox = async ({ iterator, allowIncompleteBoxes, parsedBoxes, state,
             size: boxSize,
         });
         return {
-            type: 'complete',
             box,
-            size: boxSize,
             skipTo: null,
         };
     }
@@ -378,9 +299,7 @@ const processBox = async ({ iterator, allowIncompleteBoxes, parsedBoxes, state,
             size: boxSize,
         });
         return {
-            type: 'complete',
             box,
-            size: boxSize,
             skipTo: null,
         };
     }
@@ -391,9 +310,7 @@ const processBox = async ({ iterator, allowIncompleteBoxes, parsedBoxes, state,
             offset: fileOffset,
         });
         return {
-            type: 'complete',
             box,
-            size: boxSize,
             skipTo: null,
         };
     }
@@ -404,9 +321,7 @@ const processBox = async ({ iterator, allowIncompleteBoxes, parsedBoxes, state,
             size: boxSize,
         });
         return {
-            type: 'complete',
             box,
-            size: boxSize,
             skipTo: null,
         };
     }
@@ -417,9 +332,7 @@ const processBox = async ({ iterator, allowIncompleteBoxes, parsedBoxes, state,
             fileOffset,
         });
         return {
-            type: 'complete',
             box,
-            size: boxSize,
             skipTo: null,
         };
     }
@@ -430,52 +343,45 @@ const processBox = async ({ iterator, allowIncompleteBoxes, parsedBoxes, state,
             fileOffset,
         });
         return {
-            type: 'complete',
             box,
-            size: boxSize,
             skipTo: null,
         };
     }
-    if (boxType === 'mdat') {
-        const box = await (0, mdat_1.parseMdat)({
-            data: iterator,
-            size: boxSize,
-            fileOffset,
-            existingBoxes: parsedBoxes,
+    if (boxType === 'mdia' ||
+        boxType === 'minf' ||
+        boxType === 'stbl' ||
+        boxType === 'udta' ||
+        boxType === 'moof' ||
+        boxType === 'dims' ||
+        boxType === 'meta' ||
+        boxType === 'wave' ||
+        boxType === 'traf' ||
+        boxType === 'stsb') {
+        const children = await (0, get_children_1.getIsoBaseMediaChildren)({
+            iterator,
             state,
-            signal,
-            maySkipSampleProcessing: state.supportsContentRange,
+            size: boxSize - 8,
         });
-        if (box.type === 'partial-mdat-box') {
-            return box;
-        }
         return {
-            type: 'complete',
-            box,
-            size: boxSize,
+            box: {
+                type: 'regular-box',
+                boxType,
+                boxSize,
+                children,
+                offset: fileOffset,
+            },
             skipTo: null,
         };
     }
-    const bytesRemainingInBox = boxSize - (iterator.counter.getOffset() - fileOffset);
-    const children = await (0, get_children_1.getChildren)({
-        boxType,
-        iterator,
-        bytesRemainingInBox,
-        state,
-        signal,
-        logLevel,
-        fields,
-    });
+    iterator.discard(boxSize - 8);
     return {
-        type: 'complete',
         box: {
             type: 'regular-box',
             boxType,
             boxSize,
-            children,
+            children: [],
             offset: fileOffset,
         },
-        size: boxSize,
         skipTo: null,
     };
 };