mediabunny 1.10.0 → 1.11.0

package/dist/bundles/mediabunny.cjs

@@ -7759,6 +7759,37 @@ ${cue.notes ?? ""}`;
       );
       context.restore();
     }
+    /**
+     * Draws the sample in the middle of the canvas corresponding to the context with the specified fit behavior.
+     */
+    drawWithFit(context, options) {
+      const canvasWidth = context.canvas.width;
+      const canvasHeight = context.canvas.height;
+      const rotation = options.rotation ?? this.rotation;
+      let dx;
+      let dy;
+      let newWidth;
+      let newHeight;
+      if (options.fit === "fill") {
+        dx = 0;
+        dy = 0;
+        newWidth = canvasWidth;
+        newHeight = canvasHeight;
+      } else {
+        const [sampleWidth, sampleHeight] = rotation % 180 === 0 ? [this.codedWidth, this.codedHeight] : [this.codedHeight, this.codedWidth];
+        const scale = options.fit === "contain" ? Math.min(canvasWidth / sampleWidth, canvasHeight / sampleHeight) : Math.max(canvasWidth / sampleWidth, canvasHeight / sampleHeight);
+        newWidth = sampleWidth * scale;
+        newHeight = sampleHeight * scale;
+        dx = (canvasWidth - newWidth) / 2;
+        dy = (canvasHeight - newHeight) / 2;
+      }
+      const aspectRatioChange = rotation % 180 === 0 ? 1 : newWidth / newHeight;
+      context.translate(canvasWidth / 2, canvasHeight / 2);
+      context.rotate(rotation * Math.PI / 180);
+      context.scale(1 / aspectRatioChange, aspectRatioChange);
+      context.translate(-canvasWidth / 2, -canvasHeight / 2);
+      context.drawImage(this.toCanvasImageSource(), dx, dy, newWidth, newHeight);
+    }
     /**
      * Converts this video sample to a CanvasImageSource for drawing to a canvas.
      *
@@ -9009,6 +9040,7 @@ ${cue.notes ?? ""}`;
     /** @internal */
     _videoSampleToWrappedCanvas(sample) {
       let canvas = this._canvasPool[this._nextCanvasIndex];
+      let canvasIsNew = false;
       if (!canvas) {
         if (typeof document !== "undefined") {
           canvas = document.createElement("canvas");
@@ -9020,6 +9052,7 @@ ${cue.notes ?? ""}`;
         if (this._canvasPool.length > 0) {
           this._canvasPool[this._nextCanvasIndex] = canvas;
         }
+        canvasIsNew = true;
       }
       if (this._canvasPool.length > 0) {
         this._nextCanvasIndex = (this._nextCanvasIndex + 1) % this._canvasPool.length;
@@ -9027,29 +9060,13 @@ ${cue.notes ?? ""}`;
       const context = canvas.getContext("2d", { alpha: false });
       assert(context);
       context.resetTransform();
-      let dx;
-      let dy;
-      let newWidth;
-      let newHeight;
-      if (this._fit === "fill") {
-        dx = 0;
-        dy = 0;
-        newWidth = this._width;
-        newHeight = this._height;
-      } else {
-        const [sampleWidth, sampleHeight] = this._rotation % 180 === 0 ? [sample.codedWidth, sample.codedHeight] : [sample.codedHeight, sample.codedWidth];
-        const scale = this._fit === "contain" ? Math.min(this._width / sampleWidth, this._height / sampleHeight) : Math.max(this._width / sampleWidth, this._height / sampleHeight);
-        newWidth = sampleWidth * scale;
-        newHeight = sampleHeight * scale;
-        dx = (this._width - newWidth) / 2;
-        dy = (this._height - newHeight) / 2;
+      if (!canvasIsNew) {
+        context.clearRect(0, 0, this._width, this._height);
       }
-      const aspectRatioChange = this._rotation % 180 === 0 ? 1 : newWidth / newHeight;
-      context.translate(this._width / 2, this._height / 2);
-      context.rotate(this._rotation * Math.PI / 180);
-      context.scale(1 / aspectRatioChange, aspectRatioChange);
-      context.translate(-this._width / 2, -this._height / 2);
-      context.drawImage(sample.toCanvasImageSource(), dx, dy, newWidth, newHeight);
+      sample.drawWithFit(context, {
+        fit: this._fit,
+        rotation: this._rotation
+      });
       const result = {
         canvas,
         timestamp: sample.timestamp,
@@ -11079,8 +11096,9 @@ ${cue.notes ?? ""}`;
       this.encoder = null;
       this.muxer = null;
       this.lastMultipleOfKeyFrameInterval = -1;
-      this.lastWidth = null;
-      this.lastHeight = null;
+      this.codedWidth = null;
+      this.codedHeight = null;
+      this.resizeCanvas = null;
       this.customEncoder = null;
       this.customEncoderCallSerializer = new CallSerializer();
       this.customEncoderQueueSize = 0;
@@ -11095,15 +11113,46 @@ ${cue.notes ?? ""}`;
       try {
         this.checkForEncoderError();
         this.source._ensureValidAdd();
-        if (this.lastWidth !== null && this.lastHeight !== null) {
-          if (videoSample.codedWidth !== this.lastWidth || videoSample.codedHeight !== this.lastHeight) {
-            throw new Error(
-              `Video sample size must remain constant. Expected ${this.lastWidth}x${this.lastHeight}, got ${videoSample.codedWidth}x${videoSample.codedHeight}.`
-            );
+        if (this.codedWidth !== null && this.codedHeight !== null) {
+          if (videoSample.codedWidth !== this.codedWidth || videoSample.codedHeight !== this.codedHeight) {
+            const sizeChangeBehavior = this.encodingConfig.sizeChangeBehavior ?? "deny";
+            if (sizeChangeBehavior === "passThrough") {
+            } else if (sizeChangeBehavior === "deny") {
+              throw new Error(
+                `Video sample size must remain constant. Expected ${this.codedWidth}x${this.codedHeight}, got ${videoSample.codedWidth}x${videoSample.codedHeight}. To allow the sample size to change over time, set \`sizeChangeBehavior\` to a value other than 'strict' in the encoding options.`
+              );
+            } else {
+              let canvasIsNew = false;
+              if (!this.resizeCanvas) {
+                if (typeof document !== "undefined") {
+                  this.resizeCanvas = document.createElement("canvas");
+                  this.resizeCanvas.width = this.codedWidth;
+                  this.resizeCanvas.height = this.codedHeight;
+                } else {
+                  this.resizeCanvas = new OffscreenCanvas(this.codedWidth, this.codedHeight);
+                }
+                canvasIsNew = true;
+              }
+              const context = this.resizeCanvas.getContext("2d", { alpha: false });
+              assert(context);
+              if (!canvasIsNew) {
+                context.clearRect(0, 0, this.codedWidth, this.codedHeight);
+              }
+              videoSample.drawWithFit(context, { fit: sizeChangeBehavior });
+              if (shouldClose) {
+                videoSample.close();
+              }
+              videoSample = new VideoSample(this.resizeCanvas, {
+                timestamp: videoSample.timestamp,
+                duration: videoSample.duration,
+                rotation: videoSample.rotation
+              });
+              shouldClose = true;
+            }
           }
         } else {
-          this.lastWidth = videoSample.codedWidth;
-          this.lastHeight = videoSample.codedHeight;
+          this.codedWidth = videoSample.codedWidth;
+          this.codedHeight = videoSample.codedHeight;
         }
         if (!this.encoderInitialized) {
           if (!this.ensureEncoderPromise) {
@@ -14588,7 +14637,11 @@ ${cue.notes ?? ""}`;
     const scaleX = Math.hypot(m11, m21);
     const cosTheta = m11 / scaleX;
     const sinTheta = m21 / scaleX;
-    return -Math.atan2(sinTheta, cosTheta) * (180 / Math.PI);
+    const result = -Math.atan2(sinTheta, cosTheta) * (180 / Math.PI);
+    if (!Number.isFinite(result)) {
+      return 0;
+    }
+    return result;
   };
   var sampleTableIsEmpty = (sampleTable) => {
     return sampleTable.sampleSizes.length === 0;
@@ -18027,6 +18080,7 @@ ${cue.notes ?? ""}`;
         const encodingConfig = {
           codec: encodableCodec,
           bitrate,
+          sizeChangeBehavior: trackOptions.fit ?? "passThrough",
           onEncodedPacket: (sample) => this._reportProgress(track.id, sample.timestamp + sample.duration)
         };
         const source = new VideoSampleSource(encodingConfig);
@@ -18167,6 +18221,7 @@ ${cue.notes ?? ""}`;
       this.output.addVideoTrack(videoSource, {
         frameRate: trackOptions.frameRate,
         languageCode: track.languageCode,
+        name: track.name ?? void 0,
         rotation: needsRerender ? 0 : totalRotation
         // Rerendering will bake the rotation into the output
       });
@@ -18284,7 +18339,8 @@ ${cue.notes ?? ""}`;
         }
       }
       this.output.addAudioTrack(audioSource, {
-        languageCode: track.languageCode
+        languageCode: track.languageCode,
+        name: track.name ?? void 0
       });
       this._addedCounts.audio++;
       this._totalTrackCount++;