Feature/performance optimizations light (#4590)

* Webpack optimizations * Reset BOLA rule parameters after stream switch * Resetting additional classes * WiP: Additional memory optimisations * Add back adaptation to Representation * Minor edits
Dash-Industry-Forum · Oct 10, 2024 · 0f76359 · 0f76359
1 parent c070f5b
commit 0f76359
Show file tree

Hide file tree

Showing 16 changed files with 140 additions and 40 deletions.
diff --git a/build/webpack.base.cjs b/build/webpack.base.cjs
@@ -6,24 +6,26 @@ const commonConfig = {
     target: ['web', 'es5'],
     module: {
         rules: [
-            {
-                test: /\.(js)$/,
-                loader: 'string-replace-loader',
-                options: {
-                    search: '__VERSION__',
-                    replace: pkg.version,
-                }
-            },
             {
                 test: /\.(js)$/,
                 use: [
                     {
-                        loader: `babel-loader`,
-                        options: { presets: ['@babel/env'] }
-                    }
-                ]
-            }
-        ]
+                        loader: 'string-replace-loader',
+                        options: {
+                            search: '__VERSION__',
+                            replace: pkg.version,
+                        },
+                    },
+                    {
+                        loader: 'babel-loader',
+                        options: {
+                            targets: 'defaults',
+                            presets: ['@babel/preset-env']
+                        },
+                    },
+                ],
+            },
+        ],
     },
     //Webpack 5 no longer polyfills Node.js core modules automatically
     resolve: {

diff --git a/src/dash/controllers/RepresentationController.js b/src/dash/controllers/RepresentationController.js
@@ -76,6 +76,7 @@ function RepresentationController(config) {
     }
 
     function resetInitialSettings() {
+        currentVoRepresentation = null;
         voAvailableRepresentations = [];
     }
 

diff --git a/src/streaming/FragmentLoader.js b/src/streaming/FragmentLoader.js
@@ -153,18 +153,26 @@ function FragmentLoader(config) {
         }
     }
 
+    function resetInitialSettings() {
+        if (urlLoader) {
+            urlLoader.resetInitialSettings();
+        }
+    }
+
     function reset() {
         if (urlLoader) {
             urlLoader.abort();
+            urlLoader.reset();
             urlLoader = null;
         }
     }
 
     instance = {
+        abort,
         checkForExistence,
         load,
-        abort,
-        reset
+        reset,
+        resetInitialSettings
     };
 
     setup();

diff --git a/src/streaming/SourceBufferSink.js b/src/streaming/SourceBufferSink.js
@@ -164,7 +164,7 @@ function SourceBufferSink(config) {
         return type;
     }
 
-    function _removeEventListeners() {
+    function removeEventListeners() {
         try {
             if (typeof buffer.removeEventListener === 'function') {
                 buffer.removeEventListener('updateend', _updateEndHandler, false);
@@ -243,7 +243,7 @@ function SourceBufferSink(config) {
         if (buffer) {
             try {
                 callbacks = [];
-                _removeEventListeners();
+                removeEventListeners();
                 isAppendingInProgress = false;
                 appendQueue = [];
                 if (!buffer.getClassName || buffer.getClassName() !== 'TextSourceBuffer') {
@@ -477,6 +477,7 @@ function SourceBufferSink(config) {
         initializeForFirstUse,
         initializeForStreamSwitch,
         remove,
+        removeEventListeners,
         reset,
         updateAppendWindow,
         updateTimestampOffset,

diff --git a/src/streaming/controllers/AbrController.js b/src/streaming/controllers/AbrController.js
@@ -847,8 +847,11 @@ function AbrController() {
         if (abandonmentStateDict[streamId]) {
             delete abandonmentStateDict[streamId];
         }
+
+        abrRulesCollection.clearDataForStream(streamId);
     }
 
+
     instance = {
         checkPlaybackQuality,
         clearDataForStream,

diff --git a/src/streaming/controllers/BufferController.js b/src/streaming/controllers/BufferController.js
@@ -1256,12 +1256,16 @@ function BufferController(config) {
         if (sourceBufferSink) {
             let tmpSourceBufferSinkToReset = sourceBufferSink;
             sourceBufferSink = null;
-            if (!errored && !keepBuffers) {
-                tmpSourceBufferSinkToReset.abort()
-                    .then(() => {
-                        tmpSourceBufferSinkToReset.reset(keepBuffers);
-                        tmpSourceBufferSinkToReset = null;
-                    });
+            if (!errored) {
+                if (!keepBuffers) {
+                    tmpSourceBufferSinkToReset.abort()
+                        .then(() => {
+                            tmpSourceBufferSinkToReset.reset(keepBuffers);
+                            tmpSourceBufferSinkToReset = null;
+                        });
+                } else {
+                    tmpSourceBufferSinkToReset.removeEventListeners();
+                }
             }
         }
 

diff --git a/src/streaming/controllers/StreamController.js b/src/streaming/controllers/StreamController.js
@@ -1225,6 +1225,7 @@ function StreamController() {
             if (!shouldKeepStream) {
                 logger.debug(`Removing stream ${stream.getId()}`);
                 stream.reset(true);
+                stream = null;
             }
 
             return shouldKeepStream;

diff --git a/src/streaming/models/FragmentModel.js b/src/streaming/models/FragmentModel.js
@@ -328,6 +328,9 @@ function FragmentModel(config) {
     function resetInitialSettings() {
         executedRequests = [];
         loadingRequests = [];
+        if (fragmentLoader) {
+            fragmentLoader.resetInitialSettings();
+        }
     }
 
     function reset() {

diff --git a/src/streaming/net/FetchLoader.js b/src/streaming/net/FetchLoader.js
@@ -389,6 +389,10 @@ function FetchLoader() {
         }
     }
 
+    function reset() {
+
+    }
+
     /**
      * Default throughput calculation
      * @param downloadedData
@@ -473,10 +477,11 @@ function FetchLoader() {
     }
 
     instance = {
-        load,
         abort,
+        calculateDownloadedTime,
+        load,
+        reset,
         setConfig,
-        calculateDownloadedTime
     };
 
     return instance;

diff --git a/src/streaming/net/HTTPLoader.js b/src/streaming/net/HTTPLoader.js
@@ -680,10 +680,32 @@ function HTTPLoader(cfg) {
         httpRequests = [];
     }
 
+    function resetInitialSettings() {
+        if (xhrLoader) {
+            xhrLoader.resetInitialSettings();
+        }
+    }
+
+    function reset() {
+        httpRequests = [];
+        delayedRequests = [];
+        retryRequests = [];
+        if (xhrLoader) {
+            xhrLoader.reset();
+        }
+        if (fetchLoader) {
+            fetchLoader.reset();
+        }
+        xhrLoader = null;
+        fetchLoader = null;
+    }
+
     instance = {
-        load,
         abort,
-        setConfig
+        load,
+        reset,
+        resetInitialSettings,
+        setConfig,
     };
 
     setup();

diff --git a/src/streaming/net/SchemeLoaderFactory.js b/src/streaming/net/SchemeLoaderFactory.js
@@ -79,11 +79,11 @@ function SchemeLoaderFactory() {
     setup();
 
     instance = {
-        getLoader: getLoader,
-        registerLoader: registerLoader,
-        unregisterLoader: unregisterLoader,
-        unregisterAllLoader: unregisterAllLoader,
-        reset: reset
+        getLoader,
+        registerLoader,
+        unregisterLoader,
+        unregisterAllLoader,
+        reset
     };
 
     return instance;

diff --git a/src/streaming/net/URLLoader.js b/src/streaming/net/URLLoader.js
@@ -36,7 +36,7 @@ import SchemeLoaderFactory from '../../streaming/net/SchemeLoaderFactory.js';
  * @description  Call Offline Loader or Online Loader depending on URL
  * @param {Object} cfg - dependencies
  * @ignore
-*/
+ */
 function URLLoader(cfg) {
 
     cfg = cfg || {};
@@ -71,14 +71,35 @@ function URLLoader(cfg) {
             loader.abort();
         }
     }
+
+    function resetInitialSettings() {
+        if (loader && typeof loader.resetInitialSettings === 'function') {
+            loader.resetInitialSettings();
+        }
+    }
+
+    function reset() {
+        if (schemeLoaderFactory) {
+            schemeLoaderFactory.reset();
+            schemeLoaderFactory = null;
+        }
+        if (loader && typeof loader.reset === 'function') {
+            loader.reset();
+        }
+        loader = null;
+    }
+
     instance = {
-        load: load,
-        abort: abort
+        abort,
+        load,
+        reset,
+        resetInitialSettings
     };
 
     return instance;
 
 }
+
 URLLoader.__dashjs_factory_name = 'URLLoader';
 
 const factory = FactoryMaker.getClassFactory(URLLoader);

diff --git a/src/streaming/net/XHRLoader.js b/src/streaming/net/XHRLoader.js
@@ -47,6 +47,7 @@ function XHRLoader() {
      * @param {CommonMediaResponse} httpResponse
      */
     function load(httpRequest, httpResponse) {
+        xhr = null;
         xhr = new XMLHttpRequest();
         xhr.open(httpRequest.method, httpRequest.url, true);
 
@@ -66,7 +67,7 @@ function XHRLoader() {
         xhr.withCredentials = httpRequest.credentials === 'include';
         xhr.timeout = httpRequest.timeout;
 
-        xhr.onload = function() {
+        xhr.onload = function () {
             httpResponse.url = this.responseURL;
             httpResponse.status = this.status;
             httpResponse.statusText = this.statusText;
@@ -85,18 +86,32 @@ function XHRLoader() {
     }
 
     function abort() {
-        xhr.onloadend = xhr.onerror = xhr.onprogress = null; // Ignore events from aborted requests.
-        xhr.abort();
+        if (xhr) {
+            xhr.onloadend = xhr.onerror = xhr.onprogress = xhr.onload = null; // Remove event listeners
+            xhr.abort();
+            xhr = null;
+        }
     }
 
     function getXhr() {
         return xhr
     }
 
+    function resetInitialSettings() {
+        abort();
+    }
+
+    function reset() {
+        abort();
+        instance = null;
+    }
+
     instance = {
         load,
         abort,
-        getXhr
+        getXhr,
+        reset,
+        resetInitialSettings
     };
 
     return instance;

diff --git a/src/streaming/rules/abr/ABRRulesCollection.js b/src/streaming/rules/abr/ABRRulesCollection.js
@@ -279,6 +279,14 @@ function ABRRulesCollection(config) {
         eventBus.off(Events.SETTING_UPDATED_ABR_ACTIVE_RULES, _onAbrSettingsActiveRulesUpdated, instance);
     }
 
+    function clearDataForStream(streamId) {
+        [qualitySwitchRules, abandonFragmentRules].forEach(rules => {
+            if (rules && rules.length) {
+                rules.forEach(rule => rule.clearDataForStream && typeof rule.clearDataForStream === 'function' && rule.clearDataForStream(streamId));
+            }
+        });
+    }
+
     function getQualitySwitchRules() {
         return qualitySwitchRules;
     }
@@ -300,6 +308,7 @@ function ABRRulesCollection(config) {
     }
 
     instance = {
+        clearDataForStream,
         getAbandonFragmentRules,
         getBestPossibleSwitchRequest,
         getBolaState,

diff --git a/src/streaming/rules/abr/BolaRule.js b/src/streaming/rules/abr/BolaRule.js
@@ -601,6 +601,7 @@ function BolaRule(config) {
         const mediaType = rulesContext.getMediaType();
         const streamId = rulesContext.getStreamInfo().id;
         if (!bolaStateDict[streamId]) {
+            bolaStateDict = {};
             bolaStateDict[streamId] = {};
         }
         let bolaState = bolaStateDict[streamId][mediaType];

diff --git a/test/unit/test/streaming/streaming.models.FragmentModel.js b/test/unit/test/streaming/streaming.models.FragmentModel.js
@@ -10,6 +10,7 @@ import DashMetricsMock from '../../mocks/DashMetricsMock.js';
 import chai from 'chai';
 import spies from 'chai-spies';
 import sinon from 'sinon';
+
 const expect = chai.expect;
 
 chai.use(spies);
@@ -62,6 +63,9 @@ describe('FragmentModel', function () {
             load: () => {
             }, abort: () => {
             }, reset: () => {
+            },
+            resetInitialSettings: () => {
+
             }
         };
         const delay = specHelper.getExecutionDelay();
-Original file line number
+Diff line change
@@ Expand Up / @@ -76,6 +76,7 @@ function RepresentationController(config) { @@
         }
         function resetInitialSettings() {
+            currentVoRepresentation = null;
             voAvailableRepresentations = [];
         }
@@ Expand Down @@