@remotion/media-parser 4.0.193 → 4.0.195

package/dist/boxes/webm/segments/tracks.js

@@ -2,12 +2,20 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseTracksSegment = void 0;
 const parse_children_1 = require("./parse-children");
-const parseTracksSegment = (iterator) => {
-    const offset = iterator.counter.getOffset();
-    const length = iterator.getVint();
+const parseTracksSegment = async (iterator, length, parserContext) => {
+    const children = await (0, parse_children_1.expectChildren)({
+        iterator,
+        length,
+        initialChildren: [],
+        wrap: null,
+        parserContext,
+    });
+    if (children.status === 'incomplete') {
+        throw new Error('Incomplete children');
+    }
     return {
         type: 'tracks-segment',
-        children: (0, parse_children_1.expectChildren)(iterator, length - (iterator.counter.getOffset() - offset)),
+        children: children.segments,
     };
 };
 exports.parseTracksSegment = parseTracksSegment;

package/dist/boxes/webm/segments/void.d.ts

@@ -3,4 +3,4 @@ export type VoidSegment = {
     type: 'void-segment';
     length: number;
 };
-export declare const parseVoidSegment: (iterator: BufferIterator) => VoidSegment;
+export declare const parseVoidSegment: (iterator: BufferIterator, length: number) => VoidSegment;

package/dist/boxes/webm/segments/void.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseVoidSegment = void 0;
-const parseVoidSegment = (iterator) => {
-    const length = iterator.getVint();
+const parseVoidSegment = (iterator, length) => {
     iterator.discard(length);
     return {
         type: 'void-segment',

package/dist/boxes/webm/segments/writing.d.ts

@@ -3,4 +3,4 @@ export type WritingAppSegment = {
     type: 'writing-app-segment';
     value: string;
 };
-export declare const parseWritingSegment: (iterator: BufferIterator) => WritingAppSegment;
+export declare const parseWritingSegment: (iterator: BufferIterator, length: number) => WritingAppSegment;

package/dist/boxes/webm/segments/writing.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseWritingSegment = void 0;
-const parseWritingSegment = (iterator) => {
-    const length = iterator.getVint();
+const parseWritingSegment = (iterator, length) => {
     const value = iterator.getByteString(length);
     return {
         type: 'writing-app-segment',

package/dist/boxes/webm/segments.d.ts

@@ -1,16 +1,20 @@
 import type { BufferIterator } from '../../buffer-iterator';
+import type { ParseResult } from '../../parse-result';
+import type { ParserContext } from '../../parser-context';
 import type { DurationSegment } from './segments/duration';
 import type { InfoSegment } from './segments/info';
-import type { MainSegment } from './segments/main';
+import { type MainSegment } from './segments/main';
 import { type MuxingAppSegment } from './segments/muxing';
+import type { SeekIdSegment } from './segments/seek';
 import { type SeekSegment } from './segments/seek';
 import type { SeekHeadSegment } from './segments/seek-head';
 import { type SeekPositionSegment } from './segments/seek-position';
 import type { TimestampScaleSegment } from './segments/timestamp-scale';
-import type { AlphaModeSegment, CodecPrivateSegment, CodecSegment, ColorSegment, Crc32Segment, DefaultDurationSegment, DefaultFlagSegment, FlagLacingSegment, HeightSegment, InterlacedSegment, LanguageSegment, MaxBlockAdditionId, SegmentUUIDSegment, TitleSegment, TrackEntrySegment, TrackNumberSegment, TrackTypeSegment, TrackUIDSegment, VideoSegment, WidthSegment } from './segments/track-entry';
+import type { AlphaModeSegment, AudioSegment, BitDepthSegment, BlockElement, BlockGroupSegment, ChannelsSegment, ClusterSegment, CodecPrivateSegment, CodecSegment, ColorSegment, Crc32Segment, DefaultDurationSegment, DefaultFlagSegment, DisplayHeightSegment, DisplayWidthSegment, FlagLacingSegment, HeightSegment, InterlacedSegment, LanguageSegment, MaxBlockAdditionId, SamplingFrequencySegment, SegmentUUIDSegment, SimpleBlockSegment, TagSegment, TagsSegment, TimestampSegment, TitleSegment, TrackEntrySegment, TrackNumberSegment, TrackTypeSegment, TrackUIDSegment, VideoSegment, WidthSegment } from './segments/track-entry';
 import type { TracksSegment } from './segments/tracks';
 import type { UnknownSegment } from './segments/unknown';
 import type { VoidSegment } from './segments/void';
 import type { WritingAppSegment } from './segments/writing';
-export type MatroskaSegment = MainSegment | UnknownSegment | SeekHeadSegment | SeekSegment | SeekPositionSegment | VoidSegment | InfoSegment | TimestampScaleSegment | MuxingAppSegment | WritingAppSegment | DurationSegment | TracksSegment | TrackEntrySegment | TrackNumberSegment | TrackUIDSegment | FlagLacingSegment | LanguageSegment | CodecSegment | TrackTypeSegment | DefaultDurationSegment | VideoSegment | WidthSegment | HeightSegment | AlphaModeSegment | MaxBlockAdditionId | ColorSegment | TitleSegment | InterlacedSegment | CodecPrivateSegment | Crc32Segment | SegmentUUIDSegment | DefaultFlagSegment;
-export declare const expectSegment: (iterator: BufferIterator) => MatroskaSegment;
+export type MatroskaSegment = MainSegment | UnknownSegment | SeekHeadSegment | SeekSegment | SeekPositionSegment | VoidSegment | InfoSegment | TimestampScaleSegment | MuxingAppSegment | WritingAppSegment | DurationSegment | TracksSegment | TrackEntrySegment | TrackNumberSegment | TrackUIDSegment | FlagLacingSegment | LanguageSegment | CodecSegment | TrackTypeSegment | DefaultDurationSegment | VideoSegment | WidthSegment | HeightSegment | DisplayWidthSegment | DisplayHeightSegment | AlphaModeSegment | MaxBlockAdditionId | ColorSegment | TitleSegment | InterlacedSegment | CodecPrivateSegment | Crc32Segment | SegmentUUIDSegment | DefaultFlagSegment | TagsSegment | TagSegment | ClusterSegment | TimestampSegment | SimpleBlockSegment | BlockGroupSegment | BlockElement | SeekIdSegment | AudioSegment | SamplingFrequencySegment | ChannelsSegment | BitDepthSegment;
+export type OnTrackEntrySegment = (trackEntry: TrackEntrySegment) => void;
+export declare const expectSegment: (iterator: BufferIterator, parserContext: ParserContext) => Promise<ParseResult>;

package/dist/boxes/webm/segments.js

@@ -1,10 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.expectSegment = void 0;
+const add_new_matroska_tracks_1 = require("../../add-new-matroska-tracks");
+const get_track_1 = require("./get-track");
+const all_segments_1 = require("./segments/all-segments");
 const duration_1 = require("./segments/duration");
 const info_1 = require("./segments/info");
-const main_1 = require("./segments/main");
 const muxing_1 = require("./segments/muxing");
+const parse_children_1 = require("./segments/parse-children");
 const seek_1 = require("./segments/seek");
 const seek_head_1 = require("./segments/seek-head");
 const seek_position_1 = require("./segments/seek-position");
@@ -14,111 +17,244 @@ const tracks_1 = require("./segments/tracks");
 const unknown_1 = require("./segments/unknown");
 const void_1 = require("./segments/void");
 const writing_1 = require("./segments/writing");
-const expectSegment = (iterator) => {
-    const segmentId = iterator.getMatroskaSegmentId();
+const parseSegment = async ({ segmentId, iterator, length, parserContext, }) => {
+    if (length === 0) {
+        throw new Error(`Expected length of ${segmentId} to be greater than 0`);
+    }
     if (segmentId === '0x') {
         return {
             type: 'unknown-segment',
             id: segmentId,
         };
     }
-    if (segmentId === '0x18538067') {
-        return (0, main_1.parseMainSegment)(iterator);
-    }
+    // Log this to debug
+    /*
+    console.log(
+        'segmentId',
+        segmentId,
+        getSegmentName(segmentId),
+        iterator.counter.getOffset(),
+    );
+    */
     if (segmentId === '0x114d9b74') {
-        return (0, seek_head_1.parseSeekHeadSegment)(iterator);
+        return (0, seek_head_1.parseSeekHeadSegment)(iterator, length, parserContext);
+    }
+    if (segmentId === '0x53ab') {
+        return (0, seek_1.parseSeekIdSegment)(iterator);
     }
     if (segmentId === '0x4dbb') {
-        return (0, seek_1.parseSeekSegment)(iterator);
+        return (0, seek_1.parseSeekSegment)(iterator, length, parserContext);
     }
     if (segmentId === '0x53ac') {
-        return (0, seek_position_1.parseSeekPositionSegment)(iterator);
+        return (0, seek_position_1.parseSeekPositionSegment)(iterator, length);
     }
     if (segmentId === '0xec') {
-        return (0, void_1.parseVoidSegment)(iterator);
+        return (0, void_1.parseVoidSegment)(iterator, length);
     }
     if (segmentId === '0x1549a966') {
-        return (0, info_1.parseInfoSegment)(iterator);
+        return (0, info_1.parseInfoSegment)(iterator, length, parserContext);
     }
-    if (segmentId === '0x2ad7b183') {
-        return (0, timestamp_scale_1.parseTimestampScaleSegment)(iterator);
+    if (segmentId === all_segments_1.matroskaElements.TimestampScale) {
+        const timestampScale = (0, timestamp_scale_1.parseTimestampScaleSegment)(iterator);
+        parserContext.parserState.setTimescale(timestampScale.timestampScale);
+        return timestampScale;
     }
     if (segmentId === '0x4d80') {
-        return (0, muxing_1.parseMuxingSegment)(iterator);
+        return (0, muxing_1.parseMuxingSegment)(iterator, length);
     }
     if (segmentId === '0x5741') {
-        return (0, writing_1.parseWritingSegment)(iterator);
+        return (0, writing_1.parseWritingSegment)(iterator, length);
     }
     if (segmentId === '0x4489') {
-        return (0, duration_1.parseDurationSegment)(iterator);
+        return (0, duration_1.parseDurationSegment)(iterator, length);
     }
     if (segmentId === '0x1654ae6b') {
-        return (0, tracks_1.parseTracksSegment)(iterator);
-    }
-    if (segmentId === '0xae') {
-        return (0, track_entry_1.parseTrackEntry)(iterator);
+        return (0, tracks_1.parseTracksSegment)(iterator, length, parserContext);
+    }
+    if (segmentId === all_segments_1.matroskaElements.TrackEntry) {
+        const trackEntry = await (0, track_entry_1.parseTrackEntry)(iterator, length, parserContext);
+        parserContext.parserState.onTrackEntrySegment(trackEntry);
+        const track = (0, get_track_1.getTrack)({
+            track: trackEntry,
+            timescale: parserContext.parserState.getTimescale(),
+        });
+        if (track) {
+            await (0, add_new_matroska_tracks_1.registerTrack)({
+                state: parserContext.parserState,
+                options: parserContext,
+                track,
+            });
+        }
+        return trackEntry;
     }
     if (segmentId === '0xd7') {
-        return (0, track_entry_1.parseTrackNumber)(iterator);
+        return (0, track_entry_1.parseTrackNumber)(iterator, length);
     }
     if (segmentId === '0x73c5') {
-        return (0, track_entry_1.parseTrackUID)(iterator);
+        return (0, track_entry_1.parseTrackUID)(iterator, length);
     }
     if (segmentId === '0x9c') {
-        return (0, track_entry_1.parseFlagLacing)(iterator);
+        return (0, track_entry_1.parseFlagLacing)(iterator, length);
     }
     if (segmentId === '0x22b59c') {
-        return (0, track_entry_1.parseLanguageSegment)(iterator);
+        return (0, track_entry_1.parseLanguageSegment)(iterator, length);
     }
     if (segmentId === '0x86') {
-        return (0, track_entry_1.parseCodecSegment)(iterator);
+        return (0, track_entry_1.parseCodecSegment)(iterator, length);
     }
     if (segmentId === '0x83') {
-        return (0, track_entry_1.parseTrackTypeSegment)(iterator);
+        return (0, track_entry_1.parseTrackTypeSegment)(iterator, length);
     }
     if (segmentId === '0x55ee') {
-        return (0, track_entry_1.parseMaxBlockAdditionId)(iterator);
+        return (0, track_entry_1.parseMaxBlockAdditionId)(iterator, length);
     }
     if (segmentId === '0x55b0') {
-        return (0, track_entry_1.parseColorSegment)(iterator);
+        return (0, track_entry_1.parseColorSegment)(iterator, length);
     }
     if (segmentId === '0x23e383') {
-        return (0, track_entry_1.parseDefaultDurationSegment)(iterator);
+        return (0, track_entry_1.parseDefaultDurationSegment)(iterator, length);
     }
     if (segmentId === '0xe0') {
-        return (0, track_entry_1.parseVideoSegment)(iterator);
+        return (0, track_entry_1.parseVideoSegment)(iterator, length, parserContext);
+    }
+    if (segmentId === '0xe1') {
+        return (0, track_entry_1.parseAudioSegment)(iterator, length, parserContext);
     }
     if (segmentId === '0xb0') {
-        return (0, track_entry_1.parseWidthSegment)(iterator);
+        return (0, track_entry_1.parseWidthSegment)(iterator, length);
     }
     if (segmentId === '0xba') {
-        return (0, track_entry_1.parseHeightSegment)(iterator);
+        return (0, track_entry_1.parseHeightSegment)(iterator, length);
+    }
+    if (segmentId === all_segments_1.matroskaElements.DisplayWidth) {
+        return (0, track_entry_1.parseDisplayWidthSegment)(iterator, length);
+    }
+    if (segmentId === all_segments_1.matroskaElements.DisplayHeight) {
+        return (0, track_entry_1.parseDisplayHeightSegment)(iterator, length);
     }
     if (segmentId === '0x9a') {
-        return (0, track_entry_1.parseInterlacedSegment)(iterator);
+        return (0, track_entry_1.parseInterlacedSegment)(iterator, length);
     }
     if (segmentId === '0x53c0') {
-        return (0, track_entry_1.parseAlphaModeSegment)(iterator);
+        return (0, track_entry_1.parseAlphaModeSegment)(iterator, length);
     }
     if (segmentId === '0x63a2') {
-        return (0, track_entry_1.parseCodecPrivateSegment)(iterator);
+        return (0, track_entry_1.parseCodecPrivateSegment)(iterator, length);
     }
     if (segmentId === '0x7ba9') {
-        return (0, track_entry_1.parseTitleSegment)(iterator);
+        return (0, track_entry_1.parseTitleSegment)(iterator, length);
     }
     if (segmentId === '0xbf') {
-        return (0, track_entry_1.parseCrc32Segment)(iterator);
+        return (0, track_entry_1.parseCrc32Segment)(iterator, length);
     }
     if (segmentId === '0x73a4') {
-        return (0, track_entry_1.parseSegmentUUIDSegment)(iterator);
+        return (0, track_entry_1.parseSegmentUUIDSegment)(iterator, length);
     }
     if (segmentId === '0x88') {
-        return (0, track_entry_1.parseDefaultFlagSegment)(iterator);
+        return (0, track_entry_1.parseDefaultFlagSegment)(iterator, length);
+    }
+    if (segmentId === '0x1254c367') {
+        return (0, track_entry_1.parseTagsSegment)(iterator, length, parserContext);
+    }
+    if (segmentId === '0x7373') {
+        return (0, track_entry_1.parseTagSegment)(iterator, length);
+    }
+    if (segmentId === all_segments_1.matroskaElements.SamplingFrequency) {
+        return (0, track_entry_1.parseSamplingFrequencySegment)(iterator, length);
+    }
+    if (segmentId === all_segments_1.matroskaElements.Channels) {
+        return (0, track_entry_1.parseChannelsSegment)(iterator, length);
+    }
+    if (segmentId === all_segments_1.matroskaElements.BitDepth) {
+        return (0, track_entry_1.parseBitDepthSegment)(iterator, length);
+    }
+    if (segmentId === '0xe7') {
+        return (0, track_entry_1.parseTimestampSegment)(iterator, length);
+    }
+    if (segmentId === '0xa3') {
+        return (0, track_entry_1.parseSimpleBlockSegment)({
+            iterator,
+            length,
+            parserContext,
+        });
+    }
+    if (segmentId === '0xa0') {
+        return (0, track_entry_1.parseBlockGroupSegment)(iterator, length, parserContext);
+    }
+    if (segmentId === '0xa1') {
+        return (0, track_entry_1.parseBlockElementSegment)(iterator, length);
     }
-    const length = iterator.getVint();
     const bytesRemaining = iterator.byteLength() - iterator.counter.getOffset();
     const toDiscard = Math.min(bytesRemaining, length > 0 ? length : bytesRemaining);
     const child = (0, unknown_1.parseUnknownSegment)(iterator, segmentId, toDiscard);
     return child;
 };
+const expectSegment = async (iterator, parserContext) => {
+    const bytesRemaining_ = iterator.bytesRemaining();
+    if (bytesRemaining_ === 0) {
+        return {
+            status: 'incomplete',
+            segments: [],
+            continueParsing: () => {
+                return Promise.resolve((0, exports.expectSegment)(iterator, parserContext));
+            },
+            skipTo: null,
+        };
+    }
+    const offset = iterator.counter.getOffset();
+    const segmentId = iterator.getMatroskaSegmentId();
+    const length = iterator.getVint();
+    const bytesRemainingNow = iterator.byteLength() - iterator.counter.getOffset();
+    if (segmentId === '0x18538067' || segmentId === '0x1f43b675') {
+        const main = await (0, parse_children_1.expectChildren)({
+            iterator,
+            length,
+            initialChildren: [],
+            wrap: segmentId === '0x18538067'
+                ? (s) => ({
+                    type: 'main-segment',
+                    children: s,
+                })
+                : (s) => ({
+                    type: 'cluster-segment',
+                    children: s,
+                }),
+            parserContext,
+        });
+        if (main.status === 'incomplete') {
+            return {
+                status: 'incomplete',
+                segments: main.segments,
+                skipTo: null,
+                continueParsing: main.continueParsing,
+            };
+        }
+        return {
+            status: 'done',
+            segments: main.segments,
+        };
+    }
+    if (bytesRemainingNow < length) {
+        const bytesRead = iterator.counter.getOffset() - offset;
+        iterator.counter.decrement(bytesRead);
+        return {
+            status: 'incomplete',
+            segments: [],
+            continueParsing: () => {
+                return Promise.resolve((0, exports.expectSegment)(iterator, parserContext));
+            },
+            skipTo: null,
+        };
+    }
+    const segment = await parseSegment({
+        segmentId,
+        iterator,
+        length,
+        parserContext,
+    });
+    return {
+        status: 'done',
+        segments: [segment],
+    };
+};
 exports.expectSegment = expectSegment;

package/dist/boxes/webm/traversal.d.ts

@@ -0,0 +1,7 @@
+import type { AnySegment } from '../../parse-result';
+import type { MainSegment } from './segments/main';
+import type { CodecSegment, TrackEntrySegment } from './segments/track-entry';
+export declare const getMainSegment: (segments: AnySegment[]) => MainSegment | null;
+export declare const getTrackNumber: (track: TrackEntrySegment) => number | null;
+export declare const getTrackCodec: (track: TrackEntrySegment) => CodecSegment | null;
+export declare const getTrackByNumber: (tracks: TrackEntrySegment[], id: number) => TrackEntrySegment | undefined;

package/dist/boxes/webm/traversal.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getTrackByNumber = exports.getTrackCodec = exports.getTrackNumber = exports.getMainSegment = void 0;
+const getMainSegment = (segments) => {
+    return segments.find((s) => s.type === 'main-segment');
+};
+exports.getMainSegment = getMainSegment;
+const getTrackNumber = (track) => {
+    var _a;
+    const child = track.children.find((b) => b.type === 'track-number-segment');
+    return (_a = child === null || child === void 0 ? void 0 : child.trackNumber) !== null && _a !== void 0 ? _a : null;
+};
+exports.getTrackNumber = getTrackNumber;
+const getTrackCodec = (track) => {
+    const child = track.children.find((b) => b.type === 'codec-segment');
+    return child !== null && child !== void 0 ? child : null;
+};
+exports.getTrackCodec = getTrackCodec;
+const getTrackByNumber = (tracks, id) => {
+    return tracks.find((track) => {
+        const trackNumber = (0, exports.getTrackNumber)(track);
+        return trackNumber === id;
+    });
+};
+exports.getTrackByNumber = getTrackByNumber;

package/dist/buffer-iterator.d.ts

@@ -4,15 +4,23 @@ export declare class OffsetCounter {
     increment(amount: number): void;
     getOffset(): number;
     getDiscardedOffset(): number;
+    setDiscardedOffset(offset: number): void;
     discardBytes(amount: number): void;
     decrement(amount: number): void;
 }
 export declare const getArrayBufferIterator: (initialData: Uint8Array, maxBytes?: number) => {
+    startReadingBits: () => void;
+    stopReadingBits: () => void;
+    skipTo: (offset: number) => void;
     addData: (newData: Uint8Array) => void;
     counter: OffsetCounter;
+    peekB: (length: number) => void;
+    peekD: (length: number) => void;
+    getBits: (bits: number) => number;
     byteLength: () => number;
     bytesRemaining: () => number;
     isIsoBaseMedia: () => boolean;
+    leb128: () => number;
     discardFirstBytes: () => void;
     isWebm: () => boolean;
     discard: (length: number) => void;
@@ -28,10 +36,17 @@ export declare const getArrayBufferIterator: (initialData: Uint8Array, maxBytes?
     getUint16: () => number;
     getInt16: () => number;
     getUint32: () => number;
-    getFixedPoint1616Number: () => number;
+    getFixedPointUnsigned1616Number: () => number;
+    getFixedPointSigned1616Number: () => number;
+    getFixedPointSigned230Number: () => number;
     getPascalString: () => number[];
     getDecimalBytes(length: number): number;
     getByteString(length: number): string;
     getFloat64: () => number;
+    getFloat32: () => number;
+    getUint32Le: () => number;
+    getInt32Le: () => number;
+    destroy: () => void;
+    isMp3: () => boolean;
 };
 export type BufferIterator = ReturnType<typeof getArrayBufferIterator>;