Merge branch 'myrtc' of http://face3d.4dage.com:7005/xushiting/Metaverse into myrtc

src/Workers.js

@@ -1068,6 +1068,7 @@ export default class Workers {
         at: at,
       });
     }
+    console.log("metaverse----IDR:"+copyIDR);
 
     // debugger;
     const down = Date.now();
@@ -1315,10 +1316,10 @@ export default class Workers {
           //console.error("IT", It);
           //console.log("It.data", It.data);
 
-          console.error("IT", fCnt, It);
+          //console.error("IT", fCnt, It);
           testFrame += 1;
           // console.error("IT", fCnt, JSON.stringify(Rt));
-          console.error("traceIds", fCnt, Rt.traceIds.length);
+          //console.error("traceIds", fCnt, Rt.traceIds.length);
           // console.log("IT-fCnt", It.data);
           // const clip = It.data.subarray(It.metaLen, It.metaLen + It.mediaLen);
           // console.log("testFrame", testFrame);
@@ -1337,6 +1338,8 @@ export default class Workers {
           //   `100.${testFrame.padLeft(4,'0')}.h264`,
           //   "application/octet-stream"
           // );
+          //console.log("metaverse----", Rt.newUserStates[0].playerState.camera.angle.yaw);
+          //console.log("metaverse Worker----", `100.${testFrame.padLeft(4,'0')}`, copyIDR);
           // this.downloadBlob(
           //   It.data.subarray(0, It.metaLen),
           //   `100.${testFrame.padLeft(4,'0')}.json`,

src/v2Decoder/index.js

@@ -409,8 +409,12 @@ if ("function" === typeof importScripts) {
 
   Decoder.prototype.procBufItem = function (index) {
     this.dumpJitterBufInfo("Entering Decoder.prototype.procBufItem");
-    console.log(
-      "[][Core][WASM], pts: %s, isIDR: %s, length: %s",
+    // console.log("[][Core][WASM], pts: %s, isIDR: %s, length: %s",
+    //   mediaArray[index].pts,
+    //   mediaArray[index].isIDR,
+    //   mediaArray[index].media.length
+    // );
+    console.log("metaverse----core, pts: %s, isIDR: %s, length: %s",
       mediaArray[index].pts,
       mediaArray[index].isIDR,
       mediaArray[index].media.length
@@ -741,7 +745,7 @@ if ("function" === typeof importScripts) {
     printConsole.log("Going to open decoder " + String(Date.now()));
     var ret0 = Module._openDecoder(0, decoder_type, LOG_LEVEL_WASM);
     if (ret0 == 0) {
-      self.decoder.startDecoding();
+      self.decoder.startDecoding();                                                                     //开始解码
       self.postMessage({
         t: MessageEvent.WASMReady,
         wasm_ready: true,
@@ -788,17 +792,38 @@ if ("function" === typeof importScripts) {
 
   Decoder.prototype.isIFrame = function (isIDR, mediaLen) {
     // return data.isIDR && media.byteLength !=0
-    return isIDR && mediaLen != 0;
+    let flag =  isIDR && mediaLen != 0;
+    if(flag){
+      console.log('metaverse---------是IFrame');
+    }
+    else{
+      console.log('metaverse---------不是IFrame');
+    }
+    return flag;
   };
 
   Decoder.prototype.isPFrame = function (isIDR, mediaLen) {
     // return !data.isIDR && media.byteLength !=0
-    return !isIDR && mediaLen != 0;
+    let flag = !isIDR && mediaLen != 0;
+    if(flag){
+      console.log('metaverse---------是PFrame');
+    }
+    else{
+      console.log('metaverse---------不是PFrame');
+    }
+    return flag;
   };
 
   Decoder.prototype.isPureMeta = function (metaLen, mediaLen) {
     // return media.byteLength == 0 && meta.byteLength !=0
-    return mediaLen == 0 && metaLen != 0;
+    let flag = mediaLen == 0 && metaLen != 0;
+    if(flag){
+      console.log('metaverse---------是PureMeta');
+    }
+    else{
+      console.log('metaverse---------不是PureMeta');
+    }
+    return flag;
   };
 
   Decoder.prototype.isInvalidPkt = function (isIDR, mediaLen, metaLen) {
@@ -849,7 +874,7 @@ if ("function" === typeof importScripts) {
     var pts = data.frameCnt;
     var meta = data.data.subarray(0, data.metaLen);
     var media;
-
+    
     if (data.cached) {
       media = IFrameCacheBuffer[JSON.stringify(data.position)][key];
     } else if (data.cacheRequest) {
@@ -860,7 +885,6 @@ if ("function" === typeof importScripts) {
     }
 
     // console.log("[xmedia] media1", media);
-
     // this.updateMediaMetaStats(data);
 
     if (this.isFirstFrame) {
@@ -1038,6 +1062,7 @@ if ("function" === typeof importScripts) {
     }
   };
 
+  /*
   Decoder.prototype.decodePanorama = function (data) {
     console.log("upload pano data");
     var content = data.data.data;
@@ -1161,9 +1186,11 @@ if ("function" === typeof importScripts) {
       return 1;
     }
   };
+  */
 
   Decoder.prototype.decodeFrame = function (data) {
     var content = data.media;
+    
     if (typeof content == "undefined") {
       printConsole.error("null content in decoder", "5999");
       return;
@@ -1176,7 +1203,7 @@ if ("function" === typeof importScripts) {
     const index = data.frameCnt % CACHE_BUF_LENGTH;
     mediaArray[index].decode_ts = Date.now();
     var objData;
-
+    
     // debugger
     if (content_size != 0) {
       // var date = Date.now()
@@ -1198,6 +1225,7 @@ if ("function" === typeof importScripts) {
       let start_ts = Date.now();
       let ret = 0;
       try {
+        console.log('metaverse----WASM:cacheBuffer:'+cacheBuffer+',content_size:'+content_size+',resultBuffer:'+resultBuffer);
         ret = Module._decodeData(
           0,
           data.frameCnt,