@remotion/media-parser 4.0.350 → 4.0.351

package/dist/containers/iso-base-media/mdat/calculate-jump-marks.d.ts

@@ -0,0 +1,6 @@
+import type { MinimalFlatSampleForTesting } from '../../../state/iso-base-media/cached-sample-positions';
+export type JumpMark = {
+    afterSampleWithOffset: number;
+    jumpToOffset: number;
+};
+export declare const calculateJumpMarks: (samplePositionTracks: MinimalFlatSampleForTesting[][], endOfMdat: number) => JumpMark[];

package/dist/containers/iso-base-media/mdat/calculate-jump-marks.js

@@ -0,0 +1,131 @@
+"use strict";
+/*
+  https://discord.com/channels/809501355504959528/1001500302375125055/1364798934832119870
+  Android 13 produces MP4 videos where first, all video samples are at the beginning,
+  then all audio samples are at the end.
+
+  This causes issues with our video decoder: "Waited too long for VideoDecoder" because
+  the overall progress is stuck.
+*/
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.calculateJumpMarks = void 0;
+// In WebCodecs, we require the tracks to deviate by at most 10 seconds
+// Therefore, we need to emit them to be less than 10 seconds apart
+const MAX_SPREAD_IN_SECONDS = 8;
+const getKey = (samplePositionTrack) => {
+    return `${samplePositionTrack.track.trackId}-${samplePositionTrack.samplePosition.decodingTimestamp}`;
+};
+const findBestJump = ({ allSamplesSortedByOffset, visited, progresses, }) => {
+    var _a;
+    const minProgress = Math.min(...Object.values(progresses));
+    const trackNumberWithLowestProgress = (_a = Object.entries(progresses).find(([, progress]) => progress === minProgress)) === null || _a === void 0 ? void 0 : _a[0];
+    const firstSampleAboveMinProgress = allSamplesSortedByOffset.findIndex((sample) => sample.track.trackId === Number(trackNumberWithLowestProgress) &&
+        !visited.has(getKey(sample)));
+    return firstSampleAboveMinProgress;
+};
+const calculateJumpMarks = (samplePositionTracks, endOfMdat) => {
+    const progresses = {};
+    for (const track of samplePositionTracks) {
+        progresses[track[0].track.trackId] = 0;
+    }
+    const jumpMarks = [];
+    const allSamplesSortedByOffset = samplePositionTracks
+        .flat(1)
+        .sort((a, b) => a.samplePosition.offset - b.samplePosition.offset);
+    let indexToVisit = 0;
+    const visited = new Set();
+    let rollOverToProcess = false;
+    const increaseIndex = () => {
+        indexToVisit++;
+        if (indexToVisit >= allSamplesSortedByOffset.length) {
+            rollOverToProcess = true;
+            indexToVisit = 0;
+        }
+    };
+    let lastVisitedSample = null;
+    const addJumpMark = ({ firstSampleAboveMinProgress, }) => {
+        if (!lastVisitedSample) {
+            throw new Error('no last visited sample');
+        }
+        const jumpMark = {
+            afterSampleWithOffset: lastVisitedSample.samplePosition.offset,
+            jumpToOffset: allSamplesSortedByOffset[firstSampleAboveMinProgress].samplePosition
+                .offset,
+        };
+        indexToVisit = firstSampleAboveMinProgress;
+        jumpMarks.push(jumpMark);
+    };
+    const addFinalJumpIfNecessary = () => {
+        if (indexToVisit === allSamplesSortedByOffset.length - 1) {
+            return;
+        }
+        jumpMarks.push({
+            afterSampleWithOffset: allSamplesSortedByOffset[indexToVisit].samplePosition.offset,
+            jumpToOffset: endOfMdat,
+        });
+    };
+    const considerJump = () => {
+        const firstSampleAboveMinProgress = findBestJump({
+            allSamplesSortedByOffset,
+            visited,
+            progresses,
+        });
+        if (firstSampleAboveMinProgress > -1 &&
+            firstSampleAboveMinProgress !== indexToVisit + 1) {
+            addJumpMark({ firstSampleAboveMinProgress });
+            indexToVisit = firstSampleAboveMinProgress;
+        }
+        else {
+            while (true) {
+                increaseIndex();
+                if (!visited.has(getKey(allSamplesSortedByOffset[indexToVisit]))) {
+                    break;
+                }
+            }
+        }
+    };
+    while (true) {
+        const currentSamplePosition = allSamplesSortedByOffset[indexToVisit];
+        const sampleKey = getKey(currentSamplePosition);
+        if (visited.has(sampleKey)) {
+            considerJump();
+            continue;
+        }
+        visited.add(sampleKey);
+        if (rollOverToProcess) {
+            if (!lastVisitedSample) {
+                throw new Error('no last visited sample');
+            }
+            jumpMarks.push({
+                afterSampleWithOffset: lastVisitedSample.samplePosition.offset,
+                jumpToOffset: currentSamplePosition.samplePosition.offset,
+            });
+            rollOverToProcess = false;
+        }
+        lastVisitedSample = currentSamplePosition;
+        if (visited.size === allSamplesSortedByOffset.length) {
+            addFinalJumpIfNecessary();
+            break;
+        }
+        const timestamp = currentSamplePosition.samplePosition.decodingTimestamp /
+            currentSamplePosition.track.originalTimescale;
+        progresses[currentSamplePosition.track.trackId] = timestamp;
+        const progressValues = Object.values(progresses);
+        const maxProgress = Math.max(...progressValues);
+        const minProgress = Math.min(...progressValues);
+        const spread = maxProgress - minProgress;
+        if (visited.size === allSamplesSortedByOffset.length) {
+            addFinalJumpIfNecessary();
+            break;
+        }
+        // Also don't allow audio progress to go more
+        if (spread > MAX_SPREAD_IN_SECONDS) {
+            considerJump();
+        }
+        else {
+            increaseIndex();
+        }
+    }
+    return jumpMarks;
+};
+exports.calculateJumpMarks = calculateJumpMarks;

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

@@ -92,7 +92,7 @@ const parseMdatSection = async (state) => {
         return (0, skip_1.makeSkip)(endOfMdat);
     }
     const exactMatch = nextSampleArray.find((s) => s.samplePosition.offset === state.iterator.counter.getOffset());
-    const nextSample = exactMatch !== null && exactMatch !== void 0 ? exactMatch : nextSampleArray[0];
+    const nextSample = exactMatch !== null && exactMatch !== void 0 ? exactMatch : nextSampleArray.sort((a, b) => a.samplePosition.offset - b.samplePosition.offset)[0];
     if (nextSample.samplePosition.offset !== state.iterator.counter.getOffset()) {
         return (0, skip_1.makeSkip)(nextSample.samplePosition.offset);
     }

package/dist/containers/iso-base-media/mvhd.d.ts

@@ -0,0 +1,30 @@
+import type { BufferIterator } from '../../iterator/buffer-iterator';
+import type { BaseBox } from './base-type';
+export type ThreeDMatrix = [
+    number,
+    number,
+    number,
+    number,
+    number,
+    number,
+    number,
+    number,
+    number
+];
+export interface MvhdBox extends BaseBox {
+    durationInUnits: number;
+    durationInSeconds: number;
+    creationTime: number | null;
+    modificationTime: number | null;
+    timeScale: number;
+    rate: number;
+    volume: number;
+    matrix: ThreeDMatrix;
+    nextTrackId: number;
+    type: 'mvhd-box';
+}
+export declare const parseMvhd: ({ iterator, offset, size, }: {
+    iterator: BufferIterator;
+    offset: number;
+    size: number;
+}) => MvhdBox;

package/dist/containers/iso-base-media/mvhd.js

@@ -0,0 +1,65 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseMvhd = void 0;
+const buffer_iterator_1 = require("../../iterator/buffer-iterator");
+const to_date_1 = require("./to-date");
+const parseMvhd = ({ iterator, offset, size, }) => {
+    const version = iterator.getUint8();
+    // Flags, we discard them
+    iterator.discard(3);
+    const creationTime = version === 1 ? iterator.getUint64() : iterator.getUint32();
+    const modificationTime = version === 1 ? iterator.getUint64() : iterator.getUint32();
+    const timeScale = iterator.getUint32();
+    const durationInUnits = version === 1 ? iterator.getUint64() : iterator.getUint32();
+    const durationInSeconds = Number(durationInUnits) / timeScale;
+    const rateArray = iterator.getSlice(4);
+    const rateView = (0, buffer_iterator_1.getArrayBufferIterator)(rateArray, rateArray.length);
+    const rate = rateView.getInt8() * 10 +
+        rateView.getInt8() +
+        rateView.getInt8() * 0.1 +
+        rateView.getInt8() * 0.01;
+    const volumeArray = iterator.getSlice(2);
+    const volumeView = (0, buffer_iterator_1.getArrayBufferIterator)(volumeArray, volumeArray.length);
+    const volume = volumeView.getInt8() + volumeView.getInt8() * 0.1;
+    // reserved 16bit
+    iterator.discard(2);
+    // reserved 32bit x2
+    iterator.discard(4);
+    iterator.discard(4);
+    // matrix
+    const matrix = [
+        iterator.getFixedPointSigned1616Number(),
+        iterator.getFixedPointSigned1616Number(),
+        iterator.getFixedPointSigned230Number(),
+        iterator.getFixedPointSigned1616Number(),
+        iterator.getFixedPointSigned1616Number(),
+        iterator.getFixedPointSigned230Number(),
+        iterator.getFixedPointSigned1616Number(),
+        iterator.getFixedPointSigned1616Number(),
+        iterator.getFixedPointSigned230Number(),
+    ];
+    // pre-defined
+    iterator.discard(4 * 6);
+    // next track id
+    const nextTrackId = iterator.getUint32();
+    volumeView.destroy();
+    const bytesRemaining = size - (iterator.counter.getOffset() - offset);
+    if (bytesRemaining !== 0) {
+        throw new Error('expected 0 bytes ' + bytesRemaining);
+    }
+    return {
+        creationTime: (0, to_date_1.toUnixTimestamp)(Number(creationTime)),
+        modificationTime: (0, to_date_1.toUnixTimestamp)(Number(modificationTime)),
+        timeScale,
+        durationInUnits: Number(durationInUnits),
+        durationInSeconds,
+        rate,
+        volume,
+        matrix: matrix,
+        nextTrackId,
+        type: 'mvhd-box',
+        boxSize: size,
+        offset,
+    };
+};
+exports.parseMvhd = parseMvhd;

package/dist/esm/index.mjs

@@ -11899,7 +11899,7 @@ var parseMdatSection = async (state) => {
     return makeSkip(endOfMdat);
   }
   const exactMatch = nextSampleArray.find((s) => s.samplePosition.offset === state.iterator.counter.getOffset());
-  const nextSample = exactMatch ?? nextSampleArray[0];
+  const nextSample = exactMatch ?? nextSampleArray.sort((a, b) => a.samplePosition.offset - b.samplePosition.offset)[0];
   if (nextSample.samplePosition.offset !== state.iterator.counter.getOffset()) {
     return makeSkip(nextSample.samplePosition.offset);
   }
@@ -12503,7 +12503,7 @@ var makeFetchRequest = async ({
 }) => {
   const resolvedUrl = resolveUrl(src);
   const resolvedUrlString = resolvedUrl.toString();
-  if (!resolvedUrlString.startsWith("https://") && !resolvedUrlString.startsWith("blob:") && !resolvedUrlString.startsWith("http://")) {
+  if (!resolvedUrlString.startsWith("https://") && !resolvedUrlString.startsWith("blob:") && !resolvedUrlString.startsWith("data:") && !resolvedUrlString.startsWith("http://")) {
     return Promise.reject(new Error(`${resolvedUrlString} is not a URL - needs to start with http:// or https:// or blob:. If you want to read a local file, pass \`reader: nodeReader\` to parseMedia().`));
   }
   const ownController = new AbortController;
@@ -18187,7 +18187,7 @@ var downloadAndParseMedia = async (options) => {
   return returnValue;
 };
 // src/version.ts
-var VERSION = "4.0.350";
+var VERSION = "4.0.351";
 
 // src/index.ts
 var MediaParserInternals = {

package/dist/esm/universal.mjs

@@ -153,7 +153,7 @@ var makeFetchRequest = async ({
 }) => {
   const resolvedUrl = resolveUrl(src);
   const resolvedUrlString = resolvedUrl.toString();
-  if (!resolvedUrlString.startsWith("https://") && !resolvedUrlString.startsWith("blob:") && !resolvedUrlString.startsWith("http://")) {
+  if (!resolvedUrlString.startsWith("https://") && !resolvedUrlString.startsWith("blob:") && !resolvedUrlString.startsWith("data:") && !resolvedUrlString.startsWith("http://")) {
     return Promise.reject(new Error(`${resolvedUrlString} is not a URL - needs to start with http:// or https:// or blob:. If you want to read a local file, pass \`reader: nodeReader\` to parseMedia().`));
   }
   const ownController = new AbortController;

package/dist/esm/web.mjs

@@ -153,7 +153,7 @@ var makeFetchRequest = async ({
 }) => {
   const resolvedUrl = resolveUrl(src);
   const resolvedUrlString = resolvedUrl.toString();
-  if (!resolvedUrlString.startsWith("https://") && !resolvedUrlString.startsWith("blob:") && !resolvedUrlString.startsWith("http://")) {
+  if (!resolvedUrlString.startsWith("https://") && !resolvedUrlString.startsWith("blob:") && !resolvedUrlString.startsWith("data:") && !resolvedUrlString.startsWith("http://")) {
     return Promise.reject(new Error(`${resolvedUrlString} is not a URL - needs to start with http:// or https:// or blob:. If you want to read a local file, pass \`reader: nodeReader\` to parseMedia().`));
   }
   const ownController = new AbortController;

package/dist/esm/worker-server-entry.mjs

@@ -222,7 +222,7 @@ var makeFetchRequest = async ({
 }) => {
   const resolvedUrl = resolveUrl(src);
   const resolvedUrlString = resolvedUrl.toString();
-  if (!resolvedUrlString.startsWith("https://") && !resolvedUrlString.startsWith("blob:") && !resolvedUrlString.startsWith("http://")) {
+  if (!resolvedUrlString.startsWith("https://") && !resolvedUrlString.startsWith("blob:") && !resolvedUrlString.startsWith("data:") && !resolvedUrlString.startsWith("http://")) {
     return Promise.reject(new Error(`${resolvedUrlString} is not a URL - needs to start with http:// or https:// or blob:. If you want to read a local file, pass \`reader: nodeReader\` to parseMedia().`));
   }
   const ownController = new AbortController;
@@ -11984,7 +11984,7 @@ var parseMdatSection = async (state) => {
     return makeSkip(endOfMdat);
   }
   const exactMatch = nextSampleArray.find((s) => s.samplePosition.offset === state.iterator.counter.getOffset());
-  const nextSample = exactMatch ?? nextSampleArray[0];
+  const nextSample = exactMatch ?? nextSampleArray.sort((a, b) => a.samplePosition.offset - b.samplePosition.offset)[0];
   if (nextSample.samplePosition.offset !== state.iterator.counter.getOffset()) {
     return makeSkip(nextSample.samplePosition.offset);
   }

package/dist/esm/worker-web-entry.mjs

@@ -222,7 +222,7 @@ var makeFetchRequest = async ({
 }) => {
   const resolvedUrl = resolveUrl(src);
   const resolvedUrlString = resolvedUrl.toString();
-  if (!resolvedUrlString.startsWith("https://") && !resolvedUrlString.startsWith("blob:") && !resolvedUrlString.startsWith("http://")) {
+  if (!resolvedUrlString.startsWith("https://") && !resolvedUrlString.startsWith("blob:") && !resolvedUrlString.startsWith("data:") && !resolvedUrlString.startsWith("http://")) {
     return Promise.reject(new Error(`${resolvedUrlString} is not a URL - needs to start with http:// or https:// or blob:. If you want to read a local file, pass \`reader: nodeReader\` to parseMedia().`));
   }
   const ownController = new AbortController;
@@ -11881,7 +11881,7 @@ var parseMdatSection = async (state) => {
     return makeSkip(endOfMdat);
   }
   const exactMatch = nextSampleArray.find((s) => s.samplePosition.offset === state.iterator.counter.getOffset());
-  const nextSample = exactMatch ?? nextSampleArray[0];
+  const nextSample = exactMatch ?? nextSampleArray.sort((a, b) => a.samplePosition.offset - b.samplePosition.offset)[0];
   if (nextSample.samplePosition.offset !== state.iterator.counter.getOffset()) {
     return makeSkip(nextSample.samplePosition.offset);
   }

package/dist/readers/from-fetch.js

@@ -51,6 +51,7 @@ const makeFetchRequest = async ({ range, src, controller, }) => {
     const resolvedUrlString = resolvedUrl.toString();
     if (!resolvedUrlString.startsWith('https://') &&
         !resolvedUrlString.startsWith('blob:') &&
+        !resolvedUrlString.startsWith('data:') &&
         !resolvedUrlString.startsWith('http://')) {
         return Promise.reject(new Error(`${resolvedUrlString} is not a URL - needs to start with http:// or https:// or blob:. If you want to read a local file, pass \`reader: nodeReader\` to parseMedia().`));
     }

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "4.0.350";
+export declare const VERSION = "4.0.351";

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.350';
+exports.VERSION = '4.0.351';

package/package.json

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