feat: 'dev/bound-rtp.js'

Author: arthur

Gruntfile.js

@@ -51,7 +51,8 @@ module.exports = function(grunt) {
                     'dev/remote-candidate.js',
                     'dev/dataSentReceived.js',
                     'dev/ssrc.js',
-                    'dev/tail.js'
+                    'dev/bound-rtp.js',
+                    'dev/tail.js',
                 ],
                 dest: 'getStats.js',
             },

dev/bound-rtp.js

@@ -8,16 +8,16 @@
  * @param {*} result
  */
 getStatsParser.boundRtp = function(result) {
-  
-  if (result.type == 'inbound-rtp') {
-    creatVideoCounter('nackCount', 'recv', '+', 1, 'googNacksReceived');
-    creatVideoCounter('pliCount', 'recv', '+', 1, 'googPlisReceived');
-    creatVideoCounter('firCount', 'recv', '+', 1, 'googFirsReceived');
-  }
 
-  if (result.type == 'outbound-rtp') {
-    creatVideoCounter('nackCount', 'send', '+', 1, 'googNacksSent');
-    creatVideoCounter('pliCount', 'send', '+', 1, 'googPlisSent');
-    creatVideoCounter('firCount', 'send', '+', 1, 'googFirsSent');
-  }
-}
+    if (result.type == 'inbound-rtp') {
+        creatVideoCounter('nackCount', 'recv', '+', 1, 'googNacksReceived');
+        creatVideoCounter('pliCount', 'recv', '+', 1, 'googPlisReceived');
+        creatVideoCounter('firCount', 'recv', '+', 1, 'googFirsReceived');
+    }
+
+    if (result.type == 'outbound-rtp') {
+        creatVideoCounter('nackCount', 'send', '+', 1, 'googNacksSent');
+        creatVideoCounter('pliCount', 'send', '+', 1, 'googPlisSent');
+        creatVideoCounter('firCount', 'send', '+', 1, 'googFirsSent');
+    }
+}

dev/globals.js

@@ -132,7 +132,7 @@ function creatVideoCounter(paramName, type, op, scale, userFiled) {
     // 当参数合并后，根据 googNacksSent 来判断recv/send Kb Mb Gb
     if (!!result[paramName] && result[paramName] !== '0') {
         var Count = 0;
-        if (!getStatsResult.internal.video[type]['prev' + paramName] || getStatsResult.internal.video[type]['prev' + paramName]> result[paramName]) {
+        if (!getStatsResult.internal.video[type]['prev' + paramName] || getStatsResult.internal.video[type]['prev' + paramName] > result[paramName]) {
             getStatsResult.internal.video[type]['prev' + paramName] = result[paramName];
         }
         if ((op || '+') === '+') {

getStats.js

@@ -1,6 +1,6 @@
 'use strict';
 
-// Last time updated: 2018-11-26 6:19:49 AM UTC
+// Last time updated: 2018-12-10 7:33:37 AM UTC
 
 // _______________
 // getStats v1.0.10
@@ -45,13 +45,19 @@ window.getStats = function(mediaStreamTrack, callback, interval) {
                 tracks: [],
                 codecs: [],
                 availableBandwidth: 0,
-                streams: 0
+                streams: 0,
+                googNacksSent: 0,
+                googPlisSent: 0,
+                googFirsReceived: 0
             },
             recv: {
                 tracks: [],
                 codecs: [],
                 availableBandwidth: 0,
-                streams: 0
+                streams: 0,
+                googNacksReceived: 0,
+                googPlisReceived: 0,
+                googFirsReceived: 0
             },
             bytesSent: 0,
             bytesReceived: 0
@@ -130,6 +136,32 @@ window.getStats = function(mediaStreamTrack, callback, interval) {
         }
     };
 
+    /**
+     * Video Counter helper function
+     * @param {*} paramName
+     * @param {*} op - default `+`
+     * @param {*} scale - default 1
+     * @param {*} userFiled - default paramName
+     * @returns {NULL}
+     */
+    function creatVideoCounter(paramName, type, op, scale, userFiled) {
+        // 当参数合并后，根据 googNacksSent 来判断recv/send Kb Mb Gb
+        if (!!result[paramName] && result[paramName] !== '0') {
+            var Count = 0;
+            if (!getStatsResult.internal.video[type]['prev' + paramName] || getStatsResult.internal.video[type]['prev' + paramName] > result[paramName]) {
+                getStatsResult.internal.video[type]['prev' + paramName] = result[paramName];
+            }
+            if ((op || '+') === '+') {
+                Count = result[paramName] + getStatsResult.internal.video[type]['prev' + paramName];
+            } else {
+                Count = result[paramName] - getStatsResult.internal.video[type]['prev' + paramName];
+            }
+            getStatsResult.internal.video[type]['prev' + paramName] = result[paramName];
+            return getStatsResult.video[type][userFiled || paramName] = Count * (scale || 1);
+        }
+        return;
+    }
+
     function preHandler(result) {
         // 根据codeId\trackId映射 - 处理关联关系
         var idMap = result.reduce(function(map, item) {
@@ -649,10 +681,30 @@ window.getStats = function(mediaStreamTrack, callback, interval) {
         if (SSRC[result.mediaType][sendrecvType].indexOf(result.ssrc) === -1) {
             SSRC[result.mediaType][sendrecvType].push(result.ssrc)
         }
-
+        creatVideoCounter('googNacksSent', 'send');
+        creatVideoCounter('googPlisSent', 'send');
+        creatVideoCounter('googFirsSent', 'send');
+        creatVideoCounter('googNacksReceived', 'recv');
+        creatVideoCounter('googPlisReceived', 'recv');
+        creatVideoCounter('googFirsReceived', 'recv');
         getStatsResult[result.mediaType][sendrecvType].streams = SSRC[result.mediaType][sendrecvType].length;
     };
 
+    getStatsParser.boundRtp = function(result) {
+
+        if (result.type == 'inbound-rtp') {
+            creatVideoCounter('nackCount', 'recv', '+', 1, 'googNacksReceived');
+            creatVideoCounter('pliCount', 'recv', '+', 1, 'googPlisReceived');
+            creatVideoCounter('firCount', 'recv', '+', 1, 'googFirsReceived');
+        }
+
+        if (result.type == 'outbound-rtp') {
+            creatVideoCounter('nackCount', 'send', '+', 1, 'googNacksSent');
+            creatVideoCounter('pliCount', 'send', '+', 1, 'googPlisSent');
+            creatVideoCounter('firCount', 'send', '+', 1, 'googFirsSent');
+        }
+    }
+
     getStatsLooper();
 
 };