Merge remote-tracking branch 'origin/development'

Dash-Industry-Forum · Jun 21, 2023 · 8cad591 · 8cad591
2 parents 9e497c4 + 8cceecf
commit 8cad591
Show file tree

Hide file tree

Showing 21 changed files with 382 additions and 180 deletions.
diff --git a/index.d.ts b/index.d.ts
@@ -4066,7 +4066,7 @@ declare namespace dashjs {
         serviceLocation: string;
         startTime: number;
         timescale: number;
-        type: 'InitializationSegment' | 'MediaSegment';
+        type: 'InitializationSegment' | 'MediaSegment' | null;
         url: string;
         wallStartTime: number | null;
     }

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "dashjs",
-    "version": "4.7.0",
+    "version": "4.7.1",
     "description": "A reference client implementation for the playback of MPEG DASH via Javascript and compliant browsers.",
     "author": "Dash Industry Forum",
     "license": "BSD-3-Clause",
@@ -11,6 +11,7 @@
         "start": "webpack serve --config build/webpack.dev.js",
         "lint": "eslint src/**/*.js test/unit/mocks/*.js test/unit/*.js",
         "build": "tsc && rimraf dist && webpack --config build/webpack.prod.js",
+        "postbuild": "cp index.d.ts dash.d.ts",
         "doc": "jsdoc -c build/jsdoc/jsdoc_conf.json -d docs/jsdoc",
         "test": "karma start karma.unit.conf.js",
         "test-browserunit": "karma start build/karma.conf.js",

diff --git a/samples/dash-if-reference-player/app/main.js b/samples/dash-if-reference-player/app/main.js
@@ -241,6 +241,8 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
         mpd: encodeURIComponent('https://dash.akamaized.net/akamai/bbb_30fps/bbb_30fps.mpd'),
         loop: true,
         autoPlay: true,
+        autoLoad: false,
+        muted: false,
         drmToday: false,
         forceQualitySwitchSelected: false,
         drmPrioritiesEnabled: false,
@@ -290,6 +292,8 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
 
     // Starting Options
     $scope.autoPlaySelected = true;
+    $scope.autoLoadSelected = false;
+    $scope.muted = false;
     $scope.cmcdEnabled = false;
     $scope.cmsdEnabled = false;
     $scope.cmsdApplyMb = false;
@@ -497,6 +501,10 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
         $scope.player.setAutoPlay($scope.autoPlaySelected);
     };
 
+    $scope.toggleMuted = function () {
+        $scope.player.setMute($scope.muted)
+    }
+
     $scope.changeFetchThroughputCalculation = function (mode) {
         $scope.player.updateSettings({
             streaming: {
@@ -1495,6 +1503,8 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
             mpd: encodeURIComponent(decodeURIComponent($scope.selectedItem.url)),
             loop: $scope.loopSelected,
             autoPlay: $scope.autoPlaySelected,
+            autoLoad: $scope.autoLoadSelected,
+            muted: $scope.muted,
             drmToday: $scope.drmToday,
             forceQualitySwitchSelected: $scope.forceQualitySwitchSelected,
             drmPrioritiesEnabled: $scope.prioritiesEnabled,
@@ -1559,12 +1569,10 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
         for (var setting in settings) {
             if (typeof defaultSettings[setting] === 'object' && defaultSettings[setting] !== null && !(defaultSettings[setting] instanceof Array)) {
                 settingDifferencesObject[setting] = this.makeSettingDifferencesObject(settings[setting], defaultSettings[setting], false);
-            }
-            else if(settings[setting] !== defaultSettings[setting]){
-                if(Array.isArray(settings[setting])){
+            } else if (settings[setting] !== defaultSettings[setting]) {
+                if (Array.isArray(settings[setting])) {
                     settingDifferencesObject[setting] = _arraysEqual(settings[setting], defaultSettings[setting]) ? {} : settings[setting];
-                }
-                else {
+                } else {
                     settingDifferencesObject[setting] = settings[setting];
                 }
 
@@ -1763,6 +1771,13 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
                     $scope.autoPlaySelected = this.parseBoolean(value);
                     $scope.toggleAutoPlay();
                     break;
+                case 'autoLoad':
+                    $scope.autoLoadSelected = this.parseBoolean(value);
+                    break;
+                case 'muted':
+                    $scope.muted = this.parseBoolean(value);
+                    $scope.toggleMuted();
+                    break;
                 case 'drmToday':
                     $scope.drmToday = this.parseBoolean(value);
                     break;
@@ -2295,18 +2310,6 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
             var vars = getUrlVars();
             var item = {};
 
-            if (vars && vars.hasOwnProperty('url')) {
-                item.url = vars.url;
-            }
-
-            // if (vars && vars.hasOwnProperty('mpd')) {
-            //     item.url = vars.mpd;
-            // }
-
-            if (vars && vars.hasOwnProperty('source')) {
-                item.url = vars.source;
-            }
-
             if (vars && vars.hasOwnProperty('stream')) {
                 try {
                     item = JSON.parse(atob(vars.stream));
@@ -2326,18 +2329,8 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
                 }
             }
 
-            if (item.url) {
-                var startPlayback = false;
-
-                $scope.selectedItem = item;
-
-                if (vars.hasOwnProperty('autoplay')) {
-                    startPlayback = (vars.autoplay === 'true');
-                }
-
-                if (startPlayback) {
-                    $scope.doLoad();
-                }
+            if ($scope.autoLoadSelected && $scope.selectedItem) {
+                $scope.doLoad();
             }
         }