@remotion/media-parser 4.0.314 → 4.0.316

package/dist/containers/mp3/parse-xing.js

@@ -69,8 +69,9 @@ const parseXing = (data) => {
         vbrScale = extractI4(data, offset);
         offset += 4;
     }
-    if (offset !== data.length) {
-        throw new Error('xing header was parsed wrong: ' + JSON.stringify(data));
+    // Allow extra data after the standard Xing fields, as some encoders add additional information
+    if (offset > data.length) {
+        throw new Error('xing header was parsed wrong: read beyond available data');
     }
     return {
         sampleRate,

package/dist/containers/wav/parse-fmt.d.ts

@@ -1,5 +1,6 @@
 import type { ParseResult } from '../../parse-result';
 import type { ParserState } from '../../state/parser-state';
+export declare function getChannelsFromMask(channelMask: number): string[];
 export declare const parseFmt: ({ state, }: {
     state: ParserState;
 }) => Promise<ParseResult>;

package/dist/containers/wav/parse-fmt.js

@@ -1,14 +1,51 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseFmt = void 0;
+exports.getChannelsFromMask = getChannelsFromMask;
 const register_track_1 = require("../../register-track");
 const webcodecs_timescale_1 = require("../../webcodecs-timescale");
+const CHANNELS = {
+    0: 'Front Left',
+    1: 'Front Right',
+    2: 'Front Center',
+    3: 'Low Frequency',
+    4: 'Back Left',
+    5: 'Back Right',
+    6: 'Front Left of Center',
+    7: 'Front Right of Center',
+    8: 'Back Center',
+    9: 'Side Left',
+    10: 'Side Right',
+    11: 'Top Center',
+    12: 'Top Front Left',
+    13: 'Top Front Center',
+    14: 'Top Front Right',
+    15: 'Top Back Left',
+    16: 'Top Back Center',
+    17: 'Top Back Right',
+    // Add more if needed as per the spec
+};
+function getChannelsFromMask(channelMask) {
+    const channels = [];
+    for (let bit = 0; bit < 18; bit++) {
+        if ((channelMask & (1 << bit)) !== 0) {
+            const channelName = CHANNELS[bit];
+            if (channelName) {
+                channels.push(channelName);
+            }
+            else {
+                channels.push(`Unknown Channel (bit ${bit})`);
+            }
+        }
+    }
+    return channels;
+}
 const parseFmt = async ({ state, }) => {
     const { iterator } = state;
     const ckSize = iterator.getUint32Le(); // chunkSize
     const box = iterator.startBox(ckSize);
     const audioFormat = iterator.getUint16Le();
-    if (audioFormat !== 1) {
+    if (audioFormat !== 1 && audioFormat !== 65534) {
         throw new Error(`Only supporting WAVE with PCM audio format, but got ${audioFormat}`);
     }
     const numberOfChannels = iterator.getUint16Le();
@@ -35,6 +72,27 @@ const parseFmt = async ({ state, }) => {
         type: 'wav-fmt',
     };
     state.structure.getWavStructure().boxes.push(wavHeader);
+    if (audioFormat === 65534) {
+        const extraSize = iterator.getUint16Le();
+        if (extraSize !== 22) {
+            throw new Error(`Only supporting WAVE with 22 extra bytes, but got ${extraSize} bytes extra size`);
+        }
+        iterator.getUint16Le(); // valid bits per sample
+        const channelMask = iterator.getUint32Le();
+        const subFormat = iterator.getSlice(16);
+        // check if same as [ 1, 0, 0, 0, 0, 0, 16, 0, 128, 0, 0, 170, 0, 56, 155, 113 ]
+        if (subFormat.length !== 16) {
+            throw new Error(`Only supporting WAVE with PCM audio format, but got ${subFormat.length}`);
+        }
+        for (let i = 0; i < 16; i++) {
+            if (subFormat[i] !==
+                [1, 0, 0, 0, 0, 0, 16, 0, 128, 0, 0, 170, 0, 56, 155, 113][i]) {
+                throw new Error(`Only supporting WAVE with PCM audio format, but got subformat ${subFormat[i]}`);
+            }
+        }
+        const channels = getChannelsFromMask(channelMask);
+        wavHeader.numberOfChannels = channels.length;
+    }
     await (0, register_track_1.registerAudioTrack)({
         track: {
             type: 'audio',

package/dist/containers/wav/parse-junk.d.ts

@@ -0,0 +1,5 @@
+import type { ParseResult } from '../../parse-result';
+import type { ParserState } from '../../state/parser-state';
+export declare const parseJunk: ({ state, }: {
+    state: ParserState;
+}) => Promise<ParseResult>;

package/dist/containers/wav/parse-junk.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseJunk = void 0;
+const log_1 = require("../../log");
+const parseJunk = ({ state, }) => {
+    const { iterator } = state;
+    const ckSize = iterator.getUint32Le(); // chunkSize
+    log_1.Log.trace(state.logLevel, `Skipping JUNK chunk of size ${ckSize}`);
+    iterator.discard(ckSize);
+    return Promise.resolve(null);
+};
+exports.parseJunk = parseJunk;

package/dist/containers/wav/parse-wav.js

@@ -6,6 +6,7 @@ const parse_data_1 = require("./parse-data");
 const parse_fmt_1 = require("./parse-fmt");
 const parse_header_1 = require("./parse-header");
 const parse_id3_1 = require("./parse-id3");
+const parse_junk_1 = require("./parse-junk");
 const parse_list_1 = require("./parse-list");
 const parse_media_section_1 = require("./parse-media-section");
 const parseWav = (state) => {
@@ -31,6 +32,9 @@ const parseWav = (state) => {
     if (type === 'id3' || type === 'ID3') {
         return (0, parse_id3_1.parseId3)({ state });
     }
+    if (type === 'JUNK' || type === 'FLLR') {
+        return (0, parse_junk_1.parseJunk)({ state });
+    }
     if (type === '\u0000') {
         return Promise.resolve(null);
     }

package/dist/containers/webm/parse-ebml.d.ts

@@ -1,10 +1,11 @@
 import type { BufferIterator } from '../../iterator/buffer-iterator';
+import type { MediaParserLogLevel } from '../../log';
 import type { PossibleEbml } from './segments/all-segments';
 import type { WebmRequiredStatesForProcessing } from './state-for-processing';
 export type Prettify<T> = {
     [K in keyof T]: T[K];
 } & {};
-export declare const parseEbml: (iterator: BufferIterator, statesForProcessing: WebmRequiredStatesForProcessing | null) => Promise<Prettify<PossibleEbml>>;
+export declare const parseEbml: (iterator: BufferIterator, statesForProcessing: WebmRequiredStatesForProcessing | null, logLevel: MediaParserLogLevel) => Promise<Prettify<PossibleEbml> | null>;
 export declare const postprocessEbml: ({ offset, ebml, statesForProcessing: { webmState, callbacks, logLevel, onAudioTrack, onVideoTrack, structureState, avcState, }, }: {
     offset: number;
     ebml: Prettify<PossibleEbml>;

package/dist/containers/webm/parse-ebml.js

@@ -1,25 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.postprocessEbml = exports.parseEbml = void 0;
+const log_1 = require("../../log");
 const register_track_1 = require("../../register-track");
 const get_sample_from_block_1 = require("./get-sample-from-block");
 const make_track_1 = require("./make-track");
 const all_segments_1 = require("./segments/all-segments");
-const parseEbml = async (iterator, statesForProcessing) => {
+const parseEbml = async (iterator, statesForProcessing, logLevel) => {
     const hex = iterator.getMatroskaSegmentId();
     if (hex === null) {
         throw new Error('Not enough bytes left to parse EBML - this should not happen');
     }
-    const hasInMap = all_segments_1.ebmlMap[hex];
-    if (!hasInMap) {
-        throw new Error(`Don't know how to parse EBML hex ID ${JSON.stringify(hex)}`);
-    }
     const off = iterator.counter.getOffset();
     const size = iterator.getVint();
     const minVintWidth = iterator.counter.getOffset() - off;
     if (size === null) {
         throw new Error('Not enough bytes left to parse EBML - this should not happen');
     }
+    const hasInMap = all_segments_1.ebmlMap[hex];
+    if (!hasInMap) {
+        log_1.Log.verbose(logLevel, `Unknown EBML hex ID ${JSON.stringify(hex)}`);
+        iterator.discard(size);
+        return null;
+    }
     if (hasInMap.type === 'uint') {
         const beforeUintOffset = iterator.counter.getOffset();
         const value = size === 0 ? 0 : iterator.getUint(size);
@@ -83,16 +86,18 @@ const parseEbml = async (iterator, statesForProcessing) => {
                 break;
             }
             const offset = iterator.counter.getOffset();
-            const value = await (0, exports.parseEbml)(iterator, statesForProcessing);
-            const remapped = statesForProcessing
-                ? // eslint-disable-next-line @typescript-eslint/no-use-before-define
-                    await (0, exports.postprocessEbml)({
-                        offset,
-                        ebml: value,
-                        statesForProcessing,
-                    })
-                : value;
-            children.push(remapped);
+            const value = await (0, exports.parseEbml)(iterator, statesForProcessing, logLevel);
+            if (value) {
+                const remapped = statesForProcessing
+                    ? // eslint-disable-next-line @typescript-eslint/no-use-before-define
+                        await (0, exports.postprocessEbml)({
+                            offset,
+                            ebml: value,
+                            statesForProcessing,
+                        })
+                    : value;
+                children.push(remapped);
+            }
             const offsetNow = iterator.counter.getOffset();
             if (offsetNow - startOffset > size) {
                 throw new Error(`Offset ${offsetNow - startOffset} is larger than the length of the hex ${size}`);

package/dist/containers/webm/segments.js

@@ -75,17 +75,21 @@ const expectSegment = async ({ statesForProcessing, isInsideSegment, iterator, l
         headerReadSoFar: iterator.counter.getOffset() - offset,
         statesForProcessing,
         iterator,
+        logLevel,
     });
     return segment;
 };
 exports.expectSegment = expectSegment;
-const parseSegment = async ({ segmentId, length, iterator, headerReadSoFar, statesForProcessing, }) => {
+const parseSegment = async ({ segmentId, length, iterator, headerReadSoFar, statesForProcessing, logLevel, }) => {
     if (length < 0) {
         throw new Error(`Expected length of ${segmentId} to be greater or equal 0`);
     }
     iterator.counter.decrement(headerReadSoFar);
     const offset = iterator.counter.getOffset();
-    const ebml = await (0, parse_ebml_1.parseEbml)(iterator, statesForProcessing);
+    const ebml = await (0, parse_ebml_1.parseEbml)(iterator, statesForProcessing, logLevel);
+    if (ebml === null) {
+        return null;
+    }
     if (!statesForProcessing) {
         return ebml;
     }

package/dist/errors.js

@@ -53,6 +53,8 @@ exports.MediaParserAbortError = MediaParserAbortError;
 const hasBeenAborted = (error) => {
     return (error instanceof MediaParserAbortError ||
         // On worker it is not the same instance, but same name
-        error.name === 'MediaParserAbortError');
+        error.name === 'MediaParserAbortError' ||
+        // fetch gives BodyStreamBuffer was aborted
+        error.name === 'AbortError');
 };
 exports.hasBeenAborted = hasBeenAborted;

package/dist/esm/index.mjs

@@ -6473,21 +6473,23 @@ var getSampleFromBlock = async ({
 };
 
 // src/containers/webm/parse-ebml.ts
-var parseEbml = async (iterator, statesForProcessing) => {
+var parseEbml = async (iterator, statesForProcessing, logLevel) => {
   const hex = iterator.getMatroskaSegmentId();
   if (hex === null) {
     throw new Error("Not enough bytes left to parse EBML - this should not happen");
   }
-  const hasInMap = ebmlMap[hex];
-  if (!hasInMap) {
-    throw new Error(`Don't know how to parse EBML hex ID ${JSON.stringify(hex)}`);
-  }
   const off = iterator.counter.getOffset();
   const size = iterator.getVint();
   const minVintWidth = iterator.counter.getOffset() - off;
   if (size === null) {
     throw new Error("Not enough bytes left to parse EBML - this should not happen");
   }
+  const hasInMap = ebmlMap[hex];
+  if (!hasInMap) {
+    Log.verbose(logLevel, `Unknown EBML hex ID ${JSON.stringify(hex)}`);
+    iterator.discard(size);
+    return null;
+  }
   if (hasInMap.type === "uint") {
     const beforeUintOffset = iterator.counter.getOffset();
     const value = size === 0 ? 0 : iterator.getUint(size);
@@ -6542,13 +6544,15 @@ var parseEbml = async (iterator, statesForProcessing) => {
         break;
       }
       const offset = iterator.counter.getOffset();
-      const value = await parseEbml(iterator, statesForProcessing);
-      const remapped = statesForProcessing ? await postprocessEbml({
-        offset,
-        ebml: value,
-        statesForProcessing
-      }) : value;
-      children.push(remapped);
+      const value = await parseEbml(iterator, statesForProcessing, logLevel);
+      if (value) {
+        const remapped = statesForProcessing ? await postprocessEbml({
+          offset,
+          ebml: value,
+          statesForProcessing
+        }) : value;
+        children.push(remapped);
+      }
       const offsetNow = iterator.counter.getOffset();
       if (offsetNow - startOffset > size) {
         throw new Error(`Offset ${offsetNow - startOffset} is larger than the length of the hex ${size}`);
@@ -6766,7 +6770,7 @@ class MediaParserAbortError extends Error {
   }
 }
 var hasBeenAborted = (error) => {
-  return error instanceof MediaParserAbortError || error.name === "MediaParserAbortError";
+  return error instanceof MediaParserAbortError || error.name === "MediaParserAbortError" || error.name === "AbortError";
 };
 
 // src/with-resolvers.ts
@@ -8760,8 +8764,8 @@ var parseXing = (data) => {
     vbrScale = extractI4(data, offset);
     offset += 4;
   }
-  if (offset !== data.length) {
-    throw new Error("xing header was parsed wrong: " + JSON.stringify(data));
+  if (offset > data.length) {
+    throw new Error("xing header was parsed wrong: read beyond available data");
   }
   return {
     sampleRate,
@@ -15071,6 +15075,40 @@ var parseData = ({
 };
 
 // src/containers/wav/parse-fmt.ts
+var CHANNELS = {
+  0: "Front Left",
+  1: "Front Right",
+  2: "Front Center",
+  3: "Low Frequency",
+  4: "Back Left",
+  5: "Back Right",
+  6: "Front Left of Center",
+  7: "Front Right of Center",
+  8: "Back Center",
+  9: "Side Left",
+  10: "Side Right",
+  11: "Top Center",
+  12: "Top Front Left",
+  13: "Top Front Center",
+  14: "Top Front Right",
+  15: "Top Back Left",
+  16: "Top Back Center",
+  17: "Top Back Right"
+};
+function getChannelsFromMask(channelMask) {
+  const channels2 = [];
+  for (let bit = 0;bit < 18; bit++) {
+    if ((channelMask & 1 << bit) !== 0) {
+      const channelName = CHANNELS[bit];
+      if (channelName) {
+        channels2.push(channelName);
+      } else {
+        channels2.push(`Unknown Channel (bit ${bit})`);
+      }
+    }
+  }
+  return channels2;
+}
 var parseFmt = async ({
   state
 }) => {
@@ -15078,7 +15116,7 @@ var parseFmt = async ({
   const ckSize = iterator.getUint32Le();
   const box = iterator.startBox(ckSize);
   const audioFormat = iterator.getUint16Le();
-  if (audioFormat !== 1) {
+  if (audioFormat !== 1 && audioFormat !== 65534) {
     throw new Error(`Only supporting WAVE with PCM audio format, but got ${audioFormat}`);
   }
   const numberOfChannels = iterator.getUint16Le();
@@ -15099,6 +15137,25 @@ var parseFmt = async ({
     type: "wav-fmt"
   };
   state.structure.getWavStructure().boxes.push(wavHeader);
+  if (audioFormat === 65534) {
+    const extraSize = iterator.getUint16Le();
+    if (extraSize !== 22) {
+      throw new Error(`Only supporting WAVE with 22 extra bytes, but got ${extraSize} bytes extra size`);
+    }
+    iterator.getUint16Le();
+    const channelMask = iterator.getUint32Le();
+    const subFormat = iterator.getSlice(16);
+    if (subFormat.length !== 16) {
+      throw new Error(`Only supporting WAVE with PCM audio format, but got ${subFormat.length}`);
+    }
+    for (let i = 0;i < 16; i++) {
+      if (subFormat[i] !== [1, 0, 0, 0, 0, 0, 16, 0, 128, 0, 0, 170, 0, 56, 155, 113][i]) {
+        throw new Error(`Only supporting WAVE with PCM audio format, but got subformat ${subFormat[i]}`);
+      }
+    }
+    const channels2 = getChannelsFromMask(channelMask);
+    wavHeader.numberOfChannels = channels2.length;
+  }
   await registerAudioTrack({
     track: {
       type: "audio",
@@ -15154,6 +15211,17 @@ var parseId32 = ({
   return Promise.resolve(null);
 };
 
+// src/containers/wav/parse-junk.ts
+var parseJunk = ({
+  state
+}) => {
+  const { iterator } = state;
+  const ckSize = iterator.getUint32Le();
+  Log.trace(state.logLevel, `Skipping JUNK chunk of size ${ckSize}`);
+  iterator.discard(ckSize);
+  return Promise.resolve(null);
+};
+
 // src/containers/wav/parse-list.ts
 var parseList = ({
   state
@@ -15252,6 +15320,9 @@ var parseWav = (state) => {
   if (type === "id3" || type === "ID3") {
     return parseId32({ state });
   }
+  if (type === "JUNK" || type === "FLLR") {
+    return parseJunk({ state });
+  }
   if (type === "\x00") {
     return Promise.resolve(null);
   }
@@ -15363,7 +15434,8 @@ var expectSegment = async ({
     length: size,
     headerReadSoFar: iterator.counter.getOffset() - offset,
     statesForProcessing,
-    iterator
+    iterator,
+    logLevel
   });
   return segment;
 };
@@ -15372,14 +15444,18 @@ var parseSegment = async ({
   length,
   iterator,
   headerReadSoFar,
-  statesForProcessing
+  statesForProcessing,
+  logLevel
 }) => {
   if (length < 0) {
     throw new Error(`Expected length of ${segmentId} to be greater or equal 0`);
   }
   iterator.counter.decrement(headerReadSoFar);
   const offset = iterator.counter.getOffset();
-  const ebml = await parseEbml(iterator, statesForProcessing);
+  const ebml = await parseEbml(iterator, statesForProcessing, logLevel);
+  if (ebml === null) {
+    return null;
+  }
   if (!statesForProcessing) {
     return ebml;
   }
@@ -17870,7 +17946,7 @@ var downloadAndParseMedia = async (options) => {
   return returnValue;
 };
 // src/version.ts
-var VERSION = "4.0.314";
+var VERSION = "4.0.316";
 
 // src/index.ts
 var MediaParserInternals = {

package/dist/esm/worker-server-entry.mjs

@@ -6467,8 +6467,8 @@ var parseXing = (data) => {
     vbrScale = extractI4(data, offset);
     offset += 4;
   }
-  if (offset !== data.length) {
-    throw new Error("xing header was parsed wrong: " + JSON.stringify(data));
+  if (offset > data.length) {
+    throw new Error("xing header was parsed wrong: read beyond available data");
   }
   return {
     sampleRate,
@@ -14810,6 +14810,40 @@ var parseData = ({
 };
 
 // src/containers/wav/parse-fmt.ts
+var CHANNELS = {
+  0: "Front Left",
+  1: "Front Right",
+  2: "Front Center",
+  3: "Low Frequency",
+  4: "Back Left",
+  5: "Back Right",
+  6: "Front Left of Center",
+  7: "Front Right of Center",
+  8: "Back Center",
+  9: "Side Left",
+  10: "Side Right",
+  11: "Top Center",
+  12: "Top Front Left",
+  13: "Top Front Center",
+  14: "Top Front Right",
+  15: "Top Back Left",
+  16: "Top Back Center",
+  17: "Top Back Right"
+};
+function getChannelsFromMask(channelMask) {
+  const channels2 = [];
+  for (let bit = 0;bit < 18; bit++) {
+    if ((channelMask & 1 << bit) !== 0) {
+      const channelName = CHANNELS[bit];
+      if (channelName) {
+        channels2.push(channelName);
+      } else {
+        channels2.push(`Unknown Channel (bit ${bit})`);
+      }
+    }
+  }
+  return channels2;
+}
 var parseFmt = async ({
   state
 }) => {
@@ -14817,7 +14851,7 @@ var parseFmt = async ({
   const ckSize = iterator.getUint32Le();
   const box = iterator.startBox(ckSize);
   const audioFormat = iterator.getUint16Le();
-  if (audioFormat !== 1) {
+  if (audioFormat !== 1 && audioFormat !== 65534) {
     throw new Error(`Only supporting WAVE with PCM audio format, but got ${audioFormat}`);
   }
   const numberOfChannels = iterator.getUint16Le();
@@ -14838,6 +14872,25 @@ var parseFmt = async ({
     type: "wav-fmt"
   };
   state.structure.getWavStructure().boxes.push(wavHeader);
+  if (audioFormat === 65534) {
+    const extraSize = iterator.getUint16Le();
+    if (extraSize !== 22) {
+      throw new Error(`Only supporting WAVE with 22 extra bytes, but got ${extraSize} bytes extra size`);
+    }
+    iterator.getUint16Le();
+    const channelMask = iterator.getUint32Le();
+    const subFormat = iterator.getSlice(16);
+    if (subFormat.length !== 16) {
+      throw new Error(`Only supporting WAVE with PCM audio format, but got ${subFormat.length}`);
+    }
+    for (let i = 0;i < 16; i++) {
+      if (subFormat[i] !== [1, 0, 0, 0, 0, 0, 16, 0, 128, 0, 0, 170, 0, 56, 155, 113][i]) {
+        throw new Error(`Only supporting WAVE with PCM audio format, but got subformat ${subFormat[i]}`);
+      }
+    }
+    const channels2 = getChannelsFromMask(channelMask);
+    wavHeader.numberOfChannels = channels2.length;
+  }
   await registerAudioTrack({
     track: {
       type: "audio",
@@ -14893,6 +14946,17 @@ var parseId32 = ({
   return Promise.resolve(null);
 };
 
+// src/containers/wav/parse-junk.ts
+var parseJunk = ({
+  state
+}) => {
+  const { iterator } = state;
+  const ckSize = iterator.getUint32Le();
+  Log.trace(state.logLevel, `Skipping JUNK chunk of size ${ckSize}`);
+  iterator.discard(ckSize);
+  return Promise.resolve(null);
+};
+
 // src/containers/wav/parse-list.ts
 var parseList = ({
   state
@@ -14991,6 +15055,9 @@ var parseWav = (state) => {
   if (type === "id3" || type === "ID3") {
     return parseId32({ state });
   }
+  if (type === "JUNK" || type === "FLLR") {
+    return parseJunk({ state });
+  }
   if (type === "\x00") {
     return Promise.resolve(null);
   }
@@ -15200,21 +15267,23 @@ var getSampleFromBlock = async ({
 };
 
 // src/containers/webm/parse-ebml.ts
-var parseEbml = async (iterator, statesForProcessing) => {
+var parseEbml = async (iterator, statesForProcessing, logLevel) => {
   const hex = iterator.getMatroskaSegmentId();
   if (hex === null) {
     throw new Error("Not enough bytes left to parse EBML - this should not happen");
   }
-  const hasInMap = ebmlMap[hex];
-  if (!hasInMap) {
-    throw new Error(`Don't know how to parse EBML hex ID ${JSON.stringify(hex)}`);
-  }
   const off = iterator.counter.getOffset();
   const size = iterator.getVint();
   const minVintWidth = iterator.counter.getOffset() - off;
   if (size === null) {
     throw new Error("Not enough bytes left to parse EBML - this should not happen");
   }
+  const hasInMap = ebmlMap[hex];
+  if (!hasInMap) {
+    Log.verbose(logLevel, `Unknown EBML hex ID ${JSON.stringify(hex)}`);
+    iterator.discard(size);
+    return null;
+  }
   if (hasInMap.type === "uint") {
     const beforeUintOffset = iterator.counter.getOffset();
     const value = size === 0 ? 0 : iterator.getUint(size);
@@ -15269,13 +15338,15 @@ var parseEbml = async (iterator, statesForProcessing) => {
         break;
       }
       const offset = iterator.counter.getOffset();
-      const value = await parseEbml(iterator, statesForProcessing);
-      const remapped = statesForProcessing ? await postprocessEbml({
-        offset,
-        ebml: value,
-        statesForProcessing
-      }) : value;
-      children.push(remapped);
+      const value = await parseEbml(iterator, statesForProcessing, logLevel);
+      if (value) {
+        const remapped = statesForProcessing ? await postprocessEbml({
+          offset,
+          ebml: value,
+          statesForProcessing
+        }) : value;
+        children.push(remapped);
+      }
       const offsetNow = iterator.counter.getOffset();
       if (offsetNow - startOffset > size) {
         throw new Error(`Offset ${offsetNow - startOffset} is larger than the length of the hex ${size}`);
@@ -15491,7 +15562,8 @@ var expectSegment = async ({
     length: size,
     headerReadSoFar: iterator.counter.getOffset() - offset,
     statesForProcessing,
-    iterator
+    iterator,
+    logLevel
   });
   return segment;
 };
@@ -15500,14 +15572,18 @@ var parseSegment = async ({
   length,
   iterator,
   headerReadSoFar,
-  statesForProcessing
+  statesForProcessing,
+  logLevel
 }) => {
   if (length < 0) {
     throw new Error(`Expected length of ${segmentId} to be greater or equal 0`);
   }
   iterator.counter.decrement(headerReadSoFar);
   const offset = iterator.counter.getOffset();
-  const ebml = await parseEbml(iterator, statesForProcessing);
+  const ebml = await parseEbml(iterator, statesForProcessing, logLevel);
+  if (ebml === null) {
+    return null;
+  }
   if (!statesForProcessing) {
     return ebml;
   }

package/dist/esm/worker-web-entry.mjs

@@ -6364,8 +6364,8 @@ var parseXing = (data) => {
     vbrScale = extractI4(data, offset);
     offset += 4;
   }
-  if (offset !== data.length) {
-    throw new Error("xing header was parsed wrong: " + JSON.stringify(data));
+  if (offset > data.length) {
+    throw new Error("xing header was parsed wrong: read beyond available data");
   }
   return {
     sampleRate,
@@ -14679,6 +14679,40 @@ var parseData = ({
 };
 
 // src/containers/wav/parse-fmt.ts
+var CHANNELS = {
+  0: "Front Left",
+  1: "Front Right",
+  2: "Front Center",
+  3: "Low Frequency",
+  4: "Back Left",
+  5: "Back Right",
+  6: "Front Left of Center",
+  7: "Front Right of Center",
+  8: "Back Center",
+  9: "Side Left",
+  10: "Side Right",
+  11: "Top Center",
+  12: "Top Front Left",
+  13: "Top Front Center",
+  14: "Top Front Right",
+  15: "Top Back Left",
+  16: "Top Back Center",
+  17: "Top Back Right"
+};
+function getChannelsFromMask(channelMask) {
+  const channels2 = [];
+  for (let bit = 0;bit < 18; bit++) {
+    if ((channelMask & 1 << bit) !== 0) {
+      const channelName = CHANNELS[bit];
+      if (channelName) {
+        channels2.push(channelName);
+      } else {
+        channels2.push(`Unknown Channel (bit ${bit})`);
+      }
+    }
+  }
+  return channels2;
+}
 var parseFmt = async ({
   state
 }) => {
@@ -14686,7 +14720,7 @@ var parseFmt = async ({
   const ckSize = iterator.getUint32Le();
   const box = iterator.startBox(ckSize);
   const audioFormat = iterator.getUint16Le();
-  if (audioFormat !== 1) {
+  if (audioFormat !== 1 && audioFormat !== 65534) {
     throw new Error(`Only supporting WAVE with PCM audio format, but got ${audioFormat}`);
   }
   const numberOfChannels = iterator.getUint16Le();
@@ -14707,6 +14741,25 @@ var parseFmt = async ({
     type: "wav-fmt"
   };
   state.structure.getWavStructure().boxes.push(wavHeader);
+  if (audioFormat === 65534) {
+    const extraSize = iterator.getUint16Le();
+    if (extraSize !== 22) {
+      throw new Error(`Only supporting WAVE with 22 extra bytes, but got ${extraSize} bytes extra size`);
+    }
+    iterator.getUint16Le();
+    const channelMask = iterator.getUint32Le();
+    const subFormat = iterator.getSlice(16);
+    if (subFormat.length !== 16) {
+      throw new Error(`Only supporting WAVE with PCM audio format, but got ${subFormat.length}`);
+    }
+    for (let i = 0;i < 16; i++) {
+      if (subFormat[i] !== [1, 0, 0, 0, 0, 0, 16, 0, 128, 0, 0, 170, 0, 56, 155, 113][i]) {
+        throw new Error(`Only supporting WAVE with PCM audio format, but got subformat ${subFormat[i]}`);
+      }
+    }
+    const channels2 = getChannelsFromMask(channelMask);
+    wavHeader.numberOfChannels = channels2.length;
+  }
   await registerAudioTrack({
     track: {
       type: "audio",
@@ -14762,6 +14815,17 @@ var parseId32 = ({
   return Promise.resolve(null);
 };
 
+// src/containers/wav/parse-junk.ts
+var parseJunk = ({
+  state
+}) => {
+  const { iterator } = state;
+  const ckSize = iterator.getUint32Le();
+  Log.trace(state.logLevel, `Skipping JUNK chunk of size ${ckSize}`);
+  iterator.discard(ckSize);
+  return Promise.resolve(null);
+};
+
 // src/containers/wav/parse-list.ts
 var parseList = ({
   state
@@ -14860,6 +14924,9 @@ var parseWav = (state) => {
   if (type === "id3" || type === "ID3") {
     return parseId32({ state });
   }
+  if (type === "JUNK" || type === "FLLR") {
+    return parseJunk({ state });
+  }
   if (type === "\x00") {
     return Promise.resolve(null);
   }
@@ -15069,21 +15136,23 @@ var getSampleFromBlock = async ({
 };
 
 // src/containers/webm/parse-ebml.ts
-var parseEbml = async (iterator, statesForProcessing) => {
+var parseEbml = async (iterator, statesForProcessing, logLevel) => {
   const hex = iterator.getMatroskaSegmentId();
   if (hex === null) {
     throw new Error("Not enough bytes left to parse EBML - this should not happen");
   }
-  const hasInMap = ebmlMap[hex];
-  if (!hasInMap) {
-    throw new Error(`Don't know how to parse EBML hex ID ${JSON.stringify(hex)}`);
-  }
   const off = iterator.counter.getOffset();
   const size = iterator.getVint();
   const minVintWidth = iterator.counter.getOffset() - off;
   if (size === null) {
     throw new Error("Not enough bytes left to parse EBML - this should not happen");
   }
+  const hasInMap = ebmlMap[hex];
+  if (!hasInMap) {
+    Log.verbose(logLevel, `Unknown EBML hex ID ${JSON.stringify(hex)}`);
+    iterator.discard(size);
+    return null;
+  }
   if (hasInMap.type === "uint") {
     const beforeUintOffset = iterator.counter.getOffset();
     const value = size === 0 ? 0 : iterator.getUint(size);
@@ -15138,13 +15207,15 @@ var parseEbml = async (iterator, statesForProcessing) => {
         break;
       }
       const offset = iterator.counter.getOffset();
-      const value = await parseEbml(iterator, statesForProcessing);
-      const remapped = statesForProcessing ? await postprocessEbml({
-        offset,
-        ebml: value,
-        statesForProcessing
-      }) : value;
-      children.push(remapped);
+      const value = await parseEbml(iterator, statesForProcessing, logLevel);
+      if (value) {
+        const remapped = statesForProcessing ? await postprocessEbml({
+          offset,
+          ebml: value,
+          statesForProcessing
+        }) : value;
+        children.push(remapped);
+      }
       const offsetNow = iterator.counter.getOffset();
       if (offsetNow - startOffset > size) {
         throw new Error(`Offset ${offsetNow - startOffset} is larger than the length of the hex ${size}`);
@@ -15360,7 +15431,8 @@ var expectSegment = async ({
     length: size,
     headerReadSoFar: iterator.counter.getOffset() - offset,
     statesForProcessing,
-    iterator
+    iterator,
+    logLevel
   });
   return segment;
 };
@@ -15369,14 +15441,18 @@ var parseSegment = async ({
   length,
   iterator,
   headerReadSoFar,
-  statesForProcessing
+  statesForProcessing,
+  logLevel
 }) => {
   if (length < 0) {
     throw new Error(`Expected length of ${segmentId} to be greater or equal 0`);
   }
   iterator.counter.decrement(headerReadSoFar);
   const offset = iterator.counter.getOffset();
-  const ebml = await parseEbml(iterator, statesForProcessing);
+  const ebml = await parseEbml(iterator, statesForProcessing, logLevel);
+  if (ebml === null) {
+    return null;
+  }
   if (!statesForProcessing) {
     return ebml;
   }

package/dist/index.d.ts

@@ -1260,7 +1260,7 @@ export declare const MediaParserInternals: {
         size: number;
         offset: number;
     }) => import("./containers/iso-base-media/ftyp").FtypBox;
-    parseEbml: (iterator: import("./iterator/buffer-iterator").BufferIterator, statesForProcessing: import("./containers/webm/state-for-processing").WebmRequiredStatesForProcessing | null) => Promise<import("./containers/webm/parse-ebml").Prettify<PossibleEbml>>;
+    parseEbml: (iterator: import("./iterator/buffer-iterator").BufferIterator, statesForProcessing: import("./containers/webm/state-for-processing").WebmRequiredStatesForProcessing | null, logLevel: MediaParserLogLevel) => Promise<import("./containers/webm/parse-ebml").Prettify<PossibleEbml> | null>;
     parseMvhd: ({ iterator, offset, size, }: {
         iterator: import("./iterator/buffer-iterator").BufferIterator;
         offset: number;

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "4.0.314";
+export declare const VERSION = "4.0.316";

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.314';
+exports.VERSION = '4.0.316';

package/package.json

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

package/dist/containers/iso-base-media/mvhd.d.ts

@@ -1,30 +0,0 @@
-import type { BufferIterator } from '../../iterator/buffer-iterator';
-import type { BaseBox } from './base-type';
-export type ThreeDMatrix = [
-    number,
-    number,
-    number,
-    number,
-    number,
-    number,
-    number,
-    number,
-    number
-];
-export interface MvhdBox extends BaseBox {
-    durationInUnits: number;
-    durationInSeconds: number;
-    creationTime: number | null;
-    modificationTime: number | null;
-    timeScale: number;
-    rate: number;
-    volume: number;
-    matrix: ThreeDMatrix;
-    nextTrackId: number;
-    type: 'mvhd-box';
-}
-export declare const parseMvhd: ({ iterator, offset, size, }: {
-    iterator: BufferIterator;
-    offset: number;
-    size: number;
-}) => MvhdBox;

package/dist/containers/iso-base-media/mvhd.js

@@ -1,65 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseMvhd = void 0;
-const buffer_iterator_1 = require("../../iterator/buffer-iterator");
-const to_date_1 = require("./to-date");
-const parseMvhd = ({ iterator, offset, size, }) => {
-    const version = iterator.getUint8();
-    // Flags, we discard them
-    iterator.discard(3);
-    const creationTime = version === 1 ? iterator.getUint64() : iterator.getUint32();
-    const modificationTime = version === 1 ? iterator.getUint64() : iterator.getUint32();
-    const timeScale = iterator.getUint32();
-    const durationInUnits = version === 1 ? iterator.getUint64() : iterator.getUint32();
-    const durationInSeconds = Number(durationInUnits) / timeScale;
-    const rateArray = iterator.getSlice(4);
-    const rateView = (0, buffer_iterator_1.getArrayBufferIterator)(rateArray, rateArray.length);
-    const rate = rateView.getInt8() * 10 +
-        rateView.getInt8() +
-        rateView.getInt8() * 0.1 +
-        rateView.getInt8() * 0.01;
-    const volumeArray = iterator.getSlice(2);
-    const volumeView = (0, buffer_iterator_1.getArrayBufferIterator)(volumeArray, volumeArray.length);
-    const volume = volumeView.getInt8() + volumeView.getInt8() * 0.1;
-    // reserved 16bit
-    iterator.discard(2);
-    // reserved 32bit x2
-    iterator.discard(4);
-    iterator.discard(4);
-    // matrix
-    const matrix = [
-        iterator.getFixedPointSigned1616Number(),
-        iterator.getFixedPointSigned1616Number(),
-        iterator.getFixedPointSigned230Number(),
-        iterator.getFixedPointSigned1616Number(),
-        iterator.getFixedPointSigned1616Number(),
-        iterator.getFixedPointSigned230Number(),
-        iterator.getFixedPointSigned1616Number(),
-        iterator.getFixedPointSigned1616Number(),
-        iterator.getFixedPointSigned230Number(),
-    ];
-    // pre-defined
-    iterator.discard(4 * 6);
-    // next track id
-    const nextTrackId = iterator.getUint32();
-    volumeView.destroy();
-    const bytesRemaining = size - (iterator.counter.getOffset() - offset);
-    if (bytesRemaining !== 0) {
-        throw new Error('expected 0 bytes ' + bytesRemaining);
-    }
-    return {
-        creationTime: (0, to_date_1.toUnixTimestamp)(Number(creationTime)),
-        modificationTime: (0, to_date_1.toUnixTimestamp)(Number(modificationTime)),
-        timeScale,
-        durationInUnits: Number(durationInUnits),
-        durationInSeconds,
-        rate,
-        volume,
-        matrix: matrix,
-        nextTrackId,
-        type: 'mvhd-box',
-        boxSize: size,
-        offset,
-    };
-};
-exports.parseMvhd = parseMvhd;

package/dist/index.cjs

@@ -1,54 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.WEBCODECS_TIMESCALE = exports.VERSION = exports.mediaParserController = exports.defaultSelectM3uStreamFn = exports.defaultSelectM3uAssociatedPlaylists = exports.MediaParserInternals = exports.downloadAndParseMedia = exports.MediaParserAbortError = exports.IsAPdfError = exports.IsAnUnsupportedFileTypeError = exports.IsAnImageError = exports.hasBeenAborted = exports.parseMedia = void 0;
-const aac_codecprivate_1 = require("./aac-codecprivate");
-const ftyp_1 = require("./containers/iso-base-media/ftyp");
-const mvhd_1 = require("./containers/iso-base-media/mvhd");
-const samples_1 = require("./containers/iso-base-media/stsd/samples");
-const stsd_1 = require("./containers/iso-base-media/stsd/stsd");
-const tkhd_1 = require("./containers/iso-base-media/tkhd");
-const parse_ebml_1 = require("./containers/webm/parse-ebml");
-const all_segments_1 = require("./containers/webm/segments/all-segments");
-const internal_parse_media_1 = require("./internal-parse-media");
-const buffer_iterator_1 = require("./iterator/buffer-iterator");
-const log_1 = require("./log");
-const need_samples_for_fields_1 = require("./state/need-samples-for-fields");
-const parser_state_1 = require("./state/parser-state");
-var parse_media_1 = require("./parse-media");
-Object.defineProperty(exports, "parseMedia", { enumerable: true, get: function () { return parse_media_1.parseMedia; } });
-var errors_1 = require("./errors");
-Object.defineProperty(exports, "hasBeenAborted", { enumerable: true, get: function () { return errors_1.hasBeenAborted; } });
-Object.defineProperty(exports, "IsAnImageError", { enumerable: true, get: function () { return errors_1.IsAnImageError; } });
-Object.defineProperty(exports, "IsAnUnsupportedFileTypeError", { enumerable: true, get: function () { return errors_1.IsAnUnsupportedFileTypeError; } });
-Object.defineProperty(exports, "IsAPdfError", { enumerable: true, get: function () { return errors_1.IsAPdfError; } });
-Object.defineProperty(exports, "MediaParserAbortError", { enumerable: true, get: function () { return errors_1.MediaParserAbortError; } });
-var download_and_parse_media_1 = require("./download-and-parse-media");
-Object.defineProperty(exports, "downloadAndParseMedia", { enumerable: true, get: function () { return download_and_parse_media_1.downloadAndParseMedia; } });
-/**
- * @deprecated Dont use these yet.
- */
-exports.MediaParserInternals = {
-    Log: log_1.Log,
-    createAacCodecPrivate: aac_codecprivate_1.createAacCodecPrivate,
-    matroskaElements: all_segments_1.matroskaElements,
-    ebmlMap: all_segments_1.ebmlMap,
-    parseTkhd: tkhd_1.parseTkhd,
-    getArrayBufferIterator: buffer_iterator_1.getArrayBufferIterator,
-    parseStsd: stsd_1.parseStsd,
-    makeParserState: parser_state_1.makeParserState,
-    processSample: samples_1.processIsoFormatBox,
-    parseFtyp: ftyp_1.parseFtyp,
-    parseEbml: parse_ebml_1.parseEbml,
-    parseMvhd: mvhd_1.parseMvhd,
-    internalParseMedia: internal_parse_media_1.internalParseMedia,
-    fieldsNeedSamplesMap: need_samples_for_fields_1.fieldsNeedSamplesMap,
-};
-var select_stream_1 = require("./containers/m3u/select-stream");
-Object.defineProperty(exports, "defaultSelectM3uAssociatedPlaylists", { enumerable: true, get: function () { return select_stream_1.defaultSelectM3uAssociatedPlaylists; } });
-Object.defineProperty(exports, "defaultSelectM3uStreamFn", { enumerable: true, get: function () { return select_stream_1.defaultSelectM3uStreamFn; } });
-var media_parser_controller_1 = require("./controller/media-parser-controller");
-Object.defineProperty(exports, "mediaParserController", { enumerable: true, get: function () { return media_parser_controller_1.mediaParserController; } });
-var version_1 = require("./version");
-Object.defineProperty(exports, "VERSION", { enumerable: true, get: function () { return version_1.VERSION; } });
-var webcodecs_timescale_1 = require("./webcodecs-timescale");
-Object.defineProperty(exports, "WEBCODECS_TIMESCALE", { enumerable: true, get: function () { return webcodecs_timescale_1.WEBCODECS_TIMESCALE; } });