Merge pull request Dash-Industry-Forum#2844 from Orange-OpenSource/updateMetrics

Update metrics

Author: epiclabsDASH

src/dash/DashMetrics.js

@@ -44,10 +44,17 @@ function DashMetrics(config) {
     let dashManifestModel = config.dashManifestModel;
     let manifestModel = config.manifestModel;
 
+    function getPeriod(periodId) {
+        const manifest = manifestModel.getValue();
+        if (!manifest) {
+            return -1;
+        }
+        return manifest.Period_asArray[periodId];
+    }
+
     function getBandwidthForRepresentation(representationId, periodId) {
         let representation;
-        const manifest = manifestModel.getValue();
-        let period = manifest.Period_asArray[periodId];
+        let period = getPeriod(periodId);
 
         representation = findRepresentation(period, representationId);
 
@@ -58,20 +65,16 @@ function DashMetrics(config) {
         return representation.bandwidth;
     }
 
-
     /**
      *
      * @param {string} representationId
      * @param {number} periodIdx
      * @returns {*}
      */
     function getIndexForRepresentation(representationId, periodIdx) {
-        let representationIndex;
-        const manifest = manifestModel.getValue();
-        let period = manifest.Period_asArray[periodIdx];
+        let period = getPeriod(periodIdx);
 
-        representationIndex = findRepresentationIndex(period, representationId);
-        return representationIndex;
+        return findRepresentationIndex(period, representationId);
     }
 
     /**
@@ -84,15 +87,9 @@ function DashMetrics(config) {
      * @instance
      */
     function getMaxIndexForBufferType(bufferType, periodIdx) {
-        let maxIndex;
-        const manifest = manifestModel.getValue();
-        if (!manifest) {
-            return -1;
-        }
-        let period = manifest.Period_asArray[periodIdx];
+        let period = getPeriod(periodIdx);
 
-        maxIndex = findMaxBufferIndex(period, bufferType);
-        return maxIndex;
+        return findMaxBufferIndex(period, bufferType);
     }
 
     /**
@@ -203,17 +200,11 @@ function DashMetrics(config) {
 
         const list = metrics[metricName];
 
-        if (!list) {
-            return null;
-        }
-
-        const length = list.length;
-
-        if (length <= 0) {
+        if (!list || list.length <= 0) {
             return null;
         }
 
-        return list[length - 1];
+        return list[list.length - 1];
     }
 
     /**

src/streaming/MediaPlayer.js

@@ -241,9 +241,6 @@ function MediaPlayer() {
         adapter.setConfig({
             dashManifestModel: dashManifestModel
         });
-        metricsModel.setConfig({
-            adapter: adapter
-        });
 
         restoreDefaultUTCTimingSources();
         setAutoPlay(AutoPlay !== undefined ? AutoPlay : true);

src/streaming/metrics/MetricsReporting.js

@@ -38,9 +38,8 @@ import ReportingFactory from './reporting/ReportingFactory';
 function MetricsReporting() {
 
     let context = this.context;
-    let instance;
-
-    let dvbErrorsTranslator;
+    let instance,
+        dvbErrorsTranslator;
 
     /**
      * Create a MetricsCollectionController, and a DVBErrorsTranslator

src/streaming/metrics/reporting/reporters/DVBReporting.js

@@ -37,19 +37,26 @@ function DVBReporting(config) {
     let instance;
 
     let context = this.context;
-    let metricSerialiser = MetricSerialiser(context).getInstance();
-    let randomNumberGenerator = RNG(context).getInstance();
+    let metricSerialiser,
+        randomNumberGenerator,
+        reportingPlayerStatusDecided,
+        isReportingPlayer,
+        reportingUrl,
+        rangeController;
 
     let USE_DRAFT_DVB_SPEC = true;
-    let isReportingPlayer = false;
-    let reportingPlayerStatusDecided = false;
-    let reportingUrl = null;
-    let rangeController = null;
     let allowPendingRequestsToCompleteOnReset = true;
     let pendingRequests = [];
 
     const metricsConstants = config.metricsConstants;
 
+    function setup() {
+        metricSerialiser = MetricSerialiser(context).getInstance();
+        randomNumberGenerator = RNG(context).getInstance();
+
+        resetInitialSettings();
+    }
+
     function doGetRequest(url, successCB, failureCB) {
         let req = new XMLHttpRequest();
         const oncomplete = function () {
@@ -159,16 +166,20 @@ function DVBReporting(config) {
         }
     }
 
+    function resetInitialSettings() {
+        reportingPlayerStatusDecided = false;
+        isReportingPlayer = false;
+        reportingUrl = null;
+        rangeController = null;
+    }
+
     function reset() {
         if (!allowPendingRequestsToCompleteOnReset) {
             pendingRequests.forEach(req => req.abort());
             pendingRequests = [];
         }
 
-        reportingPlayerStatusDecided = false;
-        isReportingPlayer = false;
-        reportingUrl = null;
-        rangeController = null;
+        resetInitialSettings();
     }
 
     instance = {
@@ -177,6 +188,8 @@ function DVBReporting(config) {
         reset:      reset
     };
 
+    setup();
+
     return instance;
 }
 

src/streaming/metrics/utils/DVBErrorsTranslator.js

@@ -35,11 +35,10 @@ import MetricsReportingEvents from '../MetricsReportingEvents';
 function DVBErrorsTranslator(config) {
 
     config = config || {};
-    let instance;
-    let eventBus = config.eventBus;
-    let metricModel = config.metricsModel;
-    let mpd;
-
+    let instance,
+        mpd;
+    const eventBus = config.eventBus;
+    const metricModel = config.metricsModel;
     const metricsConstants = config.metricsConstants;
     //MediaPlayerEvents have been added to Events in MediaPlayer class
     const Events = config.events;

src/streaming/models/MetricsModel.js

@@ -31,7 +31,6 @@
 import Constants from '../constants/Constants';
 import MetricsConstants from '../constants/MetricsConstants';
 import MetricsList from '../vo/MetricsList';
-import TCPConnection from '../vo/metrics/TCPConnection';
 import {HTTPRequest, HTTPRequestTrace} from '../vo/metrics/HTTPRequest';
 import TrackSwitch from '../vo/metrics/RepresentationSwitch';
 import BufferLevel from '../vo/metrics/BufferLevel';
@@ -59,10 +58,6 @@ function MetricsModel() {
         streamMetrics = {};
     }
 
-    function setConfig(config) {
-        if (!config) return;
-    }
-
     function metricsChanged() {
         eventBus.trigger(Events.METRICS_CHANGED);
     }
@@ -121,20 +116,6 @@ function MetricsModel() {
         }
     }
 
-    function addTcpConnection(mediaType, tcpid, dest, topen, tclose, tconnect) {
-        let vo = new TCPConnection();
-
-        vo.tcpid = tcpid;
-        vo.dest = dest;
-        vo.topen = topen;
-        vo.tclose = tclose;
-        vo.tconnect = tconnect;
-
-        pushAndNotify(mediaType, MetricsConstants.TCP_CONNECTION, vo);
-
-        return vo;
-    }
-
     function appendHttpTrace(httpRequest, s, d, b) {
         let vo = new HTTPRequestTrace();
 
@@ -211,8 +192,6 @@ function MetricsModel() {
         }
 
         pushAndNotify(mediaType, MetricsConstants.HTTP_REQUEST, vo);
-
-        return vo;
     }
 
     function addRepresentationSwitch(mediaType, t, mt, to, lto) {
@@ -229,8 +208,6 @@ function MetricsModel() {
         }
 
         pushAndNotify(mediaType, MetricsConstants.TRACK_SWITCH, vo);
-
-        return vo;
     }
 
     function pushAndNotify(mediaType, metricType, metricObject) {
@@ -244,8 +221,6 @@ function MetricsModel() {
         vo.level = level;
 
         pushAndNotify(mediaType, MetricsConstants.BUFFER_LEVEL, vo);
-
-        return vo;
     }
 
     function addBufferState(mediaType, state, target) {
@@ -254,8 +229,6 @@ function MetricsModel() {
         vo.state = state;
 
         pushAndNotify(mediaType, MetricsConstants.BUFFER_STATE, vo);
-
-        return vo;
     }
 
     function addDVRInfo(mediaType, currentTime, mpd, range) {
@@ -265,8 +238,6 @@ function MetricsModel() {
         vo.manifestInfo = mpd;
 
         pushAndNotify(mediaType, MetricsConstants.DVR_INFO, vo);
-
-        return vo;
     }
 
     function addDroppedFrames(mediaType, quality) {
@@ -277,12 +248,10 @@ function MetricsModel() {
         vo.droppedFrames = quality.droppedVideoFrames;
 
         if (list.length > 0 && list[list.length - 1] == vo) {
-            return list[list.length - 1];
+            return;
         }
 
         pushAndNotify(mediaType, MetricsConstants.DROPPED_FRAMES, vo);
-
-        return vo;
     }
 
     function addSchedulingInfo(mediaType, t, type, startTime, availabilityStartTime, duration, quality, range, state) {
@@ -301,8 +270,6 @@ function MetricsModel() {
         vo.state = state;
 
         pushAndNotify(mediaType, MetricsConstants.SCHEDULING_INFO, vo);
-
-        return vo;
     }
 
     function addRequestsQueue(mediaType, loadingRequests, executedRequests) {
@@ -330,8 +297,6 @@ function MetricsModel() {
 
         pushMetrics(Constants.STREAM, MetricsConstants.MANIFEST_UPDATE, vo);
         metricAdded(mediaType, MetricsConstants.MANIFEST_UPDATE, vo);
-
-        return vo;
     }
 
     function updateManifestUpdateInfo(manifestUpdate, updatedFields) {
@@ -355,10 +320,7 @@ function MetricsModel() {
 
             manifestUpdate.streamInfo.push(vo);
             metricUpdated(manifestUpdate.mediaType, MetricsConstants.MANIFEST_UPDATE_STREAM_INFO, manifestUpdate);
-
-            return vo;
         }
-        return null;
     }
 
     function addManifestUpdateRepresentationInfo(manifestUpdate, id, index, streamIndex, mediaType, presentationTimeOffset, startNumber, fragmentInfoType) {
@@ -375,10 +337,7 @@ function MetricsModel() {
 
             manifestUpdate.representationInfo.push(vo);
             metricUpdated(manifestUpdate.mediaType, MetricsConstants.MANIFEST_UPDATE_TRACK_INFO, manifestUpdate);
-
-            return vo;
         }
-        return null;
     }
 
     function addPlayList(vo) {
@@ -395,24 +354,19 @@ function MetricsModel() {
         }
 
         pushAndNotify(type, MetricsConstants.PLAY_LIST, vo);
-
-        return vo;
     }
 
     function addDVBErrors(vo) {
         let type = Constants.STREAM;
 
         pushAndNotify(type, MetricsConstants.DVB_ERRORS, vo);
-
-        return vo;
     }
 
     instance = {
         clearCurrentMetricsForType: clearCurrentMetricsForType,
         clearAllCurrentMetrics: clearAllCurrentMetrics,
         getReadOnlyMetricsFor: getReadOnlyMetricsFor,
         getMetricsFor: getMetricsFor,
-        addTcpConnection: addTcpConnection,
         addHttpRequest: addHttpRequest,
         addRepresentationSwitch: addRepresentationSwitch,
         addBufferLevel: addBufferLevel,
@@ -426,8 +380,7 @@ function MetricsModel() {
         addManifestUpdateStreamInfo: addManifestUpdateStreamInfo,
         addManifestUpdateRepresentationInfo: addManifestUpdateRepresentationInfo,
         addPlayList: addPlayList,
-        addDVBErrors: addDVBErrors,
-        setConfig: setConfig
+        addDVBErrors: addDVBErrors
     };
 
     setup();

src/streaming/net/HTTPLoader.js

@@ -124,6 +124,10 @@ function HTTPLoader(cfg) {
                         httpRequest.response ? httpRequest.response.responseHeaders : [],
                     success ? traces : null
                 );
+
+                if (request.type === HTTPRequest.MPD_TYPE) {
+                    metricsModel.addManifestUpdate('stream', request.type, request.requestStartDate, request.requestEndDate);
+                }
             }
         };