xushiting 3 rokov pred
rodič
commit
ecdcb15fb2
6 zmenil súbory, kde vykonal 693 pridanie a 2217 odobranie
  1. 5 5
      src/Logger.js
  2. 1 1
      src/ModelManager.js
  3. 11 0
      src/Rtcp.js
  4. 11 0
      src/Workers.js
  5. 0 1356
      src/v2Decoder/decoder-origin.js
  6. 665 855
      src/v2Decoder/index.js

+ 5 - 5
src/Logger.js

@@ -15,18 +15,18 @@ export default class Logger{
         Logger.instance = DEFAULT_LOGGER;
     }
     debug(...d) {
-        return Logger.instance.debug(...d)
+        //return Logger.instance.debug(...d)
     }
     info(...d) {
-        return Logger.instance.info(...d)
+        //return Logger.instance.info(...d)
     }
     warn(...d) {
-        return Logger.instance.warn(...d)
+        //return Logger.instance.warn(...d)
     }
     error(...d) {
-        return Logger.instance.error(...d)
+        //return Logger.instance.error(...d)
     }
     infoAndReportMeasurement(...d) {
-        return Logger.instance.infoAndReportMeasurement(...d)
+        //return Logger.instance.infoAndReportMeasurement(...d)
     }
 };

+ 1 - 1
src/ModelManager.js

@@ -46,7 +46,7 @@ export default class ModelManager{
         }
     }
     async findPath(o, s) {
-        console.trace("findPath", s);
+        //console.trace("findPath", s);
         const _ = (await this.findSkinConfig(o)).pathList.find(b=>b.id === s);
         if (!_) {
             const b = `find path failed: skinId: ${o}, pathName: ${s}`;

+ 11 - 0
src/Rtcp.js

@@ -227,6 +227,17 @@ export default class Rtcp extends EventEmitter {
         let c = "";
         try {
             c = JSON.stringify(s)
+            if(s.action_type != 1009 && s.action_type != 1024){
+                if(s.action_type == 1030){
+                    console.log('发送:action_type:'+s.action_type+',trace_id:'+s.trace_id+',joystick_action'+JSON.stringify(s.joystick_action)+',时间:'+new Date().getTime());
+                }
+                else if(s.action_type == 15){
+                    console.log('发送:action_type:'+s.action_type+',trace_id:'+s.trace_id+',joystick_action'+JSON.stringify(s.joystick_action)+',时间:'+new Date().getTime());
+                }
+                else{
+                    console.log('发送:action_type:'+s.action_type+',trace_id:'+s.trace_id+',时间:'+new Date().getTime());
+                }
+            }
         } catch (_) {
             logger.error(_);
             return

+ 11 - 0
src/Workers.js

@@ -665,6 +665,17 @@ export default class Workers {
                       });
                       break
                   }
+            case 11:
+                    if( _.data.mediaLength != 0){
+                        console.log("pts: %s, isIDR: %s, length: %s, traceIds: %s, time: %s",
+                        _.data.pts,
+                        _.data.isIDR,
+                        _.data.mediaLength,
+                        _.data.traceIds,
+                        new Date().getTime()
+                    );
+                    }
+                  break;
               default:
                   logger.error("Receive unknown message event from decoder"),
                   logger.debug(_.data);

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 1356
src/v2Decoder/decoder-origin.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 665 - 855
src/v2Decoder/index.js