@remotion/media-parser 4.0.340 → 4.0.341

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

@@ -3,9 +3,4 @@ export type JumpMark = {
     afterSampleWithOffset: number;
     jumpToOffset: number;
 };
-export declare const calculateJumpMarks: ({ sampleMap, offsetsSorted, trackIds, endOfMdat, }: {
-    sampleMap: Map<number, MinimalFlatSampleForTesting>;
-    offsetsSorted: number[];
-    trackIds: number[];
-    endOfMdat: number;
-}) => JumpMark[];
+export declare const calculateJumpMarks: (samplePositionTracks: MinimalFlatSampleForTesting[][], endOfMdat: number) => JumpMark[];

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

@@ -13,38 +13,33 @@ exports.calculateJumpMarks = void 0;
 // 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}.${samplePositionTrack.samplePosition.offset}`;
+    return `${samplePositionTrack.track.trackId}-${samplePositionTrack.samplePosition.decodingTimestamp}`;
 };
-const findBestJump = ({ sampleMap, offsetsSorted, visited, progresses, }) => {
+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 = offsetsSorted.findIndex((offset) => sampleMap.get(offset).track.trackId ===
-        Number(trackNumberWithLowestProgress) &&
-        !visited.has(getKey(sampleMap.get(offset))));
-    if (firstSampleAboveMinProgress === -1) {
-        // Track might be done, so we don't care about minimum progress
-        // then
-        const backup = offsetsSorted.findIndex((offset) => !visited.has(getKey(sampleMap.get(offset))));
-        if (backup === -1) {
-            throw new Error('this should not happen');
-        }
-        return backup;
-    }
+    const firstSampleAboveMinProgress = allSamplesSortedByOffset.findIndex((sample) => sample.track.trackId === Number(trackNumberWithLowestProgress) &&
+        !visited.has(getKey(sample)));
     return firstSampleAboveMinProgress;
 };
-const calculateJumpMarks = ({ sampleMap, offsetsSorted, trackIds, endOfMdat, }) => {
+const calculateJumpMarks = (samplePositionTracks, endOfMdat) => {
     const progresses = {};
-    for (const trackId of trackIds) {
-        progresses[trackId] = 0;
+    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 >= offsetsSorted.length) {
-            throw new Error('should not roll over, should jump');
+        if (indexToVisit >= allSamplesSortedByOffset.length) {
+            rollOverToProcess = true;
+            indexToVisit = 0;
         }
     };
     let lastVisitedSample = null;
@@ -54,44 +49,61 @@ const calculateJumpMarks = ({ sampleMap, offsetsSorted, trackIds, endOfMdat, })
         }
         const jumpMark = {
             afterSampleWithOffset: lastVisitedSample.samplePosition.offset,
-            jumpToOffset: offsetsSorted[firstSampleAboveMinProgress],
+            jumpToOffset: allSamplesSortedByOffset[firstSampleAboveMinProgress].samplePosition
+                .offset,
         };
-        if (firstSampleAboveMinProgress ===
-            offsetsSorted.indexOf(lastVisitedSample.samplePosition.offset) + 1) {
-            indexToVisit = firstSampleAboveMinProgress;
-            return;
-        }
         indexToVisit = firstSampleAboveMinProgress;
         jumpMarks.push(jumpMark);
     };
     const addFinalJumpIfNecessary = () => {
-        if (indexToVisit === offsetsSorted.length - 1) {
+        if (indexToVisit === allSamplesSortedByOffset.length - 1) {
             return;
         }
         jumpMarks.push({
-            afterSampleWithOffset: offsetsSorted[indexToVisit],
+            afterSampleWithOffset: allSamplesSortedByOffset[indexToVisit].samplePosition.offset,
             jumpToOffset: endOfMdat,
         });
     };
     const considerJump = () => {
         const firstSampleAboveMinProgress = findBestJump({
-            sampleMap,
-            offsetsSorted,
+            allSamplesSortedByOffset,
             visited,
             progresses,
         });
-        addJumpMark({ firstSampleAboveMinProgress });
+        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 = sampleMap.get(offsetsSorted[indexToVisit]);
+        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 === offsetsSorted.length) {
+        if (visited.size === allSamplesSortedByOffset.length) {
             addFinalJumpIfNecessary();
             break;
         }
@@ -102,7 +114,7 @@ const calculateJumpMarks = ({ sampleMap, offsetsSorted, trackIds, endOfMdat, })
         const maxProgress = Math.max(...progressValues);
         const minProgress = Math.min(...progressValues);
         const spread = maxProgress - minProgress;
-        if (visited.size === offsetsSorted.length) {
+        if (visited.size === allSamplesSortedByOffset.length) {
             addFinalJumpIfNecessary();
             break;
         }
@@ -110,9 +122,6 @@ const calculateJumpMarks = ({ sampleMap, offsetsSorted, trackIds, endOfMdat, })
         if (spread > MAX_SPREAD_IN_SECONDS) {
             considerJump();
         }
-        else if (indexToVisit === offsetsSorted.length - 1) {
-            considerJump();
-        }
         else {
             increaseIndex();
         }

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/containers/mp3/parse-packet-header.js

@@ -177,7 +177,7 @@ const innerParseMp3PacketHeader = (iterator) => {
     const bitrateInKbit = getBitrateKB({
         bits: bitrateIndex,
         mpegVersion,
-        level: audioVersionId,
+        level: layer,
     });
     if (bitrateInKbit === 'bad') {
         throw new Error('Invalid bitrate');
@@ -186,10 +186,11 @@ const innerParseMp3PacketHeader = (iterator) => {
         throw new Error('Free bitrate not supported');
     }
     const samplingFrequencyIndex = iterator.getBits(2);
-    const sampleRate = getSamplingFrequency({
+    const baseSampleRate = getSamplingFrequency({
         bits: samplingFrequencyIndex,
         mpegVersion,
     });
+    const sampleRate = audioVersionId === 0b00 ? baseSampleRate / 2 : baseSampleRate;
     const padding = Boolean(iterator.getBits(1));
     iterator.getBits(1); // private bit
     const channelMode = iterator.getBits(2); // channel mode

package/dist/containers/mp3/seek/wait-until-syncword.js

@@ -8,6 +8,9 @@ const discardUntilSyncword = ({ iterator, }) => {
         if (next2Bytes !== 0xff) {
             continue;
         }
+        if (iterator.bytesRemaining() === 0) {
+            break;
+        }
         const nextByte = iterator.getUint8();
         const mask = 0xe0; // 1110 0000
         if ((nextByte & mask) !== mask) {

package/dist/esm/index.mjs

@@ -8247,10 +8247,7 @@ var getMetadata = (state) => {
   }
   if (structure.type === "mp3") {
     const tags2 = getMetadataFromMp3(structure);
-    if (tags2 === null) {
-      throw new Error("Failed to get metadata from mp3");
-    }
-    return tags2;
+    return tags2 ?? [];
   }
   if (structure.type === "wav") {
     return getMetadataFromWav(structure) ?? [];
@@ -13432,7 +13429,7 @@ var innerParseMp3PacketHeader = (iterator) => {
   const bitrateInKbit = getBitrateKB({
     bits: bitrateIndex,
     mpegVersion,
-    level: audioVersionId
+    level: layer
   });
   if (bitrateInKbit === "bad") {
     throw new Error("Invalid bitrate");
@@ -13441,10 +13438,11 @@ var innerParseMp3PacketHeader = (iterator) => {
     throw new Error("Free bitrate not supported");
   }
   const samplingFrequencyIndex = iterator.getBits(2);
-  const sampleRate = getSamplingFrequency({
+  const baseSampleRate = getSamplingFrequency({
     bits: samplingFrequencyIndex,
     mpegVersion
   });
+  const sampleRate = audioVersionId === 0 ? baseSampleRate / 2 : baseSampleRate;
   const padding = Boolean(iterator.getBits(1));
   iterator.getBits(1);
   const channelMode = iterator.getBits(2);
@@ -13709,6 +13707,9 @@ var discardUntilSyncword = ({
     if (next2Bytes !== 255) {
       continue;
     }
+    if (iterator.bytesRemaining() === 0) {
+      break;
+    }
     const nextByte = iterator.getUint8();
     const mask = 224;
     if ((nextByte & mask) !== mask) {
@@ -18185,7 +18186,7 @@ var downloadAndParseMedia = async (options) => {
   return returnValue;
 };
 // src/version.ts
-var VERSION = "4.0.340";
+var VERSION = "4.0.341";
 
 // src/index.ts
 var MediaParserInternals = {

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

@@ -5871,10 +5871,7 @@ var getMetadata = (state) => {
   }
   if (structure.type === "mp3") {
     const tags2 = getMetadataFromMp3(structure);
-    if (tags2 === null) {
-      throw new Error("Failed to get metadata from mp3");
-    }
-    return tags2;
+    return tags2 ?? [];
   }
   if (structure.type === "wav") {
     return getMetadataFromWav(structure) ?? [];
@@ -13163,7 +13160,7 @@ var innerParseMp3PacketHeader = (iterator) => {
   const bitrateInKbit = getBitrateKB({
     bits: bitrateIndex,
     mpegVersion,
-    level: audioVersionId
+    level: layer
   });
   if (bitrateInKbit === "bad") {
     throw new Error("Invalid bitrate");
@@ -13172,10 +13169,11 @@ var innerParseMp3PacketHeader = (iterator) => {
     throw new Error("Free bitrate not supported");
   }
   const samplingFrequencyIndex = iterator.getBits(2);
-  const sampleRate = getSamplingFrequency({
+  const baseSampleRate = getSamplingFrequency({
     bits: samplingFrequencyIndex,
     mpegVersion
   });
+  const sampleRate = audioVersionId === 0 ? baseSampleRate / 2 : baseSampleRate;
   const padding = Boolean(iterator.getBits(1));
   iterator.getBits(1);
   const channelMode = iterator.getBits(2);
@@ -13440,6 +13438,9 @@ var discardUntilSyncword = ({
     if (next2Bytes !== 255) {
       continue;
     }
+    if (iterator.bytesRemaining() === 0) {
+      break;
+    }
     const nextByte = iterator.getUint8();
     const mask = 224;
     if ((nextByte & mask) !== mask) {

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

@@ -5768,10 +5768,7 @@ var getMetadata = (state) => {
   }
   if (structure.type === "mp3") {
     const tags2 = getMetadataFromMp3(structure);
-    if (tags2 === null) {
-      throw new Error("Failed to get metadata from mp3");
-    }
-    return tags2;
+    return tags2 ?? [];
   }
   if (structure.type === "wav") {
     return getMetadataFromWav(structure) ?? [];
@@ -13032,7 +13029,7 @@ var innerParseMp3PacketHeader = (iterator) => {
   const bitrateInKbit = getBitrateKB({
     bits: bitrateIndex,
     mpegVersion,
-    level: audioVersionId
+    level: layer
   });
   if (bitrateInKbit === "bad") {
     throw new Error("Invalid bitrate");
@@ -13041,10 +13038,11 @@ var innerParseMp3PacketHeader = (iterator) => {
     throw new Error("Free bitrate not supported");
   }
   const samplingFrequencyIndex = iterator.getBits(2);
-  const sampleRate = getSamplingFrequency({
+  const baseSampleRate = getSamplingFrequency({
     bits: samplingFrequencyIndex,
     mpegVersion
   });
+  const sampleRate = audioVersionId === 0 ? baseSampleRate / 2 : baseSampleRate;
   const padding = Boolean(iterator.getBits(1));
   iterator.getBits(1);
   const channelMode = iterator.getBits(2);
@@ -13309,6 +13307,9 @@ var discardUntilSyncword = ({
     if (next2Bytes !== 255) {
       continue;
     }
+    if (iterator.bytesRemaining() === 0) {
+      break;
+    }
     const nextByte = iterator.getUint8();
     const mask = 224;
     if ((nextByte & mask) !== mask) {

package/dist/metadata/get-metadata.js

@@ -21,10 +21,9 @@ const getMetadata = (state) => {
     }
     if (structure.type === 'mp3') {
         const tags = (0, get_metadata_from_mp3_1.getMetadataFromMp3)(structure);
-        if (tags === null) {
-            throw new Error('Failed to get metadata from mp3');
-        }
-        return tags;
+        // Not all MP3s file have this header.
+        // Internal link: https://discord.com/channels/809501355504959528/1001500302375125055/1408880907602890752
+        return tags !== null && tags !== void 0 ? tags : [];
     }
     if (structure.type === 'wav') {
         return (_a = (0, get_metadata_from_wav_1.getMetadataFromWav)(structure)) !== null && _a !== void 0 ? _a : [];

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "4.0.340";
+export declare const VERSION = "4.0.341";

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.340';
+exports.VERSION = '4.0.341';

package/package.json

@@ -3,7 +3,7 @@
     "url": "https://github.com/remotion-dev/remotion/tree/main/packages/media-parser"
   },
   "name": "@remotion/media-parser",
-  "version": "4.0.340",
+  "version": "4.0.341",
   "main": "dist/index.js",
   "sideEffects": false,
   "devDependencies": {
@@ -11,8 +11,8 @@
     "eslint": "9.19.0",
     "mediabunny": "1.3.0",
     "@types/bun": "1.2.8",
-    "@remotion/example-videos": "4.0.340",
-    "@remotion/eslint-config-internal": "4.0.340"
+    "@remotion/eslint-config-internal": "4.0.341",
+    "@remotion/example-videos": "4.0.341"
   },
   "publishConfig": {
     "access": "public"