@remotion/media-parser 4.0.293 → 4.0.294

package/dist/readers/from-web-file.js

@@ -9,42 +9,30 @@ const webFileReadContent = ({ src, range, controller }) => {
         ? src
         : typeof range === 'number'
             ? src.slice(range)
-            : src.slice(range[0], range[1]);
-    const reader = new FileReader();
-    reader.readAsArrayBuffer(src);
-    const ownController = new AbortController();
-    if (ownController) {
-        ownController.signal.addEventListener('abort', () => {
-            reader.abort();
-        }, { once: true });
-    }
+            : src.slice(range[0], range[1] + 1);
+    const stream = part.stream();
+    const streamReader = stream.getReader();
     if (controller) {
         controller._internals.signal.addEventListener('abort', () => {
-            ownController.abort();
+            streamReader.cancel();
         }, { once: true });
     }
-    return new Promise((resolve, reject) => {
-        reader.onload = () => {
-            const stream = part.stream();
-            const streamReader = stream.getReader();
-            resolve({
-                reader: {
-                    reader: streamReader,
-                    abort() {
-                        streamReader.cancel();
-                        ownController.abort();
-                    },
-                },
-                contentLength: src.size,
-                name: src instanceof File ? src.name : src.toString(),
-                supportsContentRange: true,
-                contentType: src.type,
-                needsContentRange: true,
-            });
-        };
-        reader.onerror = () => {
-            reject(reader.error);
-        };
+    return Promise.resolve({
+        reader: {
+            reader: streamReader,
+            async abort() {
+                try {
+                    await streamReader.cancel();
+                }
+                catch (_a) { }
+                return Promise.resolve();
+            },
+        },
+        contentLength: src.size,
+        name: src instanceof File ? src.name : src.toString(),
+        supportsContentRange: true,
+        contentType: src.type,
+        needsContentRange: true,
     });
 };
 exports.webFileReadContent = webFileReadContent;

package/dist/readers/reader.d.ts

@@ -4,7 +4,7 @@ import type { ParseMediaRange, ParseMediaSrc } from '../options';
 import type { PrefetchCache } from './from-fetch';
 export type Reader = {
     reader: ReadableStreamDefaultReader<Uint8Array>;
-    abort: () => void;
+    abort: () => Promise<void>;
 };
 type ReadResult = {
     reader: Reader;

package/dist/seek-backwards.js

@@ -13,6 +13,7 @@ const seekBackwards = async ({ iterator, seekTo, readerInterface, src, controlle
     // (b) data has been discarded, making new reader
     const time = Date.now();
     log_1.Log.verbose(logLevel, `Seeking in video from position ${iterator.counter.getOffset()} -> ${seekTo}. Re-reading because this portion is not available.`);
+    await currentReader.getCurrent().abort();
     const { reader: newReader } = await readerInterface.read({
         src,
         range: seekTo,

package/dist/seek-forwards.js

@@ -22,6 +22,7 @@ const seekForward = async ({ seekTo, userInitiated, iterator, fields, logLevel,
     // (b) starting byte has not been fetched yet, making new reader
     const time = Date.now();
     log_1.Log.verbose(logLevel, `Skipping over video data from position ${iterator.counter.getOffset()} -> ${seekTo}. Re-reading because this portion is not available`);
+    await currentReader.getCurrent().abort();
     const { reader: newReader } = await readerInterface.read({
         src,
         range: seekTo,

package/dist/state/iso-base-media/cached-sample-positions.d.ts

@@ -17,12 +17,15 @@ export type MinimalFlatSampleForTesting = {
         offset: number;
     };
 };
-export declare const calculateFlatSamples: (state: ParserState) => {
+export declare const calculateFlatSamples: ({ state, mediaSectionStart, }: {
+    state: ParserState;
+    mediaSectionStart: number;
+}) => {
     track: VideoTrack | AudioTrack | OtherTrack;
     samplePosition: SamplePosition;
 }[][];
 export declare const cachedSamplePositionsState: () => {
-    getSamples: (mdatStart: number) => FlatSample[] | null;
+    getSamples: (mdatStart: number) => FlatSample[];
     setSamples: (mdatStart: number, samples: FlatSample[]) => void;
     setJumpMarks: (mdatStart: number, marks: JumpMark[]) => void;
     getJumpMarks: (mdatStart: number) => JumpMark[];

package/dist/state/iso-base-media/cached-sample-positions.js

@@ -1,21 +1,33 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cachedSamplePositionsState = exports.calculateFlatSamples = void 0;
+const are_samples_complete_1 = require("../../containers/iso-base-media/are-samples-complete");
 const get_sample_positions_from_track_1 = require("../../containers/iso-base-media/get-sample-positions-from-track");
 const traversal_1 = require("../../containers/iso-base-media/traversal");
 const get_tracks_1 = require("../../get-tracks");
-const calculateFlatSamples = (state) => {
+const precomputed_tfra_1 = require("./precomputed-tfra");
+const calculateFlatSamples = ({ state, mediaSectionStart, }) => {
     const tracks = (0, get_tracks_1.getTracks)(state, true);
     const allTracks = [
         ...tracks.videoTracks,
         ...tracks.audioTracks,
         ...tracks.otherTracks,
     ];
+    const moofBoxes = (0, traversal_1.getMoofBoxes)(state.structure.getIsoStructure().boxes);
+    const tfraBoxes = (0, precomputed_tfra_1.deduplicateTfraBoxesByOffset)([
+        ...state.iso.tfra.getTfraBoxes(),
+        ...(0, traversal_1.getTfraBoxes)(state.structure.getIsoStructure().boxes),
+    ]);
+    const moofComplete = (0, are_samples_complete_1.areSamplesComplete)({ moofBoxes, tfraBoxes });
+    const relevantMoofBox = moofBoxes.find((moofBox) => moofBox.offset + moofBox.size + 8 === mediaSectionStart);
+    if (moofBoxes.length > 0 && !relevantMoofBox) {
+        throw new Error('No relevant moof box found');
+    }
     const flatSamples = allTracks.map((track) => {
         const { samplePositions } = (0, get_sample_positions_from_track_1.getSamplePositionsFromTrack)({
             trakBox: track.trakBox,
-            moofBoxes: (0, traversal_1.getMoofBoxes)(state.structure.getIsoStructure().boxes),
-            tfraBoxes: (0, traversal_1.getTfraBoxes)(state.structure.getIsoStructure()),
+            moofBoxes: relevantMoofBox ? [relevantMoofBox] : [],
+            moofComplete,
         });
         return samplePositions.map((samplePosition) => {
             return {
@@ -32,10 +44,8 @@ const cachedSamplePositionsState = () => {
     const jumpMarksForMdatStart = {};
     return {
         getSamples: (mdatStart) => {
-            if (cachedForMdatStart[mdatStart]) {
-                return cachedForMdatStart[mdatStart];
-            }
-            return null;
+            var _a;
+            return (_a = cachedForMdatStart[mdatStart]) !== null && _a !== void 0 ? _a : null;
         },
         setSamples: (mdatStart, samples) => {
             cachedForMdatStart[mdatStart] = samples;

package/dist/state/iso-base-media/iso-state.d.ts

@@ -12,7 +12,7 @@ export declare const isoBaseMediaState: ({ contentLength, controller, readerInte
     prefetchCache: PrefetchCache;
 }) => {
     flatSamples: {
-        getSamples: (mdatStart: number) => import("./cached-sample-positions").FlatSample[] | null;
+        getSamples: (mdatStart: number) => import("./cached-sample-positions").FlatSample[];
         setSamples: (mdatStart: number, samples: import("./cached-sample-positions").FlatSample[]) => void;
         setJumpMarks: (mdatStart: number, marks: import("../../containers/iso-base-media/mdat/calculate-jump-marks").JumpMark[]) => void;
         getJumpMarks: (mdatStart: number) => import("../../containers/iso-base-media/mdat/calculate-jump-marks").JumpMark[];

package/dist/state/iso-base-media/last-moof-box.d.ts

@@ -0,0 +1,2 @@
+import type { IsoBaseMediaBox } from '../../containers/iso-base-media/base-media-box';
+export declare const getLastMoofBox: (boxes: IsoBaseMediaBox[]) => number | null | undefined;

package/dist/state/iso-base-media/last-moof-box.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getLastMoofBox = void 0;
+const truthy_1 = require("../../truthy");
+const getLastMoofBox = (boxes) => {
+    if (boxes) {
+        const tfras = boxes.filter((b) => b.type === 'tfra-box');
+        const lastMoofOffsets = tfras.map((f) => {
+            if (f.entries.length <= 1) {
+                return null;
+            }
+            return f.entries[f.entries.length - 1].moofOffset;
+        });
+        if (lastMoofOffsets.length > 0) {
+            const maxOffset = Math.max(...lastMoofOffsets.filter(truthy_1.truthy));
+            return maxOffset;
+        }
+        return null;
+    }
+};
+exports.getLastMoofBox = getLastMoofBox;

package/dist/state/iso-base-media/precomputed-moof.d.ts

@@ -1,6 +1,7 @@
 import type { IsoBaseMediaBox } from '../../containers/iso-base-media/base-media-box';
 export type MoofBox = {
     offset: number;
+    size: number;
     trafBoxes: IsoBaseMediaBox[];
 };
 export declare const precomputedMoofState: () => {

package/dist/state/iso-base-media/precomputed-moof.js

@@ -19,6 +19,7 @@ const toMoofBox = (box) => {
     return {
         offset: box.offset,
         trafBoxes: box.children.filter((c) => c.type === 'regular-box' && c.boxType === 'traf'),
+        size: box.boxSize,
     };
 };
 exports.toMoofBox = toMoofBox;

package/dist/state/parser-state.d.ts

@@ -135,7 +135,7 @@ export declare const makeParserState: ({ hasAudioTrackHandlers, hasVideoTrackHan
     };
     iso: {
         flatSamples: {
-            getSamples: (mdatStart: number) => import("./iso-base-media/cached-sample-positions").FlatSample[] | null;
+            getSamples: (mdatStart: number) => import("./iso-base-media/cached-sample-positions").FlatSample[];
             setSamples: (mdatStart: number, samples: import("./iso-base-media/cached-sample-positions").FlatSample[]) => void;
             setJumpMarks: (mdatStart: number, marks: import("../containers/iso-base-media/mdat/calculate-jump-marks").JumpMark[]) => void;
             getJumpMarks: (mdatStart: number) => import("../containers/iso-base-media/mdat/calculate-jump-marks").JumpMark[];

package/dist/state/parser-state.js

@@ -52,6 +52,7 @@ const makeParserState = ({ hasAudioTrackHandlers, hasVideoTrackHandlers, control
         fields: fieldsInReturnValue,
         callbacks,
     });
+    const mediaSection = (0, video_section_1.mediaSectionState)();
     return {
         riff: (0, riff_1.riffSpecificState)({
             controller,
@@ -112,7 +113,7 @@ const makeParserState = ({ hasAudioTrackHandlers, hasVideoTrackHandlers, control
         samplesObserved,
         contentLength,
         images,
-        mediaSection: (0, video_section_1.mediaSectionState)(),
+        mediaSection,
         logLevel,
         iterator,
         controller,

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "4.0.293";
+export declare const VERSION = "4.0.294";

package/dist/version.js

@@ -2,4 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VERSION = void 0;
 // Automatically generated on publish
-exports.VERSION = '4.0.293';
+exports.VERSION = '4.0.294';

package/package.json

@@ -3,15 +3,15 @@
     "url": "https://github.com/remotion-dev/remotion/tree/main/packages/media-parser"
   },
   "name": "@remotion/media-parser",
-  "version": "4.0.293",
+  "version": "4.0.294",
   "main": "dist/index.js",
   "sideEffects": false,
   "devDependencies": {
     "@types/wicg-file-system-access": "2023.10.5",
     "eslint": "9.19.0",
     "@types/bun": "1.2.8",
-    "@remotion/example-videos": "4.0.293",
-    "@remotion/eslint-config-internal": "4.0.293"
+    "@remotion/example-videos": "4.0.294",
+    "@remotion/eslint-config-internal": "4.0.294"
   },
   "publishConfig": {
     "access": "public"