agora-electron-sdk 4.2.2-dev.4 → 4.2.2-dev.7

package/ts/Private/internal/IrisApiEngine.ts

@@ -337,6 +337,15 @@ export const EVENT_PROCESSORS: EventProcessors = {
   },
 };
 
+// some events are not needed, so ignore them
+function isIgnoredEvent(event: string, data: any) {
+  if (event === 'onLocalVideoStats' && 'connection' in data) {
+    return true;
+  } else {
+    return false;
+  }
+}
+
 function handleEvent(...[event, data, buffers]: any) {
   if (isDebuggable()) {
     console.info('onEvent', event, data, buffers);
@@ -370,6 +379,9 @@ function handleEvent(...[event, data, buffers]: any) {
     _event = _event.replace(/Ex$/g, '');
   }
 
+  if (isIgnoredEvent(_event, _data)) {
+    return false;
+  }
   const _buffers: Uint8Array[] = buffers;
   if (processor.preprocess) {
     processor.preprocess(_event, _data, _buffers);
@@ -386,6 +398,8 @@ function handleEvent(...[event, data, buffers]: any) {
   }
 
   emitEvent(_event, processor, _data);
+
+  return true;
 }
 
 /**

package/ts/Private/internal/MusicContentCenterInternal.ts

@@ -104,6 +104,10 @@ export class MusicContentCenterInternal extends IMusicContentCenterImpl {
     const mediaPlayerId = super.createMusicPlayer() as number;
     return new MusicPlayerInternal(mediaPlayerId);
   }
+
+  protected getApiTypeFromPreload(songCode: number): string {
+    return 'MusicContentCenter_preload2';
+  }
 }
 
 class _MusicPlayerInternal extends IMusicPlayerImpl {

package/ts/Private/internal/RtcEngineExInternal.ts

@@ -458,7 +458,7 @@ export class RtcEngineExInternal extends IRtcEngineExImpl {
     channelId: string,
     userAccount: string
   ): string {
-    return 'RtcEngine_preloadChannelWithUserAccount2';
+    return 'RtcEngine_preloadChannel2';
   }
 
   override getAudioDeviceManager(): IAudioDeviceManager {
@@ -533,27 +533,49 @@ export class RtcEngineExInternal extends IRtcEngineExImpl {
     iconSize: Size,
     includeScreen: boolean
   ): ScreenCaptureSourceInfo[] {
-    return super
-      .getScreenCaptureSources(thumbSize, iconSize, includeScreen)
-      .map((value: any) => {
-        if (value.thumbImage.buffer == 0) {
-          value.thumbImage.buffer = undefined;
+    const apiType = this.getApiTypeFromGetScreenCaptureSources(
+      thumbSize,
+      iconSize,
+      includeScreen
+    );
+    const jsonParams = {
+      thumbSize: thumbSize,
+      iconSize: iconSize,
+      includeScreen: includeScreen,
+      toJSON: () => {
+        return {
+          thumbSize: thumbSize,
+          iconSize: iconSize,
+          includeScreen: includeScreen,
+        };
+      },
+    };
+    const { result, sources } = callIrisApi.call(this, apiType, jsonParams);
+    const screenCaptureSources = result.map(
+      (value: ScreenCaptureSourceInfo) => {
+        if (!value.thumbImage?.buffer || !value.thumbImage?.length) {
+          value.thumbImage!.buffer = undefined;
         } else {
-          value.thumbImage.buffer = AgoraEnv.AgoraElectronBridge.GetBuffer(
-            value.thumbImage.buffer,
-            value.thumbImage?.length
+          value.thumbImage!.buffer = AgoraEnv.AgoraElectronBridge.GetBuffer(
+            value.thumbImage!.buffer as unknown as number,
+            value.thumbImage.length!
           );
         }
-        if (value.iconImage.buffer == 0) {
-          value.iconImage.buffer = undefined;
+        if (!value.iconImage?.buffer || !value.iconImage?.length) {
+          value.iconImage!.buffer = undefined;
         } else {
           value.iconImage.buffer = AgoraEnv.AgoraElectronBridge.GetBuffer(
-            value.iconImage.buffer,
-            value.iconImage.length
+            value.iconImage!.buffer as unknown as number,
+            value.iconImage.length!
           );
         }
         return value;
-      });
+      }
+    );
+    callIrisApi.call(this, 'RtcEngine_releaseScreenCaptureSources', {
+      sources,
+    });
+    return screenCaptureSources;
   }
 
   override setupLocalVideo(canvas: VideoCanvas): number {

package/ts/Private/ti/IAgoraRtcEngine-ti.ts

@@ -25,7 +25,7 @@ export const IRtcEngineEventHandler = t.iface([], {
   "onDownlinkNetworkInfoUpdated": t.opt(t.func("void", t.param("info", "DownlinkNetworkInfo"))),
   "onLastmileQuality": t.opt(t.func("void", t.param("quality", "QualityType"))),
   "onFirstLocalVideoFrame": t.opt(t.func("void", t.param("source", "VideoSourceType"), t.param("width", "number"), t.param("height", "number"), t.param("elapsed", "number"))),
-  "onFirstLocalVideoFramePublished": t.opt(t.func("void", t.param("connection", "RtcConnection"), t.param("elapsed", "number"))),
+  "onFirstLocalVideoFramePublished": t.opt(t.func("void", t.param("source", "VideoSourceType"), t.param("elapsed", "number"))),
   "onFirstRemoteVideoDecoded": t.opt(t.func("void", t.param("connection", "RtcConnection"), t.param("remoteUid", "number"), t.param("width", "number"), t.param("height", "number"), t.param("elapsed", "number"))),
   "onVideoSizeChanged": t.opt(t.func("void", t.param("connection", "RtcConnection"), t.param("sourceType", "VideoSourceType"), t.param("uid", "number"), t.param("width", "number"), t.param("height", "number"), t.param("rotation", "number"))),
   "onLocalVideoStateChanged": t.opt(t.func("void", t.param("source", "VideoSourceType"), t.param("state", "LocalVideoStreamState"), t.param("error", "LocalVideoStreamError"))),
@@ -40,7 +40,7 @@ export const IRtcEngineEventHandler = t.iface([], {
   "onUserEnableLocalVideo": t.opt(t.func("void", t.param("connection", "RtcConnection"), t.param("remoteUid", "number"), t.param("enabled", "boolean"))),
   "onLocalAudioStats": t.opt(t.func("void", t.param("connection", "RtcConnection"), t.param("stats", "LocalAudioStats"))),
   "onRemoteAudioStats": t.opt(t.func("void", t.param("connection", "RtcConnection"), t.param("stats", "RemoteAudioStats"))),
-  "onLocalVideoStats": t.opt(t.func("void", t.param("connection", "RtcConnection"), t.param("stats", "LocalVideoStats"))),
+  "onLocalVideoStats": t.opt(t.func("void", t.param("source", "VideoSourceType"), t.param("stats", "LocalVideoStats"))),
   "onRemoteVideoStats": t.opt(t.func("void", t.param("connection", "RtcConnection"), t.param("stats", "RemoteVideoStats"))),
   "onCameraReady": t.opt(t.func("void")),
   "onCameraFocusAreaChanged": t.opt(t.func("void", t.param("x", "number"), t.param("y", "number"), t.param("width", "number"), t.param("height", "number"))),

package/ts/Renderer/WebGLRenderer/index.ts

@@ -46,7 +46,6 @@ const yuvShaderSource =
 
 export class GlRenderer extends IRenderer {
   gl: WebGL2RenderingContext | undefined | null;
-  handleContextLost: any;
   program: any;
   positionLocation: any;
   texCoordLocation: any;
@@ -127,6 +126,12 @@ export class GlRenderer extends IRenderer {
       logWarn('webgl renderer unbind happen some error', e);
     }
 
+    this.canvas &&
+      this.canvas.removeEventListener(
+        'webglcontextlost',
+        this.handleContextLost,
+        false
+      );
     this.canvas = undefined;
     this.container = undefined;
     this.parentElement = undefined;
@@ -448,6 +453,25 @@ export class GlRenderer extends IRenderer {
     }
   }
 
+  private handleContextLost = () => {
+    try {
+      this.canvas &&
+        this.canvas.removeEventListener(
+          'webglcontextlost',
+          this.handleContextLost,
+          false
+        );
+    } catch (error) {
+      logWarn('webglcontextlost error', error);
+    } finally {
+      this.gl = undefined;
+      this.failInitRenderCB &&
+        this.failInitRenderCB({
+          error: 'Browser not support! No WebGL detected.',
+        });
+    }
+  };
+
   private initCanvas(
     view: HTMLElement,
     width: number,
@@ -487,28 +511,9 @@ export class GlRenderer extends IRenderer {
         preserveDrawingBuffer: true,
       });
       // context list after toggle resolution on electron 12.0.6
-      let handleContextLost = () => {
-        try {
-          this.gl = null;
-          this.canvas &&
-            this.canvas.removeEventListener(
-              'webglcontextlost',
-              handleContextLost,
-              false
-            );
-        } catch (error) {
-          logWarn('webglcontextlost error', error);
-        } finally {
-          this.gl = undefined;
-          this.failInitRenderCB &&
-            this.failInitRenderCB({
-              error: 'Browser not support! No WebGL detected.',
-            });
-        }
-      };
       this.canvas.addEventListener(
         'webglcontextlost',
-        handleContextLost,
+        this.handleContextLost,
         false
       );
     } catch (e) {

package/ts/Renderer/YUVCanvasRenderer/index.ts

@@ -153,7 +153,7 @@ export class YUVCanvasRenderer extends IRenderer {
       this.canvas.style.transform = `scale(${scale.toString()})`;
 
       if (transformItems.length > 0) {
-        this.canvas.style.transform = `${transformItems.join(' ')}`;
+        this.canvas.style.transform += ` ${transformItems.join(' ')}`;
       }
     }
   }