xushiting 3 anos atrás
pai
commit
3a8882d794
5 arquivos alterados com 128 adições e 18 exclusões
  1. 4 4
      dist/index.html
  2. 115 8
      dist/js/index.js
  3. 1 1
      dist/js/index.js.map
  4. 6 3
      src/Workers.js
  5. 2 2
      src/Xverse_Room.js

+ 4 - 4
dist/index.html

@@ -191,11 +191,11 @@
     }
 }
   , ue4Rotation2Xverse = i=>isRotationCorrect() ? (i.pitch >= 89.5 ? i.pitch = 89.5 : i.pitch <= -89.5 && (i.pitch = -89.5),
-new Vector3(-1 * Math.PI * i.pitch / 180,Math.PI * i.yaw / 180 - Math.PI * 27 / 18,Math.PI * i.roll / 180 < .001 ? 0 : Math.PI * i.roll / 180)) : null
-  , ue4Rotation2Xverse_mesh = i=>isRotationCorrect() ? new Vector3(Math.PI * i.pitch / 180,Math.PI * i.yaw / 180,Math.abs(Math.PI * i.roll) / 180 < .001 ? 0 : -1 * (Math.PI * i.roll) / 180) : null
+new BABYLON.Vector3(-1 * Math.PI * i.pitch / 180,Math.PI * i.yaw / 180 - Math.PI * 27 / 18,Math.PI * i.roll / 180 < .001 ? 0 : Math.PI * i.roll / 180)) : null
+  , ue4Rotation2Xverse_mesh = i=>isRotationCorrect() ? new BABYLON.Vector3(Math.PI * i.pitch / 180,Math.PI * i.yaw / 180,Math.abs(Math.PI * i.roll) / 180 < .001 ? 0 : -1 * (Math.PI * i.roll) / 180) : null
   , scaleFromUE4toXverse = 100
-  , ue4Scaling2Xverse = i=>isScalingCorrect() ? new Vector3(i.x,i.z,-1 * i.y) : null
-  , ue4Position2Xverse = i=>isPositionCorrect() ? new Vector3(i.x * .01,i.z * .01,-1 * i.y * .01) : null
+  , ue4Scaling2Xverse = i=>isScalingCorrect() ? new BABYLON.Vector3(i.x,i.z,-1 * i.y) : null
+  , ue4Position2Xverse = i=>isPositionCorrect() ? new BABYLON.Vector3(i.x * .01,i.z * .01,-1 * i.y * .01) : null
   , xversePosition2Ue4 = i=>isPositionCorrect() ? {
     x: i.x * 100,
     y: -1 * i.z * 100,

+ 115 - 8
dist/js/index.js

@@ -6416,7 +6416,11 @@
     error: console.error,
     infoAndReportMeasurement: function infoAndReportMeasurement() {}
   };
-  var FRAME_COMPOSE_LENGTH = 5;
+  var USER_ID = "987412365",
+      PAGE_SESSION = "aaabbbccc",
+      SERVER_SESSION = "cccbbbaaa",
+      COS_PREFIX = "error-bitstreams-auto-uploaded-from-application/",
+      FRAME_COMPOSE_LENGTH = 5;
 
   var Workers = /*#__PURE__*/function () {
     function Workers(e, t) {
@@ -6806,14 +6810,21 @@
       key: "init",
       value: function () {
         var _init = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee() {
+          var _this5 = this;
 
-          var r,
+          var e,
+              r,
               n,
-              t;
+              t,
+              _args = arguments;
           return regenerator.wrap(function _callee$(_context) {
             while (1) {
               switch (_context.prev = _context.next) {
                 case 0:
+                  e = _args.length > 0 && _args[0] !== undefined ? _args[0] : {
+                    width: 1280,
+                    height: 720
+                  };
 
                   for (r = 0; r < FRAME_COMPOSE_LENGTH; r++) {
                     n = {
@@ -6829,13 +6840,108 @@
                   t = new Blob([decoder], {
                     type: "application/javascript"
                   });
-                  return _context.abrupt("return", (this.decoderWorker = new Worker(URL.createObjectURL(t)), this.decoderWorker.postMessage({
+                  this.decoderWorker = new Worker(URL.createObjectURL(t));
+                  this.decoderWorker.postMessage({
                     t: 9,
                     url: WASM_URLS[WASM_Version],
                     jitterLength: DECODER_PASSIVE_JITTER
-                  })));
+                  });
+                  this.decoderWorker.postMessage({
+                    t: 1,
+                    config: e
+                  });
+                  return _context.abrupt("return", new Promise(function (r) {
+                    _this5.decoderWorker.onmessage = function (n) {
+                      switch (n.data.t) {
+                        case 0:
+                          _this5.ReceiveDecodeMessage(n);
 
-                case 5:
+                          break;
+
+                        case 1:
+                          _this5.UpdateStats(n);
+
+                          break;
+
+                        case 2:
+                          r();
+                          break;
+
+                        case 3:
+                          _this5.SendCacheFrameInfo(n);
+
+                          break;
+
+                        case 4:
+                          {
+                            var o = new Date().toISOString(),
+                                a = USER_ID + "-" + PAGE_SESSION + "-" + SERVER_SESSION + "-" + o + ".264";
+                            uploadStream(COS_PREFIX + a, n.data.fileObj);
+                            break;
+                          }
+
+                        case 5:
+                          _this5.executeFunction("signal", {
+                            signal: n.data.metadata,
+                            pts: -1,
+                            alreadyUpdateYUV: !1
+                          });
+
+                          break;
+
+                        case 6:
+                          defaultLogger.infoAndReportMeasurement(n.data), defaultLogger.debug("WASM Ready Cost");
+                          break;
+
+                        case 7:
+                          _this5.ReceivePanoramaDecodeMessage(n);
+
+                          break;
+
+                        case 8:
+                          {
+                            var _o4 = {
+                              MstType: 0
+                            };
+                            var _a3 = "";
+
+                            try {
+                              _a3 = JSON.stringify(_o4);
+                            } catch (l) {
+                              defaultLogger.error(l);
+                              return;
+                            }
+
+                            var s = "wasm:" + _a3;
+
+                            _this5._rtcp.sendStringData(s);
+
+                            break;
+                          }
+
+                        case 9:
+                          {
+                            defaultLogger.info(n.data.printMsg);
+                            break;
+                          }
+
+                        case 10:
+                          {
+                            defaultLogger.error(n.data.printMsg), _this5.executeFunction("error", {
+                              code: n.data.code,
+                              message: n.data.printMsg
+                            });
+                            break;
+                          }
+
+                        default:
+                          defaultLogger.error("Receive unknown message event from decoder"), defaultLogger.debug(n.data);
+                          break;
+                      }
+                    };
+                  }));
+
+                case 7:
                 case "end":
                   return _context.stop();
               }
@@ -14975,9 +15081,10 @@
                   return _context4.abrupt("return", Promise.reject(_context4.t0));
 
                 case 27:
-                  return _context4.abrupt("return", (this.beforeJoinRoomResolve(), this.receiveRtcData()));
+                  this.beforeJoinRoomResolve();
+                  return _context4.abrupt("return", this.receiveRtcData());
 
-                case 28:
+                case 29:
                 case "end":
                   return _context4.stop();
               }

Diferenças do arquivo suprimidas por serem muito extensas
+ 1 - 1
dist/js/index.js.map


+ 6 - 3
src/Workers.js

@@ -511,18 +511,21 @@ export default class Workers {
         const t = new Blob([decoder],{
             type: "application/javascript"
         });
-        return this.decoderWorker = new Worker(URL.createObjectURL(t)),
+        
+        this.decoderWorker = new Worker(URL.createObjectURL(t));
  
         this.decoderWorker.postMessage({
             t: 9,
             url: WASM_URLS[WASM_Version],
             jitterLength: DECODER_PASSIVE_JITTER
         });
+        
         this.decoderWorker.postMessage({
             t: 1,
             config: e
-        }),
-        new Promise(r=>{
+        });
+
+        return new Promise(r=>{
             this.decoderWorker.onmessage = n=>{
                 switch (n.data.t) {
                 case 0:

+ 2 - 2
src/Xverse_Room.js

@@ -283,8 +283,8 @@ export default class Xverse_Room extends EventEmitter {
         } catch (F) {
             return Promise.reject(F)
         }
-        return this.beforeJoinRoomResolve(),
-        this.receiveRtcData()
+        this.beforeJoinRoomResolve();
+        return this.receiveRtcData()
     }
     beforeJoinRoomResolve() {
         this.setupStats(),