@remotion/media-parser 4.0.267 → 4.0.268

package/dist/get-tracks.js

@@ -6,7 +6,6 @@ const traversal_1 = require("./containers/iso-base-media/traversal");
 const get_tracks_from_avi_1 = require("./containers/riff/get-tracks-from-avi");
 const get_tracks_1 = require("./containers/transport-stream/get-tracks");
 const get_ready_tracks_1 = require("./containers/webm/get-ready-tracks");
-const traversal_2 = require("./containers/webm/traversal");
 const getNumberOfTracks = (moovBox) => {
     const mvHdBox = (0, traversal_1.getMvhdBox)(moovBox);
     if (!mvHdBox) {
@@ -22,11 +21,7 @@ exports.isoBaseMediaHasTracks = isoBaseMediaHasTracks;
 const getHasTracks = (state) => {
     const structure = state.getStructure();
     if (structure.type === 'matroska') {
-        const mainSegment = (0, traversal_2.getMainSegment)(structure.boxes);
-        if (!mainSegment) {
-            return false;
-        }
-        return (0, traversal_2.getTracksSegment)(mainSegment) !== null;
+        return (0, get_ready_tracks_1.matroskaHasTracks)(state);
     }
     if (structure.type === 'iso-base-media') {
         return (0, exports.isoBaseMediaHasTracks)(state);
@@ -55,16 +50,14 @@ const getHasTracks = (state) => {
     throw new Error('Unknown container ' + structure);
 };
 exports.getHasTracks = getHasTracks;
-const getTracksFromMa = (segments, state) => {
+const getCategorizedTracksFromMatroska = (state) => {
     const videoTracks = [];
     const audioTracks = [];
     const otherTracks = [];
-    const mainSegment = segments.find((s) => s.type === 'Segment');
-    if (!mainSegment) {
-        throw new Error('No main segment found');
-    }
-    const matroskaTracks = (0, get_ready_tracks_1.getTracksFromMatroska)(mainSegment, state.webm.getTimescale());
-    for (const track of matroskaTracks) {
+    const { resolved } = (0, get_ready_tracks_1.getTracksFromMatroska)({
+        state,
+    });
+    for (const track of resolved) {
         if (track.type === 'video') {
             videoTracks.push(track);
         }
@@ -141,7 +134,7 @@ exports.defaultHasallTracks = defaultHasallTracks;
 const getTracks = (state) => {
     const structure = state.getStructure();
     if (structure.type === 'matroska') {
-        return getTracksFromMa(structure.boxes, state);
+        return getCategorizedTracksFromMatroska(state);
     }
     if (structure.type === 'iso-base-media') {
         return (0, exports.getTracksFromIsoBaseMedia)(state);

package/dist/has-all-info.js

@@ -107,8 +107,12 @@ const hasAllInfo = ({ fields, state, }) => {
     if (!Object.values(availableInfo).every(Boolean)) {
         return false;
     }
-    const canSkipSamples = (0, may_skip_video_data_1.maySkipVideoData)({ state }) ||
-        state.callbacks.canSkipTracksState.canSkipTracks();
-    return canSkipSamples;
+    if ((0, may_skip_video_data_1.maySkipVideoData)({ state })) {
+        return true;
+    }
+    if (state.callbacks.canSkipTracksState.canSkipTracks()) {
+        return true;
+    }
+    return false;
 };
 exports.hasAllInfo = hasAllInfo;

package/dist/index.d.ts

@@ -881,6 +881,8 @@ export declare const MediaParserInternals: {
             addCluster: (cluster: import("./state/webm").ClusterSection) => void;
             isInsideSegment: (iterator: import("./buffer-iterator").BufferIterator) => import("./state/webm").SegmentSection | null;
             isInsideCluster: (iterator: import("./buffer-iterator").BufferIterator) => import("./state/webm").ClusterSection | null;
+            setAvcProfileForTrackNumber: (trackNumber: number, avcProfile: import("./containers/avc/parse-avc").AvcProfileInfo) => void;
+            getAvcProfileForTrackNumber: (trackNumber: number) => import("./containers/avc/parse-avc").AvcProfileInfo | null;
         };
         iso: {
             flatSamples: {
@@ -895,6 +897,8 @@ export declare const MediaParserInternals: {
         mp3Info: {
             getMp3Info: () => import("./state/mp3").Mp3Info | null;
             setMp3Info: (info: import("./state/mp3").Mp3Info) => void;
+            getCbrMp3Info: () => import("./state/mp3").Mp3CbrInfo | null;
+            setCbrMp3Info: (info: import("./state/mp3").Mp3CbrInfo) => void;
         };
         aac: {
             addSample: ({ offset, size }: {

package/dist/internal-parse-media.js

@@ -26,7 +26,7 @@ const internalParseMedia = async function ({ src, fields: _fieldsInReturnValue,
     log_1.Log.verbose(logLevel, `Reading ${typeof src === 'string' ? src : src.name}`);
     const { reader: readerInstance, contentLength, name, contentType, supportsContentRange, needsContentRange, } = await readerInterface.read({ src, range: null, controller });
     if (contentLength === null) {
-        throw new Error('Cannot read media without a content length. This is currently not supported. Ensure the media has a "Content-Length" HTTP header.');
+        throw new Error(`Cannot read media ${src} without a content length. This is currently not supported. Ensure the media has a "Content-Length" HTTP header.`);
     }
     if (!supportsContentRange && needsContentRange) {
         throw new Error('Cannot read media without it supporting the "Content-Range" header. This is currently not supported. Ensure the media supports the "Content-Range" HTTP header.');

package/dist/readers/fetch/get-body-and-reader.d.ts

@@ -4,5 +4,10 @@ type ReturnType = {
     contentLength: number | null;
     needsContentRange: boolean;
 };
-export declare const getLengthAndReader: (endsWithM3u8: boolean, res: Response, ownController: AbortController) => Promise<ReturnType>;
+export declare const getLengthAndReader: ({ canLiveWithoutContentLength, res, ownController, requestedWithoutRange, }: {
+    canLiveWithoutContentLength: boolean;
+    res: Response;
+    ownController: AbortController;
+    requestedWithoutRange: boolean;
+}) => Promise<ReturnType>;
 export {};

package/dist/readers/fetch/get-body-and-reader.js

@@ -1,10 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLengthAndReader = void 0;
-const getLengthAndReader = async (endsWithM3u8, res, ownController) => {
-    if (endsWithM3u8) {
-        const text = await res.text();
-        const encoded = new TextEncoder().encode(text);
+const 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);
@@ -22,8 +25,6 @@ const 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');
     }

package/dist/readers/from-fetch.js

@@ -27,7 +27,7 @@ function parseContentRange(input) {
     }
     return range;
 }
-const validateContentRangeAndDetectIfSupported = (actualRange, parsedContentRange, statusCode) => {
+const validateContentRangeAndDetectIfSupported = ({ actualRange, parsedContentRange, statusCode, }) => {
     if (statusCode === 206) {
         return { supportsContentRange: true };
     }
@@ -66,8 +66,10 @@ exports.fetchReader = {
             : // Disable Next.js caching
                 'no-store';
         const actualRange = range === null ? 0 : range;
-        const endsWithM3u8 = (typeof resolvedUrl === 'string' ? resolvedUrl : resolvedUrl.pathname).endsWith('.m3u8');
-        const headers = actualRange === 0 && endsWithM3u8
+        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'
                 ? {
@@ -85,7 +87,11 @@ exports.fetchReader = {
         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 errors_1.MediaParserAbortError('Aborted by user'));
         }, { once: true });
@@ -96,7 +102,12 @@ exports.fetchReader = {
         const contentDisposition = res.headers.get('content-disposition');
         const name = (_a = contentDisposition === null || contentDisposition === void 0 ? void 0 : contentDisposition.match(/filename="([^"]+)"/)) === null || _a === void 0 ? void 0 : _a[1];
         const fallbackName = src.split('/').pop();
-        const { contentLength, needsContentRange, reader } = await (0, get_body_and_reader_1.getLengthAndReader)(endsWithM3u8, res, ownController);
+        const { contentLength, needsContentRange, reader } = await (0, get_body_and_reader_1.getLengthAndReader)({
+            canLiveWithoutContentLength,
+            res,
+            ownController,
+            requestedWithoutRange: requestWithoutRange,
+        });
         if (controller) {
             controller._internals.signal.addEventListener('abort', () => {
                 reader.reader.cancel().catch(() => {

package/dist/state/mp3.d.ts

@@ -2,10 +2,14 @@ export type Mp3Info = {
     sampleRate: number;
     mpegVersion: 1 | 2;
     layer: number;
-    bitrateKbit: number;
     startOfMpegStream: number;
 };
+export type Mp3CbrInfo = {
+    bitrateKbit: number;
+};
 export declare const makeMp3State: () => {
     getMp3Info: () => Mp3Info | null;
     setMp3Info: (info: Mp3Info) => void;
+    getCbrMp3Info: () => Mp3CbrInfo | null;
+    setCbrMp3Info: (info: Mp3CbrInfo) => void;
 };

package/dist/state/mp3.js

@@ -3,11 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeMp3State = void 0;
 const makeMp3State = () => {
     let mp3Info = null;
+    // cbr  = constant bit rate
+    let cbrMp3Info = null;
     return {
         getMp3Info: () => mp3Info,
         setMp3Info: (info) => {
             mp3Info = info;
         },
+        getCbrMp3Info: () => cbrMp3Info,
+        setCbrMp3Info: (info) => {
+            cbrMp3Info = info;
+        },
     };
 };
 exports.makeMp3State = makeMp3State;

package/dist/state/parser-state.d.ts

@@ -168,6 +168,8 @@ export declare const makeParserState: ({ hasAudioTrackHandlers, hasVideoTrackHan
         addCluster: (cluster: import("./webm").ClusterSection) => void;
         isInsideSegment: (iterator: BufferIterator) => import("./webm").SegmentSection | null;
         isInsideCluster: (iterator: BufferIterator) => import("./webm").ClusterSection | null;
+        setAvcProfileForTrackNumber: (trackNumber: number, avcProfile: AvcProfileInfo) => void;
+        getAvcProfileForTrackNumber: (trackNumber: number) => AvcProfileInfo | null;
     };
     iso: {
         flatSamples: {
@@ -182,6 +184,8 @@ export declare const makeParserState: ({ hasAudioTrackHandlers, hasVideoTrackHan
     mp3Info: {
         getMp3Info: () => import("./mp3").Mp3Info | null;
         setMp3Info: (info: import("./mp3").Mp3Info) => void;
+        getCbrMp3Info: () => import("./mp3").Mp3CbrInfo | null;
+        setCbrMp3Info: (info: import("./mp3").Mp3CbrInfo) => void;
     };
     aac: {
         addSample: ({ offset, size }: {

package/dist/state/webm.d.ts

@@ -1,4 +1,5 @@
 import type { BufferIterator } from '../buffer-iterator';
+import type { AvcProfileInfo } from '../containers/avc/parse-avc';
 import type { OnTrackEntrySegment } from '../containers/webm/segments';
 import type { TrackInfo } from '../containers/webm/segments/track-entry';
 export type SegmentSection = {
@@ -23,4 +24,7 @@ export declare const webmState: () => {
     addCluster: (cluster: ClusterSection) => void;
     isInsideSegment: (iterator: BufferIterator) => SegmentSection | null;
     isInsideCluster: (iterator: BufferIterator) => ClusterSection | null;
+    setAvcProfileForTrackNumber: (trackNumber: number, avcProfile: AvcProfileInfo) => void;
+    getAvcProfileForTrackNumber: (trackNumber: number) => AvcProfileInfo | null;
 };
+export type WebmState = ReturnType<typeof webmState>;

package/dist/state/webm.js

@@ -56,6 +56,14 @@ const webmState = () => {
     };
     const segments = [];
     const clusters = [];
+    const avcProfilesMap = {};
+    const setAvcProfileForTrackNumber = (trackNumber, avcProfile) => {
+        avcProfilesMap[trackNumber] = avcProfile;
+    };
+    const getAvcProfileForTrackNumber = (trackNumber) => {
+        var _a;
+        return (_a = avcProfilesMap[trackNumber]) !== null && _a !== void 0 ? _a : null;
+    };
     return {
         onTrackEntrySegment,
         getTrackInfoByNumber: (id) => trackEntries[id],
@@ -94,6 +102,8 @@ const webmState = () => {
             }
             return null;
         },
+        setAvcProfileForTrackNumber,
+        getAvcProfileForTrackNumber,
     };
 };
 exports.webmState = webmState;

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "4.0.267";
+export declare const VERSION = "4.0.268";

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.267';
+exports.VERSION = '4.0.268';

package/package.json

@@ -3,14 +3,14 @@
     "url": "https://github.com/remotion-dev/remotion/tree/main/packages/media-parser"
   },
   "name": "@remotion/media-parser",
-  "version": "4.0.267",
+  "version": "4.0.268",
   "main": "dist/index.js",
   "sideEffects": false,
   "devDependencies": {
     "@types/wicg-file-system-access": "2023.10.5",
     "eslint": "9.19.0",
-    "@remotion/example-videos": "4.0.267",
-    "@remotion/eslint-config-internal": "4.0.267"
+    "@remotion/eslint-config-internal": "4.0.268",
+    "@remotion/example-videos": "4.0.268"
   },
   "publishConfig": {
     "access": "public"