libpag 4.5.46 → 4.5.47

package/src/wechat/pag-view.ts

@@ -105,7 +105,7 @@ export class PAGView extends NativePAGView {
   }
 
   protected override async flushLoop(force = false) {
-    if (!this.isPlaying) return;
+    if (!this.isPlaying || this.isDestroyed) return;
     this.setTimer();
     if (this.flushingNextFrame) return;
     try {
@@ -114,6 +114,9 @@ export class PAGView extends NativePAGView {
       this.flushingNextFrame = false;
     } catch (e: any) {
       this.flushingNextFrame = false;
+      if (e.message !== 'The play() request was interrupted because the document was hidden!') {
+        this.clearTimer();
+      }
       console.error(e);
     }
   }

package/src/wechat/video-reader.ts

@@ -46,6 +46,7 @@ export class VideoReader {
   public isPlaying = false; // Web SDK use this property to check if video is playing
   public isDestroyed = false;
   private player: PAGPlayer | null = null;
+  private error: any = null;
 
   private readonly frameRate: number;
   private currentFrame: number;
@@ -85,15 +86,17 @@ export class VideoReader {
   }
 
   public async prepare(targetFrame: number) {
-    if (targetFrame === this.currentFrame) return;
+    if (this.isDestroyed || targetFrame === this.currentFrame) return;
     this.isSought = false;
     // Wait for videoDecoder ready
     await this.videoDecoderPromise;
+    if (this.isDestroyed) return;
     if (this.frameDataBuffers.length > 0) {
       const index = this.frameDataBuffers.findIndex((frameData) => frameData.id === targetFrame);
       if (index !== -1) {
         this.frameDataBuffers = this.frameDataBuffers.slice(index);
         this.arrayBufferImage.setFrameData(await this.getFrameData());
+        if (this.isDestroyed) return;
         this.currentFrame = targetFrame;
         return;
       }
@@ -105,9 +108,14 @@ export class VideoReader {
       this.isSought = true;
       this.bufferIndex = targetFrame;
       await this.videoDecoder.seek(Math.floor((targetFrame / this.frameRate) * 1000));
+      if (this.isDestroyed) {
+        this.seeking = false;
+        return;
+      }
       this.seeking = false;
     }
     this.arrayBufferImage.setFrameData(await this.getFrameData());
+    if (this.isDestroyed) return;
     this.currentFrame = targetFrame;
     return;
   }
@@ -133,11 +141,15 @@ export class VideoReader {
   }
 
   public getError(): any {
-    // Web SDK use this function to get video error.
-    return null;
+    return this.error;
   }
 
   public onDestroy() {
+    this.isDestroyed = true;
+    if (this.getFrameDataResolve) {
+      this.getFrameDataResolve({ id: -1, data: new ArrayBuffer(0), width: 0, height: 0 });
+      this.getFrameDataResolve = null;
+    }
     if (this.player) {
       this.player.unlinkVideoReader(this);
       this.player = null;
@@ -147,7 +159,6 @@ export class VideoReader {
     if (this.mp4Path) {
       removeFile(this.mp4Path);
     }
-    this.isDestroyed = true;
   }
 
   private getFrameData() {
@@ -176,10 +187,12 @@ export class VideoReader {
   }
 
   private getFrameDataLoop() {
+    if (this.isDestroyed) return;
     if (this.seeking) return;
     if (!this.videoDecoder) {
       this.clearFrameDataLoop();
-      throw new Error('VideoDecoder is not ready!');
+      this.error = 'VideoDecoder is not ready.';
+      return;
     }
     if (this.frameDataBuffers.length >= BUFFER_MAX_SIZE) {
       this.getFrameDataLooping = false;
@@ -212,4 +225,4 @@ export class VideoReader {
       player.linkVideoReader(this);
     }
   }
-}
+}

package/types/third_party/tgfx/web/src/core/scaler-context.d.ts

@@ -31,6 +31,12 @@ export declare class ScalerContext {
         join: ctor;
         miterLimit: number;
     }): Uint8Array;
+    getGlyphCanvas(text: string, bounds: Rect, fauxBold: boolean, stroke?: {
+        width: number;
+        cap: ctor;
+        join: ctor;
+        miterLimit: number;
+    }, padding?: number): HTMLCanvasElement | OffscreenCanvas | null;
     protected loadCanvas(): void;
     private measureText;
 }

package/types/third_party/tgfx/web/src/tgfx.d.ts

@@ -1,6 +1,6 @@
 import { getCanvas2D } from './utils/canvas';
 import { BitmapImage } from './core/bitmap-image';
-import type { EmscriptenGL, TGFX } from './types';
+import { EmscriptenGL, TGFX, WindowColorSpace } from './types';
 export declare const createImage: (source: string) => Promise<HTMLImageElement>;
 export declare const createImageFromBytes: (bytes: ArrayBuffer) => Promise<HTMLImageElement>;
 export declare const readImagePixels: (module: TGFX, image: CanvasImageSource, width: number, height: number) => Uint8Array;
@@ -9,7 +9,8 @@ export declare const getSourceSize: (source: TexImageSource | OffscreenCanvas) =
     width: number;
     height: number;
 };
-export declare const uploadToTexture: (GL: EmscriptenGL, source: TexImageSource | OffscreenCanvas | BitmapImage, textureID: number, alphaOnly: boolean) => void;
+export declare const uploadToTexture: (GL: EmscriptenGL, source: TexImageSource | OffscreenCanvas | BitmapImage, textureID: number, offsetX: number, offsetY: number, alphaOnly: boolean) => void;
+export declare const setColorSpace: (GL: EmscriptenGL, colorSpace: WindowColorSpace) => boolean;
 export declare const isAndroidMiniprogram: () => boolean;
 export declare const releaseNativeImage: (source: TexImageSource | OffscreenCanvas) => void;
 export declare const getBytesFromPath: (module: TGFX, path: string) => Promise<Uint8Array>;

package/types/third_party/tgfx/web/src/types.d.ts

@@ -26,6 +26,12 @@ export declare const enum MatrixIndex {
     d = 4,
     ty = 5
 }
+export declare const enum WindowColorSpace {
+    None = 0,
+    SRGB = 1,
+    DisplayP3 = 2,
+    Others = 3
+}
 export interface ctor {
     value: number;
 }

package/types/web/src/core/video-reader.d.ts

@@ -18,6 +18,7 @@ export declare class VideoReader {
     private bitmapCtx;
     private currentFrame;
     private targetFrame;
+    private visibilityHandle;
     constructor(source: Uint8Array | HTMLVideoElement, width: number, height: number, frameRate: number, staticTimeRanges: TimeRange[]);
     prepare(targetFrame: number, playbackRate: number): Promise<void>;
     getCurrentFrame(): number;
@@ -29,6 +30,7 @@ export declare class VideoReader {
     onDestroy(): void;
     private seek;
     private setError;
+    private clearVisibilityListener;
     private linkPlayer;
 }
 export declare class StaticTimeRanges {