Remove class SpeedyTextureUploader

alemart · Jun 12, 2024 · e27ea3c · e27ea3c
1 parent 69c0883
commit e27ea3c
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 85 deletions.
diff --git a/src/gpu/speedy-gpu.js b/src/gpu/speedy-gpu.js
@@ -23,7 +23,6 @@ import { SpeedyGL } from './speedy-gl';
 import { SpeedyTexture } from './speedy-texture';
 import { SpeedyProgramCenter } from './speedy-program-center';
 import { SpeedyTexturePool } from './speedy-texture-pool';
-import { SpeedyTextureUploader } from './speedy-texture-uploader';
 import { SpeedyMediaSource } from '../core/speedy-media-source';
 import { SpeedyPromise } from '../core/speedy-promise';
 import { Utils } from '../utils/utils';
@@ -51,9 +50,6 @@ export class SpeedyGPU extends Observable
         /** @type {SpeedyTexturePool} texture pool */
         this._texturePool = new SpeedyTexturePool(this);
 
-        /** @type {SpeedyTextureUploader} texture uploader */
-        this._textureUploader = new SpeedyTextureUploader(this);
-
 
 
         // recreate the state if necessary
@@ -131,7 +127,7 @@ export class SpeedyGPU extends Observable
      */
     upload(source, outputTexture)
     {
-        return this._textureUploader.upload(source, outputTexture);
+        return outputTexture.upload(source.data, source.width, source.height);
     }
 
     /**
@@ -145,7 +141,6 @@ export class SpeedyGPU extends Observable
         // release internal components
         this._programs = this._programs.release();
         this._texturePool = this._texturePool.release();
-        this._textureUploader = this._textureUploader.release();
 
         // unsubscribe
         this._speedyGL.unsubscribe(this._reset);
@@ -181,7 +176,6 @@ export class SpeedyGPU extends Observable
 
         this._programs = new SpeedyProgramCenter(this);
         this._texturePool = new SpeedyTexturePool(this);
-        this._textureUploader = new SpeedyTextureUploader(this);
 
         this._notify();
     }

diff --git a/src/gpu/speedy-texture-uploader.js b/src/gpu/speedy-texture-uploader.js
diff --git a/src/gpu/speedy-texture.js b/src/gpu/speedy-texture.js
@@ -116,14 +116,26 @@ export class SpeedyTexture
 
     /**
      * Upload pixel data to the texture. The texture will be resized if needed.
-     * @param {TexImageSource} pixels
+     * @param {TexImageSource} data
      * @param {number} [width] in pixels
      * @param {number} [height] in pixels
      * @return {SpeedyTexture} this
      */
-    upload(pixels, width = this._width, height = this._height)
+    upload(data, width = this._width, height = this._height)
     {
         const gl = this._gl;
+
+        // bugfix: if the media is a video, we can't really
+        // upload it to the GPU unless it's ready
+        if(data instanceof HTMLVideoElement) {
+            if(data.readyState < 2) {
+                // this may happen when the video loops (Firefox)
+                // keep the previously uploaded texture
+                //Utils.warning(`Trying to process a video that isn't ready yet`);
+                return this;
+            }
+        }
+
         Utils.assert(width > 0 && height > 0);
 
         this.discardMipmaps();
@@ -133,7 +145,7 @@ export class SpeedyTexture
         this._format = gl.RGBA;
         this._dataType = gl.UNSIGNED_BYTE;
 
-        SpeedyTexture._upload(gl, this._glTexture, this._width, this._height, pixels, 0, this._format, this._internalFormat, this._dataType);
+        SpeedyTexture._upload(gl, this._glTexture, this._width, this._height, data, 0, this._format, this._internalFormat, this._dataType);
         return this;
     }
 
@@ -356,6 +368,7 @@ export class SpeedyTexture
         gl.bindTexture(gl.TEXTURE_2D, null);
         return texture;
     }
+
     /**
      * Upload pixel data to a WebGL texture
      * @param {WebGL2RenderingContext} gl