Fix issue with copying to a texture from a HTMLVideoElement

CesiumGS · Sep 30, 2024 · 2e63d5c · 2e63d5c
1 parent e3e9837
commit 2e63d5c
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 3 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -12,6 +12,7 @@
 
 ##### Fixes :wrench:
 
+- Fix Texture errors when using a `HTMLVideoElement`. [#12219](https://github.com/CesiumGS/cesium/issues/12219)
 - Use first geometryBuffer if no best match found in I3SNode [#12132](https://github.com/CesiumGS/cesium/pull/12132)
 - Update type definitions to allow undefined for optional parameters [#12193](https://github.com/CesiumGS/cesium/pull/12193)
 - Reverts Firefox OIT temporary fix [#4815] and Firefox test failure fix [#5047]

diff --git a/packages/engine/Source/Renderer/Texture.js b/packages/engine/Source/Renderer/Texture.js
@@ -60,11 +60,12 @@ function Texture(options) {
 
   let { width, height } = options;
   if (defined(source)) {
+    // Make sure we are using the element's intrinsic width and height where available
     if (!defined(width)) {
-      width = defaultValue(source.videoWidth, source.width);
+      width = source.videoWidth ?? source.naturalWidth ?? source.width;
     }
     if (!defined(height)) {
-      height = defaultValue(source.videoHeight, source.height);
+      height = source.videoHeight ?? source.naturalHeight ?? source.height;
     }
   }
 
@@ -810,7 +811,19 @@ Texture.prototype.copyFrom = function (options) {
   gl.activeTexture(gl.TEXTURE0);
   gl.bindTexture(target, this._texture);
 
-  const { width, height, arrayBufferView } = source;
+  let { width, height } = source;
+  const arrayBufferView = source.arrayBufferView;
+
+  // Make sure we are using the element's intrinsic width and height where available
+  if (defined(source.naturalWidth) && defined(source.naturalHeight)) {
+    width = source.naturalWidth;
+    height = source.naturalHeight;
+  }
+
+  if (defined(source.videoWidth) && defined(source.videoHeight)) {
+    width = source.videoWidth;
+    height = source.videoHeight;
+  }
 
   const textureWidth = this._width;
   const textureHeight = this._height;

diff --git a/packages/engine/Specs/Renderer/TextureSpec.js b/packages/engine/Specs/Renderer/TextureSpec.js
@@ -114,7 +114,15 @@ describe(
       context.destroyForSpecs();
     });
 
+    let blueImageHeight, blueImageWidth;
+    beforeEach(function () {
+      blueImageHeight = blueImage.height;
+      blueImageWidth = blueImage.width;
+    });
+
     afterEach(function () {
+      blueImage.height = blueImageHeight;
+      blueImage.width = blueImageWidth;
       texture = texture && texture.destroy();
     });
 
@@ -670,6 +678,29 @@ describe(
       }).contextToRender([0, 0, 255, 255]);
     });
 
+    it("can copy from a DOM element when display dimensions are 0", function () {
+      blueImage.height = 0;
+      blueImage.width = 0;
+
+      texture = new Texture({
+        context: context,
+        pixelFormat: PixelFormat.RGB,
+        pixelDatatype: PixelDatatype.UNSIGNED_BYTE,
+        source: blueImage,
+      });
+
+      texture.copyFrom({
+        source: blueImage,
+      });
+
+      expect({
+        context: context,
+        fragmentShader: fs,
+        uniformMap: uniformMap,
+        epsilon: 1,
+      }).contextToRender([0, 0, 255, 255]);
+    });
+
     it("can replace a subset of a texture", function () {
       texture = new Texture({
         context: context,