@remotion/media-parser 4.0.326 → 4.0.329

package/dist/esm/index.mjs

@@ -2398,6 +2398,24 @@ var findTrackStartTimeInSeconds = ({
   }
   return dwellTime / movieTimeScale;
 };
+var findTrackMediaTimeOffsetInTrackTimescale = ({
+  trakBox
+}) => {
+  const elstBox = getElstBox(trakBox);
+  if (!elstBox) {
+    return 0;
+  }
+  const { entries } = elstBox;
+  let dwellTime = 0;
+  for (const entry of entries) {
+    const { mediaTime } = entry;
+    if (mediaTime === -1) {
+      continue;
+    }
+    dwellTime += mediaTime;
+  }
+  return dwellTime;
+};
 
 // src/webcodecs-timescale.ts
 var WEBCODECS_TIMESCALE = 1e6;
@@ -2457,7 +2475,8 @@ var makeAviAudioTrack = ({
     originalTimescale: MEDIA_PARSER_RIFF_TIMESCALE,
     trackId: index,
     startInSeconds: 0,
-    timescale: WEBCODECS_TIMESCALE
+    timescale: WEBCODECS_TIMESCALE,
+    trackMediaTimeOffsetInTrackTimescale: 0
   };
 };
 var makeAviVideoTrack = ({
@@ -2502,7 +2521,8 @@ var makeAviVideoTrack = ({
     },
     fps: strh.rate / strh.scale,
     startInSeconds: 0,
-    timescale: WEBCODECS_TIMESCALE
+    timescale: WEBCODECS_TIMESCALE,
+    trackMediaTimeOffsetInTrackTimescale: 0
   };
 };
 var getTracksFromAvi = (structure, state) => {
@@ -3304,7 +3324,8 @@ var getTrack = ({
       codecEnum,
       fps: null,
       startInSeconds: 0,
-      timescale: WEBCODECS_TIMESCALE
+      timescale: WEBCODECS_TIMESCALE,
+      trackMediaTimeOffsetInTrackTimescale: 0
     };
   }
   if (trackTypeToString(trackType2.value.value) === "audio") {
@@ -3328,7 +3349,8 @@ var getTrack = ({
         track
       }),
       startInSeconds: 0,
-      timescale: WEBCODECS_TIMESCALE
+      timescale: WEBCODECS_TIMESCALE,
+      trackMediaTimeOffsetInTrackTimescale: 0
     };
   }
   return null;
@@ -4119,6 +4141,11 @@ var getVideoCodecString = (trakBox) => {
   return videoSample.format;
 };
 
+// src/normalize-video-rotation.ts
+var normalizeVideoRotation = (rotation) => {
+  return (rotation % 360 + 360) % 360;
+};
+
 // src/containers/iso-base-media/get-actual-number-of-channels.ts
 var getActualDecoderParameters = ({
   audioCodec,
@@ -4235,7 +4262,10 @@ var makeBaseMediaTrack = (trakBox, startTimeInSeconds) => {
       codecData: actual.codecPrivate,
       codecEnum,
       startInSeconds: startTimeInSeconds,
-      timescale: WEBCODECS_TIMESCALE
+      timescale: WEBCODECS_TIMESCALE,
+      trackMediaTimeOffsetInTrackTimescale: findTrackMediaTimeOffsetInTrackTimescale({
+        trakBox
+      })
     };
   }
   if (!trakBoxContainsVideo(trakBox)) {
@@ -4245,7 +4275,10 @@ var makeBaseMediaTrack = (trakBox, startTimeInSeconds) => {
       originalTimescale: timescaleAndDuration.timescale,
       trakBox,
       startInSeconds: startTimeInSeconds,
-      timescale: WEBCODECS_TIMESCALE
+      timescale: WEBCODECS_TIMESCALE,
+      trackMediaTimeOffsetInTrackTimescale: findTrackMediaTimeOffsetInTrackTimescale({
+        trakBox
+      })
     };
   }
   const videoSample = getStsdVideoConfig(trakBox);
@@ -4287,14 +4320,17 @@ var makeBaseMediaTrack = (trakBox, startTimeInSeconds) => {
     codedHeight: videoSample.height,
     displayAspectWidth,
     displayAspectHeight,
-    rotation,
+    rotation: normalizeVideoRotation(0 - rotation),
     codecData: privateData,
     colorSpace: mediaParserAdvancedColorToWebCodecsColor(advancedColor),
     advancedColor,
     codecEnum: getVideoCodecFromIsoTrak(trakBox),
     fps: getFpsFromMp4TrakBox(trakBox),
     startInSeconds: startTimeInSeconds,
-    timescale: WEBCODECS_TIMESCALE
+    timescale: WEBCODECS_TIMESCALE,
+    trackMediaTimeOffsetInTrackTimescale: findTrackMediaTimeOffsetInTrackTimescale({
+      trakBox
+    })
   };
   return track;
 };
@@ -9159,7 +9195,8 @@ var handleAvcPacket = async ({
       colorSpace: mediaParserAdvancedColorToWebCodecsColor(advancedColor),
       advancedColor,
       startInSeconds: 0,
-      timescale: WEBCODECS_TIMESCALE
+      timescale: WEBCODECS_TIMESCALE,
+      trackMediaTimeOffsetInTrackTimescale: 0
     };
     await registerVideoTrack({
       track,
@@ -10811,7 +10848,8 @@ var parseAac = async (state) => {
         trackId: 0,
         type: "audio",
         startInSeconds: 0,
-        timescale: WEBCODECS_TIMESCALE
+        timescale: WEBCODECS_TIMESCALE,
+        trackMediaTimeOffsetInTrackTimescale: 0
       },
       registerAudioSampleCallback: state.callbacks.registerAudioSampleCallback,
       tracks: state.callbacks.tracks,
@@ -11208,7 +11246,8 @@ var parseStreamInfo = async ({
       originalTimescale: WEBCODECS_TIMESCALE,
       trackId: 0,
       startInSeconds: 0,
-      timescale: WEBCODECS_TIMESCALE
+      timescale: WEBCODECS_TIMESCALE,
+      trackMediaTimeOffsetInTrackTimescale: 0
     },
     registerAudioSampleCallback: state.callbacks.registerAudioSampleCallback,
     tracks: state.callbacks.tracks,
@@ -11309,7 +11348,10 @@ var calculateFlatSamples = ({
   if (!moov) {
     throw new Error("No moov box found");
   }
-  const flatSamples = tracks2.map((track) => {
+  const offsets = [];
+  const trackIds = [];
+  const map = new Map;
+  for (const track of tracks2) {
     const trakBox = getTrakBoxByTrackId(moov, track.trackId);
     if (!trakBox) {
       throw new Error("No trak box found");
@@ -11320,14 +11362,17 @@ var calculateFlatSamples = ({
       moofComplete,
       trexBoxes: getTrexBoxes(moov)
     });
-    return samplePositions.map((samplePosition) => {
-      return {
+    trackIds.push(track.trackId);
+    for (const samplePosition of samplePositions) {
+      offsets.push(samplePosition.offset);
+      map.set(samplePosition.offset, {
         track,
         samplePosition
-      };
-    });
-  });
-  return flatSamples;
+      });
+    }
+  }
+  offsets.sort((a, b) => a - b);
+  return { flatSamples: map, offsets, trackIds };
 };
 var cachedSamplePositionsState = () => {
   const cachedForMdatStart = {};
@@ -11633,28 +11678,33 @@ var getKey = (samplePositionTrack) => {
   return `${samplePositionTrack.track.trackId}-${samplePositionTrack.samplePosition.decodingTimestamp}`;
 };
 var findBestJump = ({
-  allSamplesSortedByOffset,
+  sampleMap,
+  offsetsSorted,
   visited,
   progresses
 }) => {
   const minProgress = Math.min(...Object.values(progresses));
   const trackNumberWithLowestProgress = Object.entries(progresses).find(([, progress]) => progress === minProgress)?.[0];
-  const firstSampleAboveMinProgress = allSamplesSortedByOffset.findIndex((sample) => sample.track.trackId === Number(trackNumberWithLowestProgress) && !visited.has(getKey(sample)));
+  const firstSampleAboveMinProgress = offsetsSorted.findIndex((offset) => sampleMap.get(offset).track.trackId === Number(trackNumberWithLowestProgress) && !visited.has(getKey(sampleMap.get(offset))));
   return firstSampleAboveMinProgress;
 };
-var calculateJumpMarks = (samplePositionTracks, endOfMdat) => {
+var calculateJumpMarks = ({
+  sampleMap,
+  offsetsSorted,
+  trackIds,
+  endOfMdat
+}) => {
   const progresses = {};
-  for (const track of samplePositionTracks) {
-    progresses[track[0].track.trackId] = 0;
+  for (const trackId of trackIds) {
+    progresses[trackId] = 0;
   }
   const jumpMarks = [];
-  const allSamplesSortedByOffset = samplePositionTracks.flat(1).filter((s) => s.track.type === "audio" || s.track.type === "video").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) {
+    if (indexToVisit >= offsetsSorted.length) {
       rollOverToProcess = true;
       indexToVisit = 0;
     }
@@ -11668,23 +11718,24 @@ var calculateJumpMarks = (samplePositionTracks, endOfMdat) => {
     }
     const jumpMark = {
       afterSampleWithOffset: lastVisitedSample.samplePosition.offset,
-      jumpToOffset: allSamplesSortedByOffset[firstSampleAboveMinProgress].samplePosition.offset
+      jumpToOffset: offsetsSorted[firstSampleAboveMinProgress]
     };
     indexToVisit = firstSampleAboveMinProgress;
     jumpMarks.push(jumpMark);
   };
   const addFinalJumpIfNecessary = () => {
-    if (indexToVisit === allSamplesSortedByOffset.length - 1) {
+    if (indexToVisit === offsetsSorted.length - 1) {
       return;
     }
     jumpMarks.push({
-      afterSampleWithOffset: allSamplesSortedByOffset[indexToVisit].samplePosition.offset,
+      afterSampleWithOffset: offsetsSorted[indexToVisit],
       jumpToOffset: endOfMdat
     });
   };
   const considerJump = () => {
     const firstSampleAboveMinProgress = findBestJump({
-      allSamplesSortedByOffset,
+      sampleMap,
+      offsetsSorted,
       visited,
       progresses
     });
@@ -11694,14 +11745,14 @@ var calculateJumpMarks = (samplePositionTracks, endOfMdat) => {
     } else {
       while (true) {
         increaseIndex();
-        if (!visited.has(getKey(allSamplesSortedByOffset[indexToVisit]))) {
+        if (!visited.has(getKey(sampleMap.get(offsetsSorted[indexToVisit])))) {
           break;
         }
       }
     }
   };
   while (true) {
-    const currentSamplePosition = allSamplesSortedByOffset[indexToVisit];
+    const currentSamplePosition = sampleMap.get(offsetsSorted[indexToVisit]);
     const sampleKey = getKey(currentSamplePosition);
     if (visited.has(sampleKey)) {
       considerJump();
@@ -11719,7 +11770,7 @@ var calculateJumpMarks = (samplePositionTracks, endOfMdat) => {
       rollOverToProcess = false;
     }
     lastVisitedSample = currentSamplePosition;
-    if (visited.size === allSamplesSortedByOffset.length) {
+    if (visited.size === offsetsSorted.length) {
       addFinalJumpIfNecessary();
       break;
     }
@@ -11729,7 +11780,7 @@ var calculateJumpMarks = (samplePositionTracks, endOfMdat) => {
     const maxProgress = Math.max(...progressValues);
     const minProgress = Math.min(...progressValues);
     const spread = maxProgress - minProgress;
-    if (visited.size === allSamplesSortedByOffset.length) {
+    if (visited.size === offsetsSorted.length) {
       addFinalJumpIfNecessary();
       break;
     }
@@ -11811,24 +11862,32 @@ var parseMdatSection = async (state) => {
     return parseMdatSection(state);
   }
   if (!state.iso.flatSamples.getSamples(mediaSection.start)) {
-    const flattedSamples = calculateFlatSamples({
+    const {
+      flatSamples: flatSamplesMap,
+      offsets,
+      trackIds
+    } = calculateFlatSamples({
       state,
       mediaSectionStart: mediaSection.start
     });
-    const calcedJumpMarks = calculateJumpMarks(flattedSamples, endOfMdat);
+    const calcedJumpMarks = calculateJumpMarks({
+      sampleMap: flatSamplesMap,
+      offsetsSorted: offsets,
+      trackIds,
+      endOfMdat
+    });
     state.iso.flatSamples.setJumpMarks(mediaSection.start, calcedJumpMarks);
-    state.iso.flatSamples.setSamples(mediaSection.start, flattedSamples.flat(1));
+    state.iso.flatSamples.setSamples(mediaSection.start, flatSamplesMap);
   }
   const flatSamples = state.iso.flatSamples.getSamples(mediaSection.start);
   const jumpMarks = state.iso.flatSamples.getJumpMarks(mediaSection.start);
   const { iterator } = state;
-  const samplesWithIndex = flatSamples.find((sample) => {
-    return sample.samplePosition.offset === iterator.counter.getOffset();
-  });
+  const samplesWithIndex = flatSamples.get(iterator.counter.getOffset());
   if (!samplesWithIndex) {
-    const nextSample_ = flatSamples.filter((s) => s.samplePosition.offset > iterator.counter.getOffset()).sort((a, b) => a.samplePosition.offset - b.samplePosition.offset)[0];
+    const offsets = Array.from(flatSamples.keys());
+    const nextSample_ = offsets.filter((s) => s > iterator.counter.getOffset()).sort((a, b) => a - b)[0];
     if (nextSample_) {
-      iterator.discard(nextSample_.samplePosition.offset - iterator.counter.getOffset());
+      iterator.discard(nextSample_ - iterator.counter.getOffset());
       return null;
     }
     Log.verbose(state.logLevel, "Could not find sample at offset", iterator.counter.getOffset(), "skipping to end of mdat");
@@ -11850,9 +11909,14 @@ var parseMdatSection = async (state) => {
     bigEndian,
     chunkSize
   } = samplesWithIndex.samplePosition;
-  const { originalTimescale, startInSeconds } = samplesWithIndex.track;
-  const cts = rawCts + startInSeconds * originalTimescale;
-  const dts = rawDts + startInSeconds * originalTimescale;
+  const {
+    originalTimescale,
+    startInSeconds,
+    trackMediaTimeOffsetInTrackTimescale,
+    timescale: trackTimescale
+  } = samplesWithIndex.track;
+  const cts = rawCts + startInSeconds * originalTimescale - trackMediaTimeOffsetInTrackTimescale / trackTimescale * WEBCODECS_TIMESCALE;
+  const dts = rawDts + startInSeconds * originalTimescale - trackMediaTimeOffsetInTrackTimescale / trackTimescale * WEBCODECS_TIMESCALE;
   const bytes = postprocessBytes({
     bytes: iterator.getSlice(samplesWithIndex.samplePosition.size),
     bigEndian,
@@ -13584,7 +13648,8 @@ var parseMpegHeader = async ({
         originalTimescale: 1e6,
         trackId: 0,
         startInSeconds: 0,
-        timescale: WEBCODECS_TIMESCALE
+        timescale: WEBCODECS_TIMESCALE,
+        trackMediaTimeOffsetInTrackTimescale: 0
       },
       registerAudioSampleCallback: state.callbacks.registerAudioSampleCallback,
       tracks: state.callbacks.tracks,
@@ -14671,7 +14736,8 @@ var handleAacPacket = async ({
       numberOfChannels: channelConfiguration,
       sampleRate,
       startInSeconds: 0,
-      timescale: WEBCODECS_TIMESCALE
+      timescale: WEBCODECS_TIMESCALE,
+      trackMediaTimeOffsetInTrackTimescale: 0
     };
     await registerAudioTrack({
       track,
@@ -15304,7 +15370,8 @@ var parseFmt = async ({
       originalTimescale: 1e6,
       trackId: 0,
       startInSeconds: 0,
-      timescale: WEBCODECS_TIMESCALE
+      timescale: WEBCODECS_TIMESCALE,
+      trackMediaTimeOffsetInTrackTimescale: 0
     },
     container: "wav",
     registerAudioSampleCallback: state.callbacks.registerAudioSampleCallback,
@@ -15905,9 +15972,11 @@ var parseLoop = async ({
       try {
         await triggerInfoEmit(state);
         await state.controller._internals.checkForAbortAndPause();
+        const parseLoopStart = Date.now();
         const result = await runParseIteration({
           state
         });
+        state.timings.timeInParseLoop += Date.now() - parseLoopStart;
         if (result !== null && result.action === "fetch-more-data") {
           Log.verbose(state.logLevel, `Need to fetch ${result.bytesNeeded} more bytes before we can continue`);
           const startBytesRemaining = state.iterator.bytesRemaining();
@@ -15996,6 +16065,7 @@ var printTimings = (state) => {
   Log.verbose(state.logLevel, `Time seeking: ${state.timings.timeSeeking}ms`);
   Log.verbose(state.logLevel, `Time checking if done: ${state.timings.timeCheckingIfDone}ms`);
   Log.verbose(state.logLevel, `Time freeing data: ${state.timings.timeFreeingData}ms`);
+  Log.verbose(state.logLevel, `Time in parse loop: ${state.timings.timeInParseLoop}ms`);
 };
 
 // src/remotion-license-acknowledge.ts
@@ -17600,7 +17670,8 @@ var timingsState = () => {
     timeReadingData: 0,
     timeSeeking: 0,
     timeCheckingIfDone: 0,
-    timeFreeingData: 0
+    timeFreeingData: 0,
+    timeInParseLoop: 0
   };
 };
 
@@ -18105,7 +18176,7 @@ var downloadAndParseMedia = async (options) => {
   return returnValue;
 };
 // src/version.ts
-var VERSION = "4.0.326";
+var VERSION = "4.0.329";
 
 // src/index.ts
 var MediaParserInternals = {