trtc-electron-sdk 10.9.405 → 10.9.501-beta.0

package/liteav/vod_player.js

@@ -1,11 +1,9 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VodPlayer = exports.PlayerEvents = void 0;
 const events_1 = require("events");
-const Render_1 = __importDefault(require("./Render"));
+const Renderer_1 = require("./Renderer");
+const trtc_define_1 = require("./trtc_define");
 var PlayerEvents;
 (function (PlayerEvents) {
     PlayerEvents["onVodPlayerStarted"] = "onVodPlayerStarted";
@@ -85,7 +83,7 @@ class VodPlayer extends events_1.EventEmitter {
         this.nativeVodPlayer.unpublishAudio();
     }
     setVodPlayerRenderCallback() {
-        let callback = (width, height, timestamp, rotation, data) => {
+        const callback = (width, height, timestamp, rotation, data) => {
             this._renderVodVideoFrame({
                 data, width, height,
                 timestamp, rotation
@@ -96,7 +94,7 @@ class VodPlayer extends events_1.EventEmitter {
         });
     }
     setVodEventCallback() {
-        let eventCallback = (eventName, param) => {
+        const eventCallback = (eventName, param) => {
             if (eventName === PlayerEvents.onVodPlayerStarted) {
                 const msLength = param;
                 this.emit(eventName, msLength);
@@ -123,42 +121,33 @@ class VodPlayer extends events_1.EventEmitter {
         this.nativeVodPlayer.setVodEventCallback(eventCallback);
     }
     _renderVodVideoFrame(frame) {
-        const { data, width, height, timestamp, rotation } = frame;
         if (!this.renderer || !this.view) {
             return;
         }
-        const newData = data.slice(0); // Electron 12 及以下版本，来自底层的帧数据必须复制一次，否则 WebGL 渲染阶段会奔溃
-        const realRotation = rotation * 90; //ratation是0, 1, 2, 3. 绘制内部使用0, 90, 180, 270
-        let ylen = width * height;
-        let ulen = width * height / 4;
-        let ydata = new Uint8Array(newData, 0, ylen);
-        let udata = new Uint8Array(newData, ylen, ulen);
-        let vdata = new Uint8Array(newData, ylen + ulen, ulen);
-        this.renderer.drawFrame({
-            width: width,
-            height: height,
-            rotation: realRotation,
-            timestamp: timestamp,
-            yUint8Array: ydata,
-            uUint8Array: udata,
-            vUint8Array: vdata,
-            isNeedRotate: false
-        });
-        ydata = null;
-        udata = null;
-        vdata = null;
+        const { data, width, height, timestamp, rotation } = frame;
+        if (data) {
+            const newData = data.slice(0); // Electron 12 及以下版本，来自底层的帧数据必须复制一次，否则 WebGL 渲染阶段会奔溃
+            const realRotation = rotation * 90; //ratation是0, 1, 2, 3. 绘制内部使用0, 90, 180, 270
+            this.renderer.drawFrame({
+                data: newData,
+                width,
+                height,
+                timestamp,
+                rotation: realRotation,
+                isNeedRotate: false,
+            });
+        }
     }
     _initRender(view) {
         if (this.renderer) {
             this.destroyRender();
         }
-        this.renderer = new Render_1.default.GlRenderer();
         view.innerHTML = ''; // 事先清空一下，避免画面叠加
-        this.renderer.bind(view);
+        this.renderer = (0, Renderer_1.createRenderer)(trtc_define_1.TRTCVideoPixelFormat.TRTCVideoPixelFormat_I420, view);
     }
     destroyRender() {
         try {
-            this.renderer.unbind();
+            this.renderer.destroy();
             this.renderer = null;
         }
         catch (err) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trtc-electron-sdk",
-  "version": "10.9.405",
+  "version": "10.9.501-beta.0",
   "description": "trtc electron sdk",
   "main": "./liteav/trtc.js",
   "types": "./liteav/trtc.d.ts",

package/scripts/constant.js

@@ -3,5 +3,7 @@ module.exports.Platform = {
   MACOS_ARM: 'mac-arm64',
   WINDOWS32: 'win32',
   WINDOWS64: 'win64',
-  UNSUPPORTED: 'unsupported'
+  UNSUPPORTED: 'unsupported',
+  LINUX_X64: 'linux-x64',
+  LINUX_ARM64: 'linux-arm64',
 };

package/scripts/download.js

@@ -81,8 +81,9 @@ const main = () => {
             signale.success(`copy success! - ${platform}`);
 
             if (platform === Platform.WINDOWS32 || platform === Platform.WINDOWS64) {
-                rimraf.sync(outputDir); // windows 下
-            } else {
+                // windows 下
+                rimraf.sync(outputDir);
+            } else if (platform === 'mac' || platform === 'mac-arm64') {
                 // mac 下
                 const arch = archType;
                 fs.copySync(
@@ -133,6 +134,45 @@ const main = () => {
                     .catch(err => {
                         signale.fatal(`download error! - mac ${anotherPlatform}`, err);
                     });
+            } else if (platform === 'linux-x64' || platform === 'linux-arm64') {
+                // Linux 下
+                const arch = process.arch;
+                fs.copySync(
+                    path.join(outputDir, './build/Release'),
+                    path.join(buildDir, 'Release', arch)
+                );
+                signale.success(`copy success! - linux ${arch}`, '\n');
+
+                let anotherPlatform, anotherArch;
+                if (arch === 'x64') {
+                    // download arm64
+                    anotherPlatform = Platform.LINUX_ARM64;
+                    anotherArch = 'arm64';
+                } else {
+                    // arch = arm64, download x64
+                    anotherPlatform = Platform.LINUX_X64;
+                    anotherArch = 'x64';
+                }
+                const anotherDownloadUrl = `https://web.sdk.qcloud.com/trtc/electron/download/${name}/${version}/${name}-${anotherPlatform}-${version}.zip`;
+                signale.info('Download Url =', anotherDownloadUrl, '\n');
+                signale.pending(`Downloading C++ addon Electron SDK... ${anotherArch}\n`);
+                download(anotherDownloadUrl, path.join(outputDir, anotherPlatform), {
+                    strip: 0,
+                    extract: true
+                }).then(() => {
+                    signale.success(`Download finished - linux ${anotherArch}`);
+                    fs.copySync(
+                        path.join(outputDir, anotherPlatform, '/build/Release'),
+                        path.join(buildDir, 'Release', anotherArch)
+                    );
+                    signale.success(`copy success! - linux ${anotherArch}`);
+
+                    rimraf.sync(outputDir);
+                }).catch(err => {
+                    signale.fatal(`download error! - linux ${anotherPlatform}`, err);
+                })
+            } else {
+                signale.warn(`Not supported platform: ${platform}`);
             }
         }).catch(err => {
             signale.fatal(`Failed! Download error - ${platform}`, err);

package/scripts/utils.js

@@ -47,13 +47,20 @@ module.exports.detectOS = (archType = '', platformType = '') => {
     } else {
       return Platform.MACOS_ARM;
     }
-  }
-  if (platform === 'win32') {
+  } else if (platform === 'win32') {
     if (arch === 'x64') {
       return Platform.WINDOWS64;
     } else {
       return Platform.WINDOWS32;
     }
+  } else if (platform === 'linux') {
+    if (arch === 'x64') {
+      return Platform.LINUX_X64;
+    } else if (arch === 'arm64') {
+      return Platform.LINUX_ARM64;
+    } else {
+      // unsupported
+    }
   }
   return Platform.UNSUPPORTED;
 };