fix: jira CSD-60920 render issue after (#1110)

AgoraIO-Extensions · Nov 16, 2023 · 5730d86 · 5730d86
1 parent 8049ba9
commit 5730d86
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 30 deletions.
diff --git a/ts/Renderer/RendererManager.ts b/ts/Renderer/RendererManager.ts
@@ -48,7 +48,7 @@ export class RendererManager extends IRendererManager {
   /**
    * @ignore
    */
-  renderMode: RENDER_MODE;
+  renderMode?: RENDER_MODE;
   /**
    * @ignore
    */
@@ -62,9 +62,7 @@ export class RendererManager extends IRendererManager {
     super();
     this.renderFps = 15;
     this.renderers = new Map();
-    this.renderMode = this.checkWebglEnv()
-      ? RENDER_MODE.WEBGL
-      : RENDER_MODE.SOFTWARE;
+    this.setRenderMode();
     this.msgBridge = AgoraEnv.AgoraElectronBridge;
     this.defaultRenderConfig = {
       rendererOptions: {
@@ -83,11 +81,20 @@ export class RendererManager extends IRendererManager {
    * @returns
    * 0: Success.< 0: Failure.
    */
-  public setRenderMode(mode: RENDER_MODE) {
-    this.renderMode = mode;
-    logInfo(
-      'setRenderMode:  new render mode will take effect only if new view bind to render'
-    );
+  public setRenderMode(mode?: RENDER_MODE) {
+    if (mode === undefined) {
+      this.renderMode = this.checkWebglEnv()
+        ? RENDER_MODE.WEBGL
+        : RENDER_MODE.SOFTWARE;
+      return;
+    }
+
+    if (mode !== this.renderMode) {
+      this.renderMode = mode;
+      logInfo(
+        'setRenderMode:  new render mode will take effect only if new view bind to render'
+      );
+    }
   }
 
   /**
@@ -430,17 +437,6 @@ export class RendererManager extends IRendererManager {
     }
   }
 
-  /**
-   * @ignore
-   */
-  private getRender({
-    videoSourceType,
-    channelId,
-    uid,
-  }: VideoFrameCacheConfig) {
-    return this.renderers.get(videoSourceType)?.get(channelId)?.get(uid);
-  }
-
   /**
    * @ignore
    */
@@ -475,18 +471,14 @@ export class RendererManager extends IRendererManager {
       return filterRenders[0];
     }
     const renderer = this.createRenderer(() => {
-      const renderConfig = this.getRender(config);
-      if (!renderConfig) {
-        return;
-      }
-      renderConfig.renders = renders.filter((r) => r !== renderer);
-      const contentMode = renderer.contentMode;
+      const { contentMode, mirror } = renderer;
       renderer.unbind();
-      this.setRenderMode(RENDER_MODE.SOFTWARE);
+      renders.splice(renders.indexOf(renderer), 1);
+      this.setRenderMode();
       const newRender = this.createRenderer();
-      newRender.contentMode = contentMode;
       newRender.bind(view);
-      renderConfig.renders.push(newRender);
+      newRender.setRenderOption({ contentMode, mirror });
+      renders.push(newRender);
     });
     renderer.bind(view);
     renders.push(renderer);

diff --git a/ts/Renderer/WebGLRenderer/index.ts b/ts/Renderer/WebGLRenderer/index.ts
@@ -453,7 +453,8 @@ export class GlRenderer extends IRenderer {
     }
   }
 
-  private handleContextLost = () => {
+  private handleContextLost = (event: Event) => {
+    console.warn('webglcontextlost', event);
     try {
       this.canvas &&
         this.canvas.removeEventListener(