trtc-electron-sdk 9.8.8-beta.4 → 9.8.8-beta.7

package/liteav/trtc.js

@@ -31,6 +31,8 @@ __exportStar(require("./trtc_define"), exports);
 __exportStar(require("./trtc_code"), exports);
 // 监听该事件，返回自定义视频渲染数据 ( bgra 格式)
 const CUSTOM_VIDEO_DATA = 'onVideoData';
+const CAMERA_DEVICE_TEST_VIEW = 'camera_device_test_view';
+const CAMERA_DEVICE_TEST_ID = 'camera_device_test';
 const SDK_LOG_LEVEL = 2;
 let genSecFunc = function (instance, key) {
     return function () {
@@ -3024,13 +3026,16 @@ class TRTCCloud extends events_1.EventEmitter {
     startCameraDeviceTest(view) {
         if (view !== undefined) {
             if (view !== null) {
-                let key = this.getKey('camera_device_test_view', trtc_define_1.TRTCVideoStreamType.TRTCVideoStreamTypeBig);
+                let key = this.getKey(CAMERA_DEVICE_TEST_VIEW, trtc_define_1.TRTCVideoStreamType.TRTCVideoStreamTypeBig);
                 this._initRender(key, view);
                 const renderer = this.streams.get(key);
                 renderer.setContentMode(trtc_define_1.TRTCVideoFillMode.TRTCVideoFillMode_Fill);
             }
-            this.addLocalVideoRenderCallback();
-            this.rtcCloud.startCameraDeviceTest();
+            this.rtcCloud.startCameraDeviceTest((id, type, width, height, timestamp, rotation, data) => {
+                if (this.enableRenderFrame) {
+                    this._onRenderFrame(id, type, width, height, timestamp, rotation, data);
+                }
+            });
         }
         else {
             console.error('startCameraDeviceTest, view is undefined!');
@@ -3040,7 +3045,7 @@ class TRTCCloud extends events_1.EventEmitter {
      * 13.4 停止摄像头测试
      */
     stopCameraDeviceTest() {
-        let key = this.getKey('camera_device_test_view', trtc_define_1.TRTCVideoStreamType.TRTCVideoStreamTypeBig);
+        let key = this.getKey(CAMERA_DEVICE_TEST_VIEW, trtc_define_1.TRTCVideoStreamType.TRTCVideoStreamTypeBig);
         this._destroyRender(key, null);
         this.rtcCloud.stopCameraDeviceTest();
         this.firstVideoFrameList = this.firstVideoFrameList.filter(function (item) {
@@ -3323,7 +3328,8 @@ class TRTCCloud extends events_1.EventEmitter {
                 }
             });
         }
-        if (uid.length == 0) {
+        if (uid.length == 0 || uid === CAMERA_DEVICE_TEST_ID) {
+            // 本地预览或者摄像头测试
             if (this.isExternalRenderEnabled) {
                 this.fire(CUSTOM_VIDEO_DATA, {
                     uid: '', type, rotation, timestamp,
@@ -3337,15 +3343,19 @@ class TRTCCloud extends events_1.EventEmitter {
                     pixelformate: this.pixelformate,
                     data: {}
                 });
-                this._onRealRender('local_video', type, width, height, timestamp, rotation, data); //本地社视频返回的是空
-                this._onRealRender('camera_device_test_view', type, width, height, timestamp, rotation, data); //摄像头测试
             }
-            //回调local view 给用户数据，本地数据
-            if (type == trtc_define_1.TRTCVideoStreamType.TRTCVideoStreamTypeBig) {
-                if (this.localVideoCallback !== null && this.localVideoCallback.callback !== null) {
-                    this._onUserRenderCallback(this.localVideoCallback.callback, this.localVideoCallback.pixelFormat, uid, type, width, height, timestamp, rotation, data);
+            if (uid.length == 0) {
+                this._onRealRender('local_video', type, width, height, timestamp, rotation, data); //本地社视频返回的是空
+                //回调local view 给用户数据，本地数据
+                if (type == trtc_define_1.TRTCVideoStreamType.TRTCVideoStreamTypeBig) {
+                    if (this.localVideoCallback !== null && this.localVideoCallback.callback !== null) {
+                        this._onUserRenderCallback(this.localVideoCallback.callback, this.localVideoCallback.pixelFormat, uid, type, width, height, timestamp, rotation, data);
+                    }
                 }
             }
+            if (uid === CAMERA_DEVICE_TEST_ID) {
+                this._onRealRender(CAMERA_DEVICE_TEST_VIEW, type, width, height, timestamp, rotation, data); //摄像头测试
+            }
         }
         else {
             if (this.isExternalRenderEnabled) {

package/package.json

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