mediabunny 1.45.4 → 1.45.5

package/dist/bundles/mediabunny.cjs

@@ -6353,18 +6353,21 @@ var Mediabunny = (() => {
             }
             assert(track.info?.type === "video");
             const colourType = readAscii(slice, 4);
-            if (colourType !== "nclx") {
+            if (colourType !== "nclx" && colourType !== "nclc") {
               break;
             }
             const colourPrimaries = readU16Be(slice);
             const transferCharacteristics = readU16Be(slice);
             const matrixCoefficients = readU16Be(slice);
-            const fullRangeFlag = Boolean(readU8(slice) & 128);
+            let fullRange = void 0;
+            if (colourType === "nclx") {
+              fullRange = Boolean(readU8(slice) & 128);
+            }
             track.info.colorSpace = {
               primaries: COLOR_PRIMARIES_MAP_INVERSE[colourPrimaries],
               transfer: TRANSFER_CHARACTERISTICS_MAP_INVERSE[transferCharacteristics],
               matrix: MATRIX_COEFFICIENTS_MAP_INVERSE[matrixCoefficients],
-              fullRange: fullRangeFlag
+              fullRange
             };
           }
           ;
@@ -15956,8 +15959,8 @@ var Mediabunny = (() => {
     /**
      * Creates a new {@link UrlSource} backed by the resource at the specified URL.
      *
-     * When passing a `Request` instance, note that the `signal` and `headers.Range` options will be overridden by
-     * Mediabunny. If you want to cancel ongoing requests, use {@link Input.dispose}.
+     * When passing a `Request` instance, note that its `signal` will be overridden by Mediabunny; if you want to cancel
+     * ongoing requests, use {@link Input.dispose}.
      */
     constructor(url2, options = {}) {
       if (typeof url2 !== "string" && !(url2 instanceof URL) && !(typeof Request !== "undefined" && url2 instanceof Request)) {
@@ -15983,6 +15986,10 @@ var Mediabunny = (() => {
       }
       const urlString = url2 instanceof Request ? url2.url : url2 instanceof URL ? url2.href : url2;
       super(urlString, (request) => new _UrlSource(request.path, this._options));
+      /** @internal */
+      this._offset = 0;
+      /** @internal */
+      this._length = null;
       /**
        * Note that this value being true does NOT mean the file size can't change anymore; it just signals that we have at
        * least checked if we know the file size or not.
@@ -15992,6 +15999,33 @@ var Mediabunny = (() => {
       this._url = url2;
       this._options = options;
       this._getRetryDelay = options.getRetryDelay ?? DEFAULT_RETRY_DELAY;
+      this._requestInit = { ...options.requestInit };
+      let rangeHeaderValue = null;
+      if (options.requestInit?.headers) {
+        const headers = { ...normalizeHeaders(options.requestInit.headers) };
+        const rangeKey = Object.keys(headers).find((key) => key.toLowerCase() === "range");
+        if (rangeKey !== void 0) {
+          rangeHeaderValue = headers[rangeKey];
+          delete headers[rangeKey];
+          this._requestInit.headers = headers;
+        }
+      }
+      if (url2 instanceof Request) {
+        const requestRange = url2.headers.get("Range");
+        if (requestRange !== null) {
+          rangeHeaderValue ??= requestRange;
+          const strippedRequest = new Request(url2);
+          strippedRequest.headers.delete("Range");
+          this._url = strippedRequest;
+        }
+      }
+      if (rangeHeaderValue !== null) {
+        const parsed = parseByteRangeHeader(rangeHeaderValue);
+        if (parsed) {
+          this._offset = parsed.offset;
+          this._length = parsed.length;
+        }
+      }
       const DEFAULT_PARALLELISM = 2;
       this._orchestrator = new ReadOrchestrator({
         maxCacheSize: options.maxCacheSize ?? 64 * 2 ** 20,
@@ -16002,11 +16036,39 @@ var Mediabunny = (() => {
     }
     /** @internal */
     _getFileSize() {
-      return this._fileSizeDetermined ? this._orchestrator.fileSize : void 0;
+      if (!this._fileSizeDetermined) {
+        return this._length !== null ? this._length : void 0;
+      }
+      const baseSize = this._orchestrator.fileSize;
+      if (baseSize === null) {
+        return this._length !== null ? this._length : null;
+      }
+      return clamp(baseSize - this._offset, 0, this._length ?? Infinity);
     }
     /** @internal */
     _read(start, end, minReadPosition, maxReadPosition) {
-      return this._orchestrator.read(start, end, minReadPosition, maxReadPosition);
+      if (this._length !== null && end > this._length) {
+        return null;
+      }
+      const offset = this._offset;
+      const result = this._orchestrator.read(
+        offset + start,
+        offset + end,
+        Math.max(offset + minReadPosition, offset),
+        offset + Math.min(maxReadPosition, this._length ?? Infinity)
+      );
+      const processResult = (result2) => {
+        if (!result2) {
+          return null;
+        }
+        result2.offset -= this._offset;
+        return result2;
+      };
+      if (result instanceof Promise) {
+        return result.then(processResult);
+      } else {
+        return processResult(result);
+      }
     }
     /** @internal */
     async _runWorker(worker) {
@@ -16015,7 +16077,7 @@ var Mediabunny = (() => {
         const response = await retriedFetch(
           this._options.fetchFn ?? fetch,
           this._url,
-          mergeRequestInit(this._options.requestInit ?? {}, {
+          mergeRequestInit(this._requestInit, {
             headers: {
               // Always sending a range request is a good way to probe if the server supports them
               Range: `bytes=${worker.currentPos}-`
@@ -16124,6 +16186,22 @@ var Mediabunny = (() => {
       this._orchestrator.dispose();
     }
   };
+  var BYTE_RANGE_REGEX = /^bytes=(\d+)-(\d*)$/;
+  var parseByteRangeHeader = (value) => {
+    const match = BYTE_RANGE_REGEX.exec(value.trim());
+    if (!match) {
+      return null;
+    }
+    const offset = Number(match[1]);
+    const end = match[2] === "" ? null : Number(match[2]);
+    if (end !== null && end < offset) {
+      return null;
+    }
+    return {
+      offset,
+      length: end !== null ? end - offset + 1 : null
+    };
+  };
   var FilePathSource = class _FilePathSource extends PathedSource {
     /** Creates a new {@link FilePathSource} backed by the file at the specified file path. */
     constructor(filePath, options = {}) {
@@ -17037,20 +17115,17 @@ var Mediabunny = (() => {
         this._offset + minReadPosition,
         this._offset + maxReadPosition
       );
-      if (result instanceof Promise) {
-        return result.then((result2) => {
-          if (!result2) {
-            return null;
-          }
-          result2.offset -= this._offset;
-          return result2;
-        });
-      } else {
-        if (!result) {
+      const processResult = (result2) => {
+        if (!result2) {
           return null;
         }
-        result.offset -= this._offset;
-        return result;
+        result2.offset -= this._offset;
+        return result2;
+      };
+      if (result instanceof Promise) {
+        return result.then(processResult);
+      } else {
+        return processResult(result);
       }
     }
     /** @internal */
@@ -22130,6 +22205,9 @@ var Mediabunny = (() => {
             const filteredNalUnits = [];
             for (const loc of iterateAvcNalUnits(packet.data, this.decoderConfig)) {
               const type = extractNalUnitTypeForAvc(packet.data[loc.offset]);
+              if (type === 9 /* AUD */) {
+                filteredNalUnits.length = 0;
+              }
               if (!(type >= 20 && type <= 31)) {
                 filteredNalUnits.push(packet.data.subarray(loc.offset, loc.offset + loc.length));
               }
@@ -23816,7 +23894,7 @@ var Mediabunny = (() => {
     /** If this method returns true, the track's samples use a high dynamic range (HDR). */
     async hasHighDynamicRange() {
       const colorSpace = await this._backing.getColorSpace();
-      return colorSpace.primaries === "bt2020" || colorSpace.primaries === "smpte432" || colorSpace.transfer === "pg" || colorSpace.transfer === "hlg" || colorSpace.matrix === "bt2020-ncl";
+      return colorSpace.primaries === "bt2020" || colorSpace.primaries === "smpte432" || colorSpace.transfer === "pq" || colorSpace.transfer === "hlg" || colorSpace.matrix === "bt2020-ncl";
     }
     /** Checks if this track may contain transparent samples with alpha data. */
     async canBeTransparent() {
@@ -24550,13 +24628,13 @@ var Mediabunny = (() => {
           if (chunks.length === 1 && this.fileSizeNonStrict !== null) {
             return this.requestSlice(0, this.fileSizeNonStrict);
           }
-          const startOffset = chunks.length * CHUNK_SIZE;
-          let slice = this.requestSliceRange(startOffset, 0, CHUNK_SIZE);
+          let slice = this.requestSliceRange(currentSize, 0, CHUNK_SIZE);
           if (slice instanceof Promise) slice = await slice;
-          if (!slice) {
+          if (!slice || slice.length === 0) {
             break;
           }
-          chunks.push(readBytes(slice, slice.length));
+          const chunk = readBytes(slice, slice.length);
+          chunks.push(chunk);
           currentSize += slice.length;
         }
         const joined = new Uint8Array(currentSize);
@@ -26413,12 +26491,14 @@ var Mediabunny = (() => {
   };
   var mdat = (reserveLargeSize) => ({ type: "mdat", largeSize: reserveLargeSize });
   var free = (size) => ({ type: "free", size });
-  var moov = (muxer) => box("moov", void 0, [
-    mvhd(muxer.creationTime, muxer.trackDatas),
-    ...muxer.trackDatas.map((x) => trak(x, muxer.creationTime)),
-    muxer.isFragmented ? mvex(muxer.trackDatas) : null,
-    udta(muxer)
-  ]);
+  var moov = (muxer) => {
+    return box("moov", void 0, [
+      mvhd(muxer.creationTime, muxer.trackDatas),
+      ...muxer.trackDatas.map((x) => trak(x, muxer.creationTime)),
+      muxer.isFragmented ? mvex(muxer.trackDatas) : null,
+      udta(muxer)
+    ]);
+  };
   var mvhd = (creationTime, trackDatas) => {
     const duration = Math.max(
       0,
@@ -26729,7 +26809,7 @@ var Mediabunny = (() => {
     ]);
   };
   var colr = (trackData) => box("colr", [
-    ascii("nclx"),
+    ascii(trackData.muxer.isQuickTime ? "nclc" : "nclx"),
     // Colour type
     u16(COLOR_PRIMARIES_MAP[trackData.info.decoderConfig.colorSpace.primaries]),
     // Colour primaries
@@ -26737,7 +26817,7 @@ var Mediabunny = (() => {
     // Transfer characteristics
     u16(MATRIX_COEFFICIENTS_MAP[trackData.info.decoderConfig.colorSpace.matrix]),
     // Matrix coefficients
-    u8((trackData.info.decoderConfig.colorSpace.fullRange ? 1 : 0) << 7)
+    trackData.muxer.isQuickTime ? [] : u8((trackData.info.decoderConfig.colorSpace.fullRange ? 1 : 0) << 7)
     // Full range flag
   ]);
   var avcC = (trackData) => trackData.info.decoderConfig && box("avcC", [
@@ -29237,6 +29317,7 @@ var Mediabunny = (() => {
         if (this.format._options.onMoov) {
           boxWriter.writer.startTrackingWrites();
         }
+        this.ensureOneEnabledTrack();
         const movieBox = moov(this);
         boxWriter.writeBox(movieBox);
         if (this.format._options.onMoov) {
@@ -29319,6 +29400,7 @@ var Mediabunny = (() => {
       assert(this.boxWriter);
       if (this.allTracksAreKnown()) {
         if (!this.mdat) {
+          this.ensureOneEnabledTrack();
           const moovBox = moov(this);
           const moovSize = this.boxWriter.measureBox(moovBox);
           const reservedSize = moovSize + this.computeSampleTableSizeUpperBound() + 4096;
@@ -29375,10 +29457,27 @@ var Mediabunny = (() => {
       }
       release();
     }
+    ensureOneEnabledTrack() {
+      for (const type of ["video", "audio", "subtitle"]) {
+        const tracks = this.trackDatas.filter((t) => t.type === type);
+        if (tracks.length === 0) {
+          continue;
+        }
+        const hasEnabled = tracks.some((t) => t.track.metadata.disposition?.default !== false);
+        if (!hasEnabled) {
+          const firstTrack = tracks[0];
+          firstTrack.track.metadata.disposition = {
+            ...firstTrack.track.metadata.disposition,
+            default: true
+          };
+        }
+      }
+    }
     /** Finalizes the file, making it ready for use. Must be called after all video and audio chunks have been added. */
     async finalize() {
       const release = await this.mutex.acquire();
       this.allTracksKnown.resolve();
+      this.ensureOneEnabledTrack();
       for (const trackData of this.trackDatas) {
         trackData.closed = true;
         if (trackData.type === "subtitle" && trackData.track.source._codec === "webvtt") {