@remotion/media-parser 4.0.266 → 4.0.267

package/dist/esm/index.mjs

@@ -1,264 +1,3 @@
-// src/errors.ts
-class IsAGifError extends Error {
-  mimeType;
-  sizeInBytes;
-  fileName;
-  constructor({
-    message,
-    mimeType,
-    sizeInBytes,
-    fileName
-  }) {
-    super(message);
-    this.fileName = "IsAGifError";
-    this.mimeType = mimeType;
-    this.sizeInBytes = sizeInBytes;
-    this.fileName = fileName;
-    if (Error.captureStackTrace) {
-      Error.captureStackTrace(this, IsAGifError);
-    }
-  }
-}
-
-class IsAnImageError extends Error {
-  imageType;
-  dimensions;
-  mimeType;
-  sizeInBytes;
-  fileName;
-  constructor({
-    dimensions,
-    imageType,
-    message,
-    mimeType,
-    sizeInBytes,
-    fileName
-  }) {
-    super(message);
-    this.name = "IsAnImageError";
-    this.imageType = imageType;
-    this.dimensions = dimensions;
-    this.mimeType = mimeType;
-    this.sizeInBytes = sizeInBytes;
-    this.fileName = fileName;
-    if (Error.captureStackTrace) {
-      Error.captureStackTrace(this, IsAnImageError);
-    }
-  }
-}
-
-class IsAPdfError extends Error {
-  mimeType;
-  sizeInBytes;
-  fileName;
-  constructor({
-    message,
-    mimeType,
-    sizeInBytes,
-    fileName
-  }) {
-    super(message);
-    this.name = "IsAPdfError";
-    this.mimeType = mimeType;
-    this.sizeInBytes = sizeInBytes;
-    this.fileName = fileName;
-    if (Error.captureStackTrace) {
-      Error.captureStackTrace(this, IsAPdfError);
-    }
-  }
-}
-
-class IsAnUnsupportedFileTypeError extends Error {
-  mimeType;
-  sizeInBytes;
-  fileName;
-  constructor({
-    message,
-    mimeType,
-    sizeInBytes,
-    fileName
-  }) {
-    super(message);
-    this.name = "IsAnUnsupportedFileTypeError";
-    this.mimeType = mimeType;
-    this.sizeInBytes = sizeInBytes;
-    this.fileName = fileName;
-    if (Error.captureStackTrace) {
-      Error.captureStackTrace(this, IsAnUnsupportedFileTypeError);
-    }
-  }
-}
-
-class IsAnUnsupportedAudioTypeError extends Error {
-  mimeType;
-  sizeInBytes;
-  fileName;
-  audioType;
-  constructor({
-    message,
-    mimeType,
-    sizeInBytes,
-    fileName,
-    audioType
-  }) {
-    super(message);
-    this.name = "IsAnUnsupportedAudioTypeError";
-    this.mimeType = mimeType;
-    this.sizeInBytes = sizeInBytes;
-    this.fileName = fileName;
-    this.audioType = audioType;
-    if (Error.captureStackTrace) {
-      Error.captureStackTrace(this, IsAnUnsupportedAudioTypeError);
-    }
-  }
-}
-
-class MediaParserAbortError extends Error {
-  constructor(message) {
-    super(message);
-    this.name = "MediaParserAbortError";
-    this.cause = undefined;
-  }
-}
-var hasBeenAborted = (error) => {
-  return error instanceof MediaParserAbortError;
-};
-
-// src/readers/fetch/get-body-and-reader.ts
-var getLengthAndReader = async (endsWithM3u8, res, ownController) => {
-  if (endsWithM3u8) {
-    const text = await res.text();
-    const stream = new ReadableStream({
-      start(controller) {
-        controller.enqueue(new TextEncoder().encode(text));
-        controller.close();
-      }
-    });
-    return {
-      contentLength: text.length,
-      reader: {
-        reader: stream.getReader(),
-        abort() {
-          ownController.abort();
-        }
-      },
-      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");
-  }
-  const reader = res.body.getReader();
-  return {
-    reader: {
-      reader,
-      abort: () => {
-        ownController.abort();
-      }
-    },
-    contentLength,
-    needsContentRange: true
-  };
-};
-
-// src/readers/fetch/resolve-url.ts
-var resolveUrl = (src) => {
-  try {
-    const resolvedUrl = typeof window !== "undefined" && typeof window.location !== "undefined" ? new URL(src, window.location.origin) : new URL(src);
-    return resolvedUrl;
-  } catch {
-    return src;
-  }
-};
-
-// src/readers/from-fetch.ts
-function parseContentRange(input) {
-  const matches = input.match(/^(\w+) ((\d+)-(\d+)|\*)\/(\d+|\*)$/);
-  if (!matches)
-    return null;
-  const [, unit, , start, end, size] = matches;
-  const range = {
-    unit,
-    start: start != null ? Number(start) : null,
-    end: end != null ? Number(end) : null,
-    size: size === "*" ? null : Number(size)
-  };
-  if (range.start === null && range.end === null && range.size === null) {
-    return null;
-  }
-  return range;
-}
-var validateContentRangeAndDetectIfSupported = (actualRange, parsedContentRange, statusCode) => {
-  if (statusCode === 206) {
-    return { supportsContentRange: true };
-  }
-  if (typeof actualRange === "number" && parsedContentRange?.start !== actualRange) {
-    if (actualRange === 0) {
-      return { supportsContentRange: false };
-    }
-    throw new Error(`Range header (${actualRange}) does not match content-range header (${parsedContentRange?.start})`);
-  }
-  if (actualRange !== null && typeof actualRange !== "number" && (parsedContentRange?.start !== actualRange[0] || parsedContentRange?.end !== actualRange[1])) {
-    throw new Error(`Range header (${actualRange}) does not match content-range header (${parsedContentRange?.start})`);
-  }
-  return { supportsContentRange: true };
-};
-var fetchReader = {
-  read: async ({ src, range, controller }) => {
-    if (typeof src !== "string") {
-      throw new Error("src must be a string when using `fetchReader`");
-    }
-    const resolvedUrl = resolveUrl(src);
-    const resolvedUrlString = resolvedUrl.toString();
-    if (!resolvedUrlString.startsWith("https://") && !resolvedUrlString.startsWith("blob:") && !resolvedUrlString.startsWith("http://")) {
-      return Promise.reject(new Error(`${resolvedUrlString} is not a URL - needs to start with http:// or https:// or blob:. If you want to read a local file, pass \`reader: nodeReader\` to parseMedia().`));
-    }
-    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" ? {
-      Range: `bytes=${actualRange}-`
-    } : {
-      Range: `bytes=${`${actualRange[0]}-${actualRange[1]}`}`
-    };
-    const res = await fetch(resolvedUrl, {
-      headers,
-      signal: ownController.signal,
-      cache
-    });
-    const contentRange = res.headers.get("content-range");
-    const parsedContentRange = contentRange ? parseContentRange(contentRange) : null;
-    const { supportsContentRange } = validateContentRangeAndDetectIfSupported(actualRange, parsedContentRange, res.status);
-    controller._internals.signal.addEventListener("abort", () => {
-      ownController.abort(new MediaParserAbortError("Aborted by user"));
-    }, { once: true });
-    if (res.status.toString().startsWith("4") || res.status.toString().startsWith("5")) {
-      throw new Error(`Server returned status code ${res.status} for ${src} and range ${actualRange}`);
-    }
-    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);
-    if (controller) {
-      controller._internals.signal.addEventListener("abort", () => {
-        reader.reader.cancel().catch(() => {
-        });
-      }, { once: true });
-    }
-    return {
-      reader,
-      contentLength,
-      contentType: res.headers.get("content-type"),
-      name: name ?? fallbackName,
-      supportsContentRange,
-      needsContentRange
-    };
-  }
-};
-
 // src/aac-codecprivate.ts
 var getSampleRateFromSampleFrequencyIndex = (samplingFrequencyIndex) => {
   switch (samplingFrequencyIndex) {
@@ -2766,8 +2505,8 @@ var getHvc1CodecString = (data) => {
   const generalProfileSpaceTierFlagAndIdc = data.getUint8();
   let generalProfileCompatibility = data.getUint32();
   const generalProfileSpace = generalProfileSpaceTierFlagAndIdc >> 6;
-  const generalTierFlag = generalProfileSpaceTierFlagAndIdc >> 5;
-  const generalProfileIdc = generalProfileSpaceTierFlagAndIdc >> 0;
+  const generalTierFlag = (generalProfileSpaceTierFlagAndIdc & 32) >> 5;
+  const generalProfileIdc = generalProfileSpaceTierFlagAndIdc & 31;
   const generalConstraintIndicator = data.getSlice(6);
   const generalLevelIdc = data.getUint8();
   let profileId = 0;
@@ -2788,7 +2527,7 @@ var getHvc1CodecString = (data) => {
       hasByte = true;
     }
   }
-  return `${profileSpaceChar}${generalProfileIdc.toString(16)}.${profileId.toString(16)}.${generalTierChar}${generalLevelIdc}.${generalConstraintString}`;
+  return `${profileSpaceChar}${generalProfileIdc.toString(16)}.${profileId.toString(16)}.${generalTierChar}${generalLevelIdc}${generalConstraintString ? "." : ""}${generalConstraintString}`;
 };
 
 // src/containers/webm/av1-codec-private.ts
@@ -5808,12 +5547,30 @@ var getM3uStreams = (structure, originalSrc) => {
       if (next.type !== "m3u-text-value") {
         throw new Error("Expected m3u-text-value");
       }
-      boxes.push({
-        url: originalSrc && originalSrc.startsWith("http") ? new URL(next.value, originalSrc).href : next.value,
+      const dedicatedAudioTracks = [];
+      if (str.audio) {
+        const match = structure.boxes.filter((box) => {
+          return box.type === "m3u-media-info" && box.groupId === str.audio;
+        });
+        for (const audioTrack of match) {
+          dedicatedAudioTracks.push({
+            autoselect: audioTrack.autoselect,
+            channels: audioTrack.channels,
+            default: audioTrack.default,
+            groupId: audioTrack.groupId,
+            language: audioTrack.language,
+            name: audioTrack.name,
+            url: originalSrc && originalSrc.startsWith("http") ? new URL(audioTrack.uri, originalSrc).href : audioTrack.uri
+          });
+        }
+      }
+      boxes.push({
+        url: originalSrc && originalSrc.startsWith("http") ? new URL(next.value, originalSrc).href : next.value,
         averageBandwidth: str.averageBandwidth,
         bandwidth: str.bandwidth,
         codecs: str.codecs,
-        resolution: str.resolution
+        resolution: str.resolution,
+        dedicatedAudioTracks
       });
     }
   }
@@ -7344,6 +7101,132 @@ class MediaParserEmitter {
   };
 }
 
+// src/errors.ts
+class IsAGifError extends Error {
+  mimeType;
+  sizeInBytes;
+  fileName;
+  constructor({
+    message,
+    mimeType,
+    sizeInBytes,
+    fileName
+  }) {
+    super(message);
+    this.fileName = "IsAGifError";
+    this.mimeType = mimeType;
+    this.sizeInBytes = sizeInBytes;
+    this.fileName = fileName;
+    if (Error.captureStackTrace) {
+      Error.captureStackTrace(this, IsAGifError);
+    }
+  }
+}
+
+class IsAnImageError extends Error {
+  imageType;
+  dimensions;
+  mimeType;
+  sizeInBytes;
+  fileName;
+  constructor({
+    dimensions,
+    imageType,
+    message,
+    mimeType,
+    sizeInBytes,
+    fileName
+  }) {
+    super(message);
+    this.name = "IsAnImageError";
+    this.imageType = imageType;
+    this.dimensions = dimensions;
+    this.mimeType = mimeType;
+    this.sizeInBytes = sizeInBytes;
+    this.fileName = fileName;
+    if (Error.captureStackTrace) {
+      Error.captureStackTrace(this, IsAnImageError);
+    }
+  }
+}
+
+class IsAPdfError extends Error {
+  mimeType;
+  sizeInBytes;
+  fileName;
+  constructor({
+    message,
+    mimeType,
+    sizeInBytes,
+    fileName
+  }) {
+    super(message);
+    this.name = "IsAPdfError";
+    this.mimeType = mimeType;
+    this.sizeInBytes = sizeInBytes;
+    this.fileName = fileName;
+    if (Error.captureStackTrace) {
+      Error.captureStackTrace(this, IsAPdfError);
+    }
+  }
+}
+
+class IsAnUnsupportedFileTypeError extends Error {
+  mimeType;
+  sizeInBytes;
+  fileName;
+  constructor({
+    message,
+    mimeType,
+    sizeInBytes,
+    fileName
+  }) {
+    super(message);
+    this.name = "IsAnUnsupportedFileTypeError";
+    this.mimeType = mimeType;
+    this.sizeInBytes = sizeInBytes;
+    this.fileName = fileName;
+    if (Error.captureStackTrace) {
+      Error.captureStackTrace(this, IsAnUnsupportedFileTypeError);
+    }
+  }
+}
+
+class IsAnUnsupportedAudioTypeError extends Error {
+  mimeType;
+  sizeInBytes;
+  fileName;
+  audioType;
+  constructor({
+    message,
+    mimeType,
+    sizeInBytes,
+    fileName,
+    audioType
+  }) {
+    super(message);
+    this.name = "IsAnUnsupportedAudioTypeError";
+    this.mimeType = mimeType;
+    this.sizeInBytes = sizeInBytes;
+    this.fileName = fileName;
+    this.audioType = audioType;
+    if (Error.captureStackTrace) {
+      Error.captureStackTrace(this, IsAnUnsupportedAudioTypeError);
+    }
+  }
+}
+
+class MediaParserAbortError extends Error {
+  constructor(message) {
+    super(message);
+    this.name = "MediaParserAbortError";
+    this.cause = undefined;
+  }
+}
+var hasBeenAborted = (error) => {
+  return error instanceof MediaParserAbortError;
+};
+
 // src/pause-signal.ts
 var makePauseSignal = (emitter) => {
   const waiterFns = [];
@@ -8975,7 +8858,34 @@ var parseStreamInf = (str) => {
     resolution: map.RESOLUTION ? {
       width: parseInt(map.RESOLUTION.split("x")[0], 10),
       height: parseInt(map.RESOLUTION.split("x")[1], 10)
-    } : null
+    } : null,
+    audio: map.AUDIO || null
+  };
+};
+
+// src/containers/m3u/parse-m3u-media-directive.ts
+var parseM3uMediaDirective = (str) => {
+  const quotes = splitRespectingQuotes(str);
+  const map = {};
+  for (const quote of quotes) {
+    const firstColon = quote.indexOf("=");
+    const key = firstColon === -1 ? quote : quote.slice(0, firstColon);
+    const value = firstColon === -1 ? null : quote.slice(firstColon + 1);
+    if (value === null) {
+      throw new Error("Value is null");
+    }
+    const actualValue = value?.startsWith('"') && value?.endsWith('"') ? value.slice(1, -1) : value;
+    map[key] = actualValue;
+  }
+  return {
+    type: "m3u-media-info",
+    autoselect: map.AUTOSELECT === "YES",
+    channels: map.CHANNELS ? parseInt(map.CHANNELS, 10) : null,
+    default: map.DEFAULT === "YES",
+    groupId: map["GROUP-ID"],
+    language: map.LANGUAGE || null,
+    name: map.NAME || null,
+    uri: map.URI
   };
 };
 
@@ -8998,6 +8908,13 @@ var parseM3uDirective = (str) => {
       type: "m3u-independent-segments"
     };
   }
+  if (directive === "#EXT-X-MEDIA") {
+    if (!value) {
+      throw new Error("EXT-X-MEDIA directive must have a value");
+    }
+    const parsed = parseM3uMediaDirective(value);
+    return parsed;
+  }
   if (directive === "#EXT-X-TARGETDURATION") {
     if (!value) {
       throw new Error("EXT-X-TARGETDURATION directive must have a value");
@@ -9121,6 +9038,142 @@ var defaultSelectM3uStreamFn = ({ streams }) => {
   return Promise.resolve(streams[0].id);
 };
 
+// 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);
+    const stream = new ReadableStream({
+      start(controller) {
+        controller.enqueue(encoded);
+        controller.close();
+      }
+    });
+    return {
+      contentLength: encoded.byteLength,
+      reader: {
+        reader: stream.getReader(),
+        abort() {
+          ownController.abort();
+        }
+      },
+      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");
+  }
+  const reader = res.body.getReader();
+  return {
+    reader: {
+      reader,
+      abort: () => {
+        ownController.abort();
+      }
+    },
+    contentLength,
+    needsContentRange: true
+  };
+};
+
+// src/readers/fetch/resolve-url.ts
+var resolveUrl = (src) => {
+  try {
+    const resolvedUrl = typeof window !== "undefined" && typeof window.location !== "undefined" ? new URL(src, window.location.origin) : new URL(src);
+    return resolvedUrl;
+  } catch {
+    return src;
+  }
+};
+
+// src/readers/from-fetch.ts
+function parseContentRange(input) {
+  const matches = input.match(/^(\w+) ((\d+)-(\d+)|\*)\/(\d+|\*)$/);
+  if (!matches)
+    return null;
+  const [, unit, , start, end, size] = matches;
+  const range2 = {
+    unit,
+    start: start != null ? Number(start) : null,
+    end: end != null ? Number(end) : null,
+    size: size === "*" ? null : Number(size)
+  };
+  if (range2.start === null && range2.end === null && range2.size === null) {
+    return null;
+  }
+  return range2;
+}
+var validateContentRangeAndDetectIfSupported = (actualRange, parsedContentRange, statusCode) => {
+  if (statusCode === 206) {
+    return { supportsContentRange: true };
+  }
+  if (typeof actualRange === "number" && parsedContentRange?.start !== actualRange) {
+    if (actualRange === 0) {
+      return { supportsContentRange: false };
+    }
+    throw new Error(`Range header (${actualRange}) does not match content-range header (${parsedContentRange?.start})`);
+  }
+  if (actualRange !== null && typeof actualRange !== "number" && (parsedContentRange?.start !== actualRange[0] || parsedContentRange?.end !== actualRange[1])) {
+    throw new Error(`Range header (${actualRange}) does not match content-range header (${parsedContentRange?.start})`);
+  }
+  return { supportsContentRange: true };
+};
+var fetchReader = {
+  read: async ({ src, range: range2, controller }) => {
+    if (typeof src !== "string") {
+      throw new Error("src must be a string when using `fetchReader`");
+    }
+    const resolvedUrl = resolveUrl(src);
+    const resolvedUrlString = resolvedUrl.toString();
+    if (!resolvedUrlString.startsWith("https://") && !resolvedUrlString.startsWith("blob:") && !resolvedUrlString.startsWith("http://")) {
+      return Promise.reject(new Error(`${resolvedUrlString} is not a URL - needs to start with http:// or https:// or blob:. If you want to read a local file, pass \`reader: nodeReader\` to parseMedia().`));
+    }
+    const ownController = new AbortController;
+    const cache = typeof navigator !== "undefined" && navigator.userAgent.includes("Cloudflare-Workers") ? undefined : "no-store";
+    const actualRange = range2 === null ? 0 : range2;
+    const endsWithM3u8 = (typeof resolvedUrl === "string" ? resolvedUrl : resolvedUrl.pathname).endsWith(".m3u8");
+    const headers = actualRange === 0 && endsWithM3u8 ? {} : typeof actualRange === "number" ? {
+      Range: `bytes=${actualRange}-`
+    } : {
+      Range: `bytes=${`${actualRange[0]}-${actualRange[1]}`}`
+    };
+    const res = await fetch(resolvedUrl, {
+      headers,
+      signal: ownController.signal,
+      cache
+    });
+    const contentRange = res.headers.get("content-range");
+    const parsedContentRange = contentRange ? parseContentRange(contentRange) : null;
+    const { supportsContentRange } = validateContentRangeAndDetectIfSupported(actualRange, parsedContentRange, res.status);
+    controller._internals.signal.addEventListener("abort", () => {
+      ownController.abort(new MediaParserAbortError("Aborted by user"));
+    }, { once: true });
+    if (res.status.toString().startsWith("4") || res.status.toString().startsWith("5")) {
+      throw new Error(`Server returned status code ${res.status} for ${src} and range ${actualRange}`);
+    }
+    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);
+    if (controller) {
+      controller._internals.signal.addEventListener("abort", () => {
+        reader.reader.cancel().catch(() => {
+        });
+      }, { once: true });
+    }
+    return {
+      reader,
+      contentLength,
+      contentType: res.headers.get("content-type"),
+      name: name ?? fallbackName,
+      supportsContentRange,
+      needsContentRange
+    };
+  }
+};
+
 // src/parse-media.ts
 var parseMedia = (options) => {
   return internalParseMedia({
@@ -11969,7 +12022,7 @@ var downloadAndParseMedia = async (options) => {
   return returnValue;
 };
 // src/version.ts
-var VERSION = "4.0.266";
+var VERSION = "4.0.267";
 
 // src/index.ts
 var MediaParserInternals = {