@remotion/media-parser 4.0.340 → 4.0.344

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.344";
 
 // 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.344";

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.344';

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.340",
+  "version": "4.0.344",
   "main": "dist/index.js",
   "sideEffects": false,
   "devDependencies": {
     "@types/wicg-file-system-access": "2023.10.5",
     "eslint": "9.19.0",
-    "mediabunny": "1.3.0",
+    "mediabunny": "1.13.0",
     "@types/bun": "1.2.8",
-    "@remotion/example-videos": "4.0.340",
-    "@remotion/eslint-config-internal": "4.0.340"
+    "@remotion/example-videos": "4.0.344",
+    "@remotion/eslint-config-internal": "4.0.344"
   },
   "publishConfig": {
     "access": "public"

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

@@ -1,11 +0,0 @@
-import type { MinimalFlatSampleForTesting } from '../../../state/iso-base-media/cached-sample-positions';
-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[];

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

@@ -1,122 +0,0 @@
-"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}.${samplePositionTrack.samplePosition.offset}`;
-};
-const findBestJump = ({ sampleMap, offsetsSorted, 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;
-    }
-    return firstSampleAboveMinProgress;
-};
-const calculateJumpMarks = ({ sampleMap, offsetsSorted, trackIds, endOfMdat, }) => {
-    const progresses = {};
-    for (const trackId of trackIds) {
-        progresses[trackId] = 0;
-    }
-    const jumpMarks = [];
-    let indexToVisit = 0;
-    const visited = new Set();
-    const increaseIndex = () => {
-        indexToVisit++;
-        if (indexToVisit >= offsetsSorted.length) {
-            throw new Error('should not roll over, should jump');
-        }
-    };
-    let lastVisitedSample = null;
-    const addJumpMark = ({ firstSampleAboveMinProgress, }) => {
-        if (!lastVisitedSample) {
-            throw new Error('no last visited sample');
-        }
-        const jumpMark = {
-            afterSampleWithOffset: lastVisitedSample.samplePosition.offset,
-            jumpToOffset: offsetsSorted[firstSampleAboveMinProgress],
-        };
-        if (firstSampleAboveMinProgress ===
-            offsetsSorted.indexOf(lastVisitedSample.samplePosition.offset) + 1) {
-            indexToVisit = firstSampleAboveMinProgress;
-            return;
-        }
-        indexToVisit = firstSampleAboveMinProgress;
-        jumpMarks.push(jumpMark);
-    };
-    const addFinalJumpIfNecessary = () => {
-        if (indexToVisit === offsetsSorted.length - 1) {
-            return;
-        }
-        jumpMarks.push({
-            afterSampleWithOffset: offsetsSorted[indexToVisit],
-            jumpToOffset: endOfMdat,
-        });
-    };
-    const considerJump = () => {
-        const firstSampleAboveMinProgress = findBestJump({
-            sampleMap,
-            offsetsSorted,
-            visited,
-            progresses,
-        });
-        addJumpMark({ firstSampleAboveMinProgress });
-    };
-    while (true) {
-        const currentSamplePosition = sampleMap.get(offsetsSorted[indexToVisit]);
-        const sampleKey = getKey(currentSamplePosition);
-        if (visited.has(sampleKey)) {
-            considerJump();
-            continue;
-        }
-        visited.add(sampleKey);
-        lastVisitedSample = currentSamplePosition;
-        if (visited.size === offsetsSorted.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 === offsetsSorted.length) {
-            addFinalJumpIfNecessary();
-            break;
-        }
-        // Also don't allow audio progress to go more
-        if (spread > MAX_SPREAD_IN_SECONDS) {
-            considerJump();
-        }
-        else if (indexToVisit === offsetsSorted.length - 1) {
-            considerJump();
-        }
-        else {
-            increaseIndex();
-        }
-    }
-    return jumpMarks;
-};
-exports.calculateJumpMarks = calculateJumpMarks;