@remotion/media-parser 4.0.267 → 4.0.269

package/dist/containers/mp3/get-duration.js

@@ -5,15 +5,16 @@ const get_frame_length_1 = require("./get-frame-length");
 const samples_per_mpeg_file_1 = require("./samples-per-mpeg-file");
 const getDurationFromMp3 = (state) => {
     const mp3Info = state.mp3Info.getMp3Info();
-    if (!mp3Info) {
-        throw new Error('No mp3 info');
+    const mp3CbrInfo = state.mp3Info.getCbrMp3Info();
+    if (!mp3Info || !mp3CbrInfo) {
+        return null;
     }
     const samplesPerFrame = (0, samples_per_mpeg_file_1.getSamplesPerMpegFrame)({
         layer: mp3Info.layer,
         mpegVersion: mp3Info.mpegVersion,
     });
     const frameLengthInBytes = (0, get_frame_length_1.getMpegFrameLength)({
-        bitrateKbit: mp3Info.bitrateKbit,
+        bitrateKbit: mp3CbrInfo.bitrateKbit,
         padding: false,
         samplesPerFrame,
         samplingFrequency: mp3Info.sampleRate,

package/dist/containers/mp3/parse-mpeg-header.js

@@ -2,6 +2,7 @@
 // spec: http://www.mp3-tech.org/programmer/frame_header.html
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseMpegHeader = void 0;
+const log_1 = require("../../log");
 const register_track_1 = require("../../register-track");
 const get_frame_length_1 = require("./get-frame-length");
 const samples_per_mpeg_file_1 = require("./samples-per-mpeg-file");
@@ -219,35 +220,45 @@ const parseMpegHeader = async ({ state, }) => {
     const offsetNow = iterator.counter.getOffset();
     iterator.counter.decrement(offsetNow - initialOffset);
     const data = iterator.getSlice(frameLength);
+    let isInfoTag = false;
     if (state.callbacks.tracks.getTracks().length === 0) {
-        state.mp3Info.setMp3Info({
+        const info = {
             layer,
             mpegVersion,
             sampleRate,
-            bitrateKbit,
             startOfMpegStream: initialOffset,
-        });
-        await (0, register_track_1.registerAudioTrack)({
-            container: 'mp3',
-            state,
-            track: {
-                type: 'audio',
-                codec: 'mp3',
-                codecPrivate: null,
-                codecWithoutConfig: 'mp3',
-                description: undefined,
-                numberOfChannels,
-                sampleRate,
-                timescale: 1000000,
-                trackId: 0,
-                trakBox: null,
-            },
-        });
-        state.callbacks.tracks.setIsDone(state.logLevel);
-    }
-    const mp3Info = state.mp3Info.getMp3Info();
-    if (!mp3Info) {
-        throw new Error('No MP3 info by now');
+        };
+        const asText = new TextDecoder().decode(data);
+        const isVbr = asText.includes('Xing') || asText.includes('VBRI');
+        isInfoTag = isVbr || asText.includes('Info');
+        if (isVbr) {
+            log_1.Log.verbose(state.logLevel, 'MP3 has variable bit rate. Requiring whole file to be read');
+        }
+        else {
+            state.mp3Info.setCbrMp3Info({
+                bitrateKbit,
+            });
+        }
+        if (!isInfoTag) {
+            state.mp3Info.setMp3Info(info);
+            await (0, register_track_1.registerAudioTrack)({
+                container: 'mp3',
+                state,
+                track: {
+                    type: 'audio',
+                    codec: 'mp3',
+                    codecPrivate: null,
+                    codecWithoutConfig: 'mp3',
+                    description: undefined,
+                    numberOfChannels,
+                    sampleRate,
+                    timescale: 1000000,
+                    trackId: 0,
+                    trakBox: null,
+                },
+            });
+            state.callbacks.tracks.setIsDone(state.logLevel);
+        }
     }
     const avgLength = (0, get_frame_length_1.getAverageMpegFrameLength)({
         bitrateKbit,
@@ -255,21 +266,27 @@ const parseMpegHeader = async ({ state, }) => {
         samplesPerFrame,
         samplingFrequency: sampleRate,
     });
-    const nthFrame = Math.round((initialOffset - mp3Info.startOfMpegStream) / avgLength);
-    const durationInSeconds = samplesPerFrame / sampleRate;
-    const timeInSeconds = (nthFrame * samplesPerFrame) / sampleRate;
-    const timestamp = Math.round(timeInSeconds * 1000000);
-    const duration = Math.round(durationInSeconds * 1000000);
-    await state.callbacks.onAudioSample(0, {
-        data,
-        cts: timestamp,
-        dts: timestamp,
-        duration,
-        offset: initialOffset,
-        timescale: 1000000,
-        timestamp,
-        trackId: 0,
-        type: 'key',
-    });
+    if (!isInfoTag) {
+        const mp3Info = state.mp3Info.getMp3Info();
+        if (!mp3Info) {
+            throw new Error('No MP3 info');
+        }
+        const nthFrame = Math.round((initialOffset - mp3Info.startOfMpegStream) / avgLength);
+        const durationInSeconds = samplesPerFrame / sampleRate;
+        const timeInSeconds = (nthFrame * samplesPerFrame) / sampleRate;
+        const timestamp = Math.round(timeInSeconds * 1000000);
+        const duration = Math.round(durationInSeconds * 1000000);
+        await state.callbacks.onAudioSample(0, {
+            data,
+            cts: timestamp,
+            dts: timestamp,
+            duration,
+            offset: initialOffset,
+            timescale: 1000000,
+            timestamp,
+            trackId: 0,
+            type: 'key',
+        });
+    }
 };
 exports.parseMpegHeader = parseMpegHeader;

package/dist/containers/webm/get-ready-tracks.d.ts

@@ -1,3 +1,10 @@
 import type { Track } from '../../get-tracks';
-import type { MainSegment } from './segments/all-segments';
-export declare const getTracksFromMatroska: (segment: MainSegment, timescale: number) => Track[];
+import type { ParserState } from '../../state/parser-state';
+export type ResolvedAndUnresolvedTracks = {
+    resolved: Track[];
+    missingInfo: Track[];
+};
+export declare const getTracksFromMatroska: ({ state, }: {
+    state: ParserState;
+}) => ResolvedAndUnresolvedTracks;
+export declare const matroskaHasTracks: (state: ParserState) => boolean;

package/dist/containers/webm/get-ready-tracks.js

@@ -1,14 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTracksFromMatroska = void 0;
+exports.matroskaHasTracks = exports.getTracksFromMatroska = void 0;
+const codec_string_1 = require("../avc/codec-string");
 const make_track_1 = require("./make-track");
 const traversal_1 = require("./traversal");
-const getTracksFromMatroska = (segment, timescale) => {
-    const tracksSegment = (0, traversal_1.getTracksSegment)(segment);
+const getTracksFromMatroska = ({ state, }) => {
+    const webmState = state.webm;
+    const structure = state.getMatroskaStructure();
+    const mainSegment = (0, traversal_1.getMainSegment)(structure.boxes);
+    if (!mainSegment) {
+        throw new Error('No main segment');
+    }
+    const tracksSegment = (0, traversal_1.getTracksSegment)(mainSegment);
     if (!tracksSegment) {
         throw new Error('No tracks segment');
     }
-    const tracks = [];
+    const resolvedTracks = [];
+    const missingInfo = [];
     for (const trackEntrySegment of tracksSegment.value) {
         if (trackEntrySegment.type === 'Crc32') {
             continue;
@@ -18,12 +26,39 @@ const getTracksFromMatroska = (segment, timescale) => {
         }
         const track = (0, make_track_1.getTrack)({
             track: trackEntrySegment,
-            timescale,
+            timescale: webmState.getTimescale(),
         });
-        if (track) {
-            tracks.push(track);
+        if (!track) {
+            continue;
+        }
+        if (track.codec === make_track_1.NO_CODEC_PRIVATE_SHOULD_BE_DERIVED_FROM_SPS) {
+            const avc = webmState.getAvcProfileForTrackNumber(track.trackId);
+            if (avc) {
+                resolvedTracks.push({
+                    ...track,
+                    codec: (0, codec_string_1.getCodecStringFromSpsAndPps)(avc),
+                });
+            }
+            else {
+                missingInfo.push(track);
+            }
+        }
+        else {
+            resolvedTracks.push(track);
         }
     }
-    return tracks;
+    return { missingInfo, resolved: resolvedTracks };
 };
 exports.getTracksFromMatroska = getTracksFromMatroska;
+const matroskaHasTracks = (state) => {
+    const structure = state.getMatroskaStructure();
+    const mainSegment = (0, traversal_1.getMainSegment)(structure.boxes);
+    if (!mainSegment) {
+        return false;
+    }
+    return ((0, traversal_1.getTracksSegment)(mainSegment) !== null &&
+        (0, exports.getTracksFromMatroska)({
+            state,
+        }).missingInfo.length === 0);
+};
+exports.matroskaHasTracks = matroskaHasTracks;

package/dist/containers/webm/get-sample-from-block.js

@@ -2,8 +2,21 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSampleFromBlock = void 0;
 const buffer_iterator_1 = require("../../buffer-iterator");
+const parse_avc_1 = require("../avc/parse-avc");
+const get_ready_tracks_1 = require("./get-ready-tracks");
 const all_segments_1 = require("./segments/all-segments");
 const block_simple_block_flags_1 = require("./segments/block-simple-block-flags");
+const addAvcToTrackIfNecessary = ({ partialVideoSample, codec, state, trackNumber, }) => {
+    if (codec === 'V_MPEG4/ISO/AVC' &&
+        (0, get_ready_tracks_1.getTracksFromMatroska)({ state }).missingInfo.length > 0) {
+        const parsed = (0, parse_avc_1.parseAvc)(partialVideoSample.data);
+        for (const parse of parsed) {
+            if (parse.type === 'avc-profile') {
+                state.webm.setAvcProfileForTrackNumber(trackNumber, parse);
+            }
+        }
+    }
+};
 const getSampleFromBlock = (ebml, state, offset) => {
     const iterator = (0, buffer_iterator_1.getArrayBufferIterator)(ebml.value, ebml.value.length);
     const trackNumber = iterator.getVint();
@@ -49,6 +62,12 @@ const getSampleFromBlock = (ebml, state, offset) => {
                 partialVideoSample,
             };
         }
+        addAvcToTrackIfNecessary({
+            codec,
+            partialVideoSample,
+            state,
+            trackNumber,
+        });
         const sample = {
             ...partialVideoSample,
             type: keyframe ? 'key' : 'delta',

package/dist/containers/webm/make-track.d.ts

@@ -1,5 +1,6 @@
 import type { AudioTrack, MediaParserAudioCodec, VideoTrack } from '../../get-tracks';
 import type { TrackEntry } from './segments/all-segments';
+export declare const NO_CODEC_PRIVATE_SHOULD_BE_DERIVED_FROM_SPS = "no-codec-private-should-be-derived-from-sps";
 export declare const getMatroskaAudioCodecWithoutConfigString: ({ track, }: {
     track: TrackEntry;
 }) => MediaParserAudioCodec;

package/dist/containers/webm/make-track.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTrack = exports.getMatroskaAudioCodecWithoutConfigString = void 0;
+exports.getTrack = exports.getMatroskaAudioCodecWithoutConfigString = exports.NO_CODEC_PRIVATE_SHOULD_BE_DERIVED_FROM_SPS = void 0;
 const buffer_iterator_1 = require("../../buffer-iterator");
 const make_hvc1_codec_strings_1 = require("../../make-hvc1-codec-strings");
 const av1_codec_private_1 = require("./av1-codec-private");
@@ -8,6 +8,7 @@ const color_1 = require("./color");
 const description_1 = require("./description");
 const track_entry_1 = require("./segments/track-entry");
 const traversal_1 = require("./traversal");
+exports.NO_CODEC_PRIVATE_SHOULD_BE_DERIVED_FROM_SPS = 'no-codec-private-should-be-derived-from-sps';
 const getDescription = (track) => {
     const codec = (0, traversal_1.getCodecSegment)(track);
     if (!codec) {
@@ -46,7 +47,7 @@ const getMatroskaVideoCodecString = ({ track, codecSegment: codec, }) => {
     if (codec.value === 'V_VP9') {
         const priv = (0, traversal_1.getPrivateData)(track);
         if (priv) {
-            throw new Error('@remotion/media-parser cannot handle the private data for VP9. Do you have an example file you could send so we can implement it?');
+            throw new Error('@remotion/media-parser cannot handle the private data for VP9. Do you have an example file you could send so we can implement it? https://remotion.dev/report');
         }
         return 'vp09.00.10.08';
     }
@@ -55,7 +56,12 @@ const getMatroskaVideoCodecString = ({ track, codecSegment: codec, }) => {
         if (priv) {
             return `avc1.${priv[1].toString(16).padStart(2, '0')}${priv[2].toString(16).padStart(2, '0')}${priv[3].toString(16).padStart(2, '0')}`;
         }
-        throw new Error('Could not find a CodecPrivate field in TrackEntry');
+        return exports.NO_CODEC_PRIVATE_SHOULD_BE_DERIVED_FROM_SPS;
+    }
+    if (codec.value === 'V_MPEGH/ISO/HEVC') {
+        const priv = (0, traversal_1.getPrivateData)(track);
+        const iterator = (0, buffer_iterator_1.getArrayBufferIterator)(priv, priv.length);
+        return 'hvc1.' + (0, make_hvc1_codec_strings_1.getHvc1CodecString)(iterator);
     }
     if (codec.value === 'V_AV1') {
         const priv = (0, traversal_1.getPrivateData)(track);
@@ -64,11 +70,6 @@ const getMatroskaVideoCodecString = ({ track, codecSegment: codec, }) => {
         }
         return (0, av1_codec_private_1.parseAv1PrivateData)(priv, null);
     }
-    if (codec.value === 'V_MPEGH/ISO/HEVC') {
-        const priv = (0, traversal_1.getPrivateData)(track);
-        const iterator = (0, buffer_iterator_1.getArrayBufferIterator)(priv, priv.length);
-        return 'hvc1.' + (0, make_hvc1_codec_strings_1.getHvc1CodecString)(iterator);
-    }
     throw new Error(`Unknown codec: ${codec.value}`);
 };
 const getMatroskaAudioCodecWithoutConfigString = ({ track, }) => {

package/dist/esm/fetch.mjs

@@ -8,10 +8,17 @@ class MediaParserAbortError extends Error {
 }
 
 // src/readers/fetch/get-body-and-reader.ts
-var getLengthAndReader = async (endsWithM3u8, res, ownController) => {
-  if (endsWithM3u8) {
-    const text = await res.text();
-    const encoded = new TextEncoder().encode(text);
+var getLengthAndReader = async ({
+  canLiveWithoutContentLength,
+  res,
+  ownController,
+  requestedWithoutRange
+}) => {
+  const length = res.headers.get("content-length");
+  const contentLength = length === null ? null : parseInt(length, 10);
+  if (requestedWithoutRange || canLiveWithoutContentLength && contentLength === null) {
+    const buffer = await res.arrayBuffer();
+    const encoded = new Uint8Array(buffer);
     const stream = new ReadableStream({
       start(controller) {
         controller.enqueue(encoded);
@@ -29,8 +36,6 @@ var getLengthAndReader = async (endsWithM3u8, res, ownController) => {
       needsContentRange: false
     };
   }
-  const length = res.headers.get("content-length");
-  const contentLength = length === null ? null : parseInt(length, 10);
   if (!res.body) {
     throw new Error("No body");
   }
@@ -74,7 +79,11 @@ function parseContentRange(input) {
   }
   return range;
 }
-var validateContentRangeAndDetectIfSupported = (actualRange, parsedContentRange, statusCode) => {
+var validateContentRangeAndDetectIfSupported = ({
+  actualRange,
+  parsedContentRange,
+  statusCode
+}) => {
   if (statusCode === 206) {
     return { supportsContentRange: true };
   }
@@ -102,8 +111,10 @@ var fetchReader = {
     const ownController = new AbortController;
     const cache = typeof navigator !== "undefined" && navigator.userAgent.includes("Cloudflare-Workers") ? undefined : "no-store";
     const actualRange = range === null ? 0 : range;
-    const endsWithM3u8 = (typeof resolvedUrl === "string" ? resolvedUrl : resolvedUrl.pathname).endsWith(".m3u8");
-    const headers = actualRange === 0 && endsWithM3u8 ? {} : typeof actualRange === "number" ? {
+    const asString = typeof resolvedUrl === "string" ? resolvedUrl : resolvedUrl.pathname;
+    const requestWithoutRange = asString.endsWith(".m3u8");
+    const canLiveWithoutContentLength = asString.endsWith(".m3u8") || asString.endsWith(".ts");
+    const headers = actualRange === 0 && requestWithoutRange ? {} : typeof actualRange === "number" ? {
       Range: `bytes=${actualRange}-`
     } : {
       Range: `bytes=${`${actualRange[0]}-${actualRange[1]}`}`
@@ -115,7 +126,11 @@ var fetchReader = {
     });
     const contentRange = res.headers.get("content-range");
     const parsedContentRange = contentRange ? parseContentRange(contentRange) : null;
-    const { supportsContentRange } = validateContentRangeAndDetectIfSupported(actualRange, parsedContentRange, res.status);
+    const { supportsContentRange } = validateContentRangeAndDetectIfSupported({
+      actualRange,
+      parsedContentRange,
+      statusCode: res.status
+    });
     controller._internals.signal.addEventListener("abort", () => {
       ownController.abort(new MediaParserAbortError("Aborted by user"));
     }, { once: true });
@@ -125,7 +140,12 @@ var fetchReader = {
     const contentDisposition = res.headers.get("content-disposition");
     const name = contentDisposition?.match(/filename="([^"]+)"/)?.[1];
     const fallbackName = src.split("/").pop();
-    const { contentLength, needsContentRange, reader } = await getLengthAndReader(endsWithM3u8, res, ownController);
+    const { contentLength, needsContentRange, reader } = await getLengthAndReader({
+      canLiveWithoutContentLength,
+      res,
+      ownController,
+      requestedWithoutRange: requestWithoutRange
+    });
     if (controller) {
       controller._internals.signal.addEventListener("abort", () => {
         reader.reader.cancel().catch(() => {