@remotion/media-parser 4.0.210 → 4.0.211

package/dist/create/create-media.js

@@ -14,7 +14,7 @@ const matroska_segment_1 = require("./matroska-segment");
 const matroska_trackentry_1 = require("./matroska-trackentry");
 const timescale_1 = require("./timescale");
 const createMedia = async (writer) => {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g;
     const header = (0, matroska_header_1.makeMatroskaHeader)();
     const w = await writer.createContent();
     await w.write(header.bytes);
@@ -26,13 +26,16 @@ const createMedia = async (writer) => {
     const cues = [];
     const trackNumbers = [];
     const matroskaSegment = (0, matroska_segment_1.createMatroskaSegment)([
-        matroskaInfo,
         ...(0, matroska_seek_1.createMatroskaSeekHead)(seeks),
+        matroskaInfo,
         ...(0, matroska_trackentry_1.makeMatroskaTracks)(currentTracks),
     ]);
-    const durationOffset = ((_b = (_a = matroskaSegment.offsets.children[0].children.find((c) => c.field === 'Duration')) === null || _a === void 0 ? void 0 : _a.offset) !== null && _b !== void 0 ? _b : 0) + w.getWrittenByteCount();
+    const infoSegment = matroskaSegment.offsets.children.find((o) => o.field === 'Info');
+    const durationOffset = ((_b = (_a = infoSegment === null || infoSegment === void 0 ? void 0 : infoSegment.children.find((c) => c.field === 'Duration')) === null || _a === void 0 ? void 0 : _a.offset) !== null && _b !== void 0 ? _b : 0) +
+        w.getWrittenByteCount();
     const tracksOffset = ((_d = (_c = matroskaSegment.offsets.children.find((o) => o.field === 'Tracks')) === null || _c === void 0 ? void 0 : _c.offset) !== null && _d !== void 0 ? _d : 0) + w.getWrittenByteCount();
     const seekHeadOffset = ((_f = (_e = matroskaSegment.offsets.children.find((o) => o.field === 'SeekHead')) === null || _e === void 0 ? void 0 : _e.offset) !== null && _f !== void 0 ? _f : 0) + w.getWrittenByteCount();
+    const infoOffset = ((_g = infoSegment === null || infoSegment === void 0 ? void 0 : infoSegment.offset) !== null && _g !== void 0 ? _g : 0) + w.getWrittenByteCount();
     if (!seekHeadOffset) {
         throw new Error('could not get seek offset');
     }
@@ -42,6 +45,13 @@ const createMedia = async (writer) => {
     if (!tracksOffset) {
         throw new Error('could not get tracks offset');
     }
+    if (!infoOffset) {
+        throw new Error('could not get tracks offset');
+    }
+    seeks.push({
+        hexString: all_segments_1.matroskaElements.Info,
+        byte: infoOffset - seekHeadOffset,
+    });
     seeks.push({
         hexString: all_segments_1.matroskaElements.Tracks,
         byte: tracksOffset - seekHeadOffset,
@@ -50,11 +60,10 @@ const createMedia = async (writer) => {
         const updatedSeek = (0, matroska_seek_1.createMatroskaSeekHead)(seeks);
         await w.updateDataAt(seekHeadOffset, (0, make_header_1.combineUint8Arrays)(updatedSeek.map((b) => b.bytes)));
     };
-    const segmentOffset = w.getWrittenByteCount() +
-        (0, make_header_1.matroskaToHex)(all_segments_1.matroskaElements.Segment).byteLength;
+    const segmentOffset = w.getWrittenByteCount();
     const updateSegmentSize = async (size) => {
         const data = (0, ebml_1.getVariableInt)(size, matroska_segment_1.MATROSKA_SEGMENT_MIN_VINT_WIDTH);
-        await w.updateDataAt(segmentOffset, data);
+        await w.updateDataAt(segmentOffset + (0, make_header_1.matroskaToHex)(all_segments_1.matroskaElements.Segment).byteLength, data);
     };
     await w.write(matroskaSegment.bytes);
     const clusterOffset = w.getWrittenByteCount();
@@ -63,33 +72,38 @@ const createMedia = async (writer) => {
         hexString: all_segments_1.matroskaElements.Cluster,
         byte: clusterOffset - seekHeadOffset,
     });
-    cues.push({
-        time: 0,
-        clusterPosition: clusterOffset - seekHeadOffset,
-        trackNumbers,
-    });
     const trackNumberProgresses = {};
-    const getClusterOrMakeNew = async (chunk) => {
+    const getClusterOrMakeNew = async ({ chunk, isVideo, }) => {
         const smallestProgress = Math.min(...Object.values(trackNumberProgresses));
-        if (!currentCluster.shouldMakeNewCluster(smallestProgress, chunk.type === 'key')) {
-            return currentCluster;
+        if (!currentCluster.shouldMakeNewCluster({
+            newT: smallestProgress,
+            keyframe: chunk.type === 'key',
+            isVideo,
+        })) {
+            return { cluster: currentCluster, isNew: false, smallestProgress };
         }
-        const newCluster = w.getWrittenByteCount();
-        cues.push({
-            time: smallestProgress,
-            clusterPosition: newCluster - seekHeadOffset,
-            trackNumbers,
-        });
         currentCluster = await (0, cluster_1.makeCluster)(w, smallestProgress);
-        return currentCluster;
+        return { cluster: currentCluster, isNew: true, smallestProgress };
     };
-    const addSample = async (chunk, trackNumber) => {
+    const addSample = async (chunk, trackNumber, isVideo) => {
         var _a;
         trackNumberProgresses[trackNumber] = chunk.timestamp;
-        const cluster = await getClusterOrMakeNew(chunk);
+        const { cluster, isNew, smallestProgress } = await getClusterOrMakeNew({
+            chunk,
+            isVideo,
+        });
         const newDuration = Math.round((chunk.timestamp + ((_a = chunk.duration) !== null && _a !== void 0 ? _a : 0)) / 1000);
         await updateDuration(newDuration);
-        return cluster.addSample(chunk, trackNumber);
+        const { timecodeRelativeToCluster } = await cluster.addSample(chunk, trackNumber);
+        if (isNew) {
+            const newCluster = w.getWrittenByteCount();
+            cues.push({
+                time: (0, cluster_1.timestampToClusterTimestamp)(smallestProgress) +
+                    timecodeRelativeToCluster,
+                clusterPosition: newCluster - seekHeadOffset,
+                trackNumber,
+            });
+        }
     };
     const updateDuration = async (newDuration) => {
         const blocks = (0, make_duration_with_padding_1.makeDurationWithPadding)(newDuration);
@@ -110,8 +124,8 @@ const createMedia = async (writer) => {
         remove: async () => {
             await w.remove();
         },
-        addSample: (chunk, trackNumber) => {
-            operationProm.current = operationProm.current.then(() => addSample(chunk, trackNumber));
+        addSample: (chunk, trackNumber, isVideo) => {
+            operationProm.current = operationProm.current.then(() => addSample(chunk, trackNumber, isVideo));
             return operationProm.current;
         },
         updateDuration: (duration) => {
@@ -139,8 +153,11 @@ const createMedia = async (writer) => {
             });
             await updateSeekWrite();
             await w.write((0, matroska_cues_1.createMatroskaCues)(cues).bytes);
-            const segmentSize = w.getWrittenByteCount() - segmentOffset;
             await w.waitForFinish();
+            const segmentSize = w.getWrittenByteCount() -
+                segmentOffset -
+                (0, make_header_1.matroskaToHex)(all_segments_1.matroskaElements.Segment).byteLength -
+                matroska_segment_1.MATROSKA_SEGMENT_MIN_VINT_WIDTH;
             await updateSegmentSize(segmentSize);
         },
     };

package/dist/create/matroska-cues.d.ts

@@ -1,6 +1,6 @@
 export type Cue = {
     time: number;
     clusterPosition: number;
-    trackNumbers: number[];
+    trackNumber: number;
 };
 export declare const createMatroskaCues: (cues: Cue[]) => import("../boxes/webm/segments/all-segments").BytesAndOffset;

package/dist/create/matroska-cues.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createMatroskaCues = void 0;
 const make_header_1 = require("../boxes/webm/make-header");
-const cluster_1 = require("./cluster");
 const createMatroskaCues = (cues) => {
     return (0, make_header_1.makeMatroskaBytes)({
         type: 'Cues',
@@ -15,18 +14,18 @@ const createMatroskaCues = (cues) => {
                         type: 'CueTime',
                         minVintWidth: null,
                         value: {
-                            value: (0, cluster_1.timestampToClusterTimestamp)(cue.time),
+                            value: cue.time,
                             byteLength: null,
                         },
                     },
-                    ...cue.trackNumbers.map((trackNumber) => ({
+                    {
                         type: 'CueTrackPositions',
                         value: [
                             {
                                 type: 'CueTrack',
                                 minVintWidth: null,
                                 value: {
-                                    value: trackNumber,
+                                    value: cue.trackNumber,
                                     byteLength: null,
                                 },
                             },
@@ -40,7 +39,7 @@ const createMatroskaCues = (cues) => {
                             },
                         ],
                         minVintWidth: null,
-                    })),
+                    },
                 ],
                 minVintWidth: null,
             };

package/dist/create/matroska-trackentry.js

@@ -119,14 +119,6 @@ const makeMatroskaAudioTrackEntryBytes = ({ trackNumber, codec, numberOfChannels
                 },
                 minVintWidth: null,
             },
-            {
-                type: 'TrackTimestampScale',
-                value: {
-                    value: 1,
-                    size: '64',
-                },
-                minVintWidth: null,
-            },
             {
                 type: 'CodecID',
                 value: makeAudioCodecId(codec),

package/dist/esm/from-fetch.mjs

@@ -1,4 +1,32 @@
 // src/readers/from-fetch.ts
+function parseContentRange(input) {
+  const matches = input.match(/^(\w+) ((\d+)-(\d+)|\*)\/(\d+|\*)$/);
+  if (!matches)
+    return null;
+  const [, unit, , start, end, size] = matches;
+  const range = {
+    unit,
+    start: start != null ? Number(start) : null,
+    end: end != null ? Number(end) : null,
+    size: size === "*" ? null : Number(size)
+  };
+  if (range.start === null && range.end === null && range.size === null) {
+    return null;
+  }
+  return range;
+}
+var validateContentRangeAndDetectIfSupported = (actualRange, parsedContentRange) => {
+  if (typeof actualRange === "number" && parsedContentRange?.start !== actualRange) {
+    if (actualRange === 0) {
+      return { supportsContentRange: false };
+    }
+    throw new Error(`Range header (${actualRange}) does not match content-range header (${parsedContentRange?.start})`);
+  }
+  if (actualRange !== null && typeof actualRange !== "number" && (parsedContentRange?.start !== actualRange[0] || parsedContentRange?.end !== actualRange[1])) {
+    throw new Error(`Range header (${actualRange}) does not match content-range header (${parsedContentRange?.start})`);
+  }
+  return { supportsContentRange: true };
+};
 var fetchReader = {
   read: async (src, range, signal) => {
     if (typeof src !== "string") {
@@ -9,20 +37,25 @@ var fetchReader = {
       return Promise.reject(new Error(resolvedUrl + " 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 controller = new AbortController;
+    const cache = typeof navigator !== "undefined" && navigator.userAgent.includes("Cloudflare-Workers") ? undefined : "no-store";
+    const actualRange = range === null ? 0 : range;
     const res = await fetch(resolvedUrl, {
-      headers: range === null ? {} : typeof range === "number" ? {
-        Range: `bytes=${range}`
+      headers: typeof actualRange === "number" ? {
+        Range: `bytes=${actualRange}-`
       } : {
-        Range: `bytes=${`${range[0]}-${range[1]}`}`
+        Range: `bytes=${`${actualRange[0]}-${actualRange[1]}`}`
       },
       signal: controller.signal,
-      cache: "no-store"
+      cache
     });
+    const contentRange = res.headers.get("content-range");
+    const parsedContentRange = contentRange ? parseContentRange(contentRange) : null;
+    const { supportsContentRange } = validateContentRangeAndDetectIfSupported(actualRange, parsedContentRange);
     signal?.addEventListener("abort", () => {
       controller.abort();
     }, { once: true });
     if (res.status.toString().startsWith("4") || res.status.toString().startsWith("5")) {
-      throw new Error(`Server returned status code ${res.status} for ${src}`);
+      throw new Error(`Server returned status code ${res.status} for ${src} and range ${actualRange}`);
     }
     if (!res.body) {
       throw new Error("No body");
@@ -47,7 +80,8 @@ var fetchReader = {
         }
       },
       contentLength,
-      name: name ?? fallbackName
+      name: name ?? fallbackName,
+      supportsContentRange
     };
   },
   getLength: async (src) => {
@@ -68,5 +102,6 @@ var fetchReader = {
   }
 };
 export {
+  parseContentRange,
   fetchReader
 };

package/dist/esm/from-node.mjs

@@ -32,7 +32,8 @@ var nodeReader = {
         }
       },
       contentLength: stats.size,
-      name: src.split("/").pop()
+      name: src.split("/").pop(),
+      supportsContentRange: true
     };
   },
   getLength: async (src) => {

package/dist/esm/from-web-file.mjs

@@ -28,7 +28,8 @@ var webFileReader = {
             }
           },
           contentLength: file.size,
-          name: file.name
+          name: file.name,
+          supportsContentRange: true
         });
       };
       reader.onerror = (error) => {