From 55a2d992950051bf88968a4811779cfa04316924 Mon Sep 17 00:00:00 2001
From: Daniel Silhavy <daniel.silhavy@fokus.fraunhofer.de>
Date: Wed, 23 Feb 2022 15:28:04 +0100
Subject: [PATCH] Bugfix/settings url (#3885)

* Fixed DRM priorities not being correctly reflected in View

* Fixed multiple clearkeys not updating in view, Fixed 'no settings parameter d' error when having only an mpd in the query-string

* Fixed Clearkey setting overwriting Widevine, removed console.log

Co-authored-by: ShikiSeiren <yamitepes@gmail.com>
---
 samples/dash-if-reference-player/app/main.js | 35 ++++++++++++--------
 samples/dash-if-reference-player/index.html  |  6 ++--
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/samples/dash-if-reference-player/app/main.js b/samples/dash-if-reference-player/app/main.js
index ee82aa0c67..6a382cda4d 100644
--- a/samples/dash-if-reference-player/app/main.js
+++ b/samples/dash-if-reference-player/app/main.js
@@ -406,7 +406,6 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
 
     $scope.player.on(dashjs.MediaPlayer.events.STREAM_INITIALIZED, function (e) { /* jshint ignore:line */
         stopMetricsInterval();
-
         $scope.videoQualities = $scope.player.getBitrateInfoListFor('video');
         $scope.chartCount = 0;
         $scope.metricsTimer = setInterval(function () {
@@ -1058,10 +1057,6 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
         $scope.drmKeySystem = item;
     };
 
-    $scope.doLog = function () {
-        console.log($scope.drmPlayready.priority);
-    }
-
     /** Handle form input */
     $scope.setDrm = function () {
 
@@ -1295,6 +1290,10 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
                 case 'org.w3.clearkey':
                     // Set DRM to active
                     $scope.drmClearkey.isActive = true;
+                    //TODO : Check if any examples are not kid=key method!
+                    if(!protectionData[data].hasOwnProperty('inputMode')){
+                        protectionData[data]['inputMode'] = 'kidKey';
+                    }
                     $scope.drmClearkey.inputMode = protectionData[data]['inputMode'];
                     // Handle clearkey data if specified using a license server
                     if (protectionData[data]['serverURL'] !== undefined) {
@@ -1333,7 +1332,7 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
                         if (parameter !== 'serverURL' &&
                             parameter !== 'httpRequestHeaders' &&
                             parameter !== 'clearkeys') {
-                            $scope.drmWidevine[parameter] = protectionData[data][parameter];
+                            $scope.drmClearkey[parameter] = protectionData[data][parameter];
                         }
                     }
                     break;
@@ -1520,8 +1519,10 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
 
             }
         }
-        prioritiesEnabled = settingsObject.prioritiesEnabled;
-        drmObject = $scope.makeProtectionData(drmObject, prioritiesEnabled);
+        prioritiesEnabled = settingsObject.drmPrioritiesEnabled;
+        if(prioritiesEnabled !== undefined){
+            drmObject = $scope.makeProtectionData(drmObject, prioritiesEnabled);
+        }
         return [settingsObject, drmObject];
     }
 
@@ -1663,11 +1664,10 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
     }
 
     $scope.setQueryData = function(currentQuery){
-        // var delimiter = '&',
-        // start = 10,
-        // tokens = currentQuery.split(delimiter).slice(start),
-        // currentQuery = tokens.join(delimiter);
-        var passedSettings = currentQuery.slice(currentQuery.indexOf('debug'));;
+        if(!currentQuery.includes('&')){
+            return;
+        }
+        var passedSettings = currentQuery.slice(currentQuery.indexOf('debug'));
         passedSettings = $scope.toSettingsObject(passedSettings)[0];
         $scope.protectionData = $scope.toSettingsObject(currentQuery)[1];
         $scope.player.updateSettings(passedSettings);
@@ -1967,6 +1967,13 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
         $scope.customABRRulesSelected = !currentConfig.streaming.abr.useDefaultABRRules;
     }
 
+    function setDrmOptions(){
+        var currentConfig = $scope.player.getSettings();
+        $scope.drmPlayready.priority = $scope.drmPlayready.priority.toString();
+        $scope.drmWidevine.priority = $scope.drmWidevine.priority.toString();
+        $scope.drmClearkey.priority = $scope.drmClearkey.priority.toString();
+    }
+
     function setLiveDelayOptions(){
         var currentConfig = $scope.player.getSettings();
         $scope.initialLiveDelay = currentConfig.streaming.delay.liveDelay;
@@ -2110,13 +2117,13 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
             setAbrRules();
             setAdditionalPlaybackOptions();
             setAdditionalAbrOptions();
+            setDrmOptions();
             setLiveDelayOptions();
             setInitialSettings();
             setTrackSwitchModeSettings();
             setInitialLogLevel();
             setCMCDSettings();
 
-
             checkLocationProtocol();
 
             var vars = getUrlVars();
diff --git a/samples/dash-if-reference-player/index.html b/samples/dash-if-reference-player/index.html
index e9462b3e13..994f691905 100644
--- a/samples/dash-if-reference-player/index.html
+++ b/samples/dash-if-reference-player/index.html
@@ -407,7 +407,7 @@
 
                         <div ng-show="prioritiesEnabled">
                             <label class="options-label">Priority</label>
-                            <select name="playreadyPriority" ng-model="drmPlayready.priority"
+                            <select name="playreadyPriority" id="playreadyPriority" ng-model="drmPlayready.priority"
                                     ng-init="drmPlayready.priority='1'">
                                 <option value=0>0</option>
                                 <option value=1>1</option>
@@ -471,7 +471,7 @@
 
                         <div ng-show="prioritiesEnabled">
                             <label class="options-label">Priority</label>
-                            <select name="widevinePriority" ng-model="drmWidevine.priority"
+                            <select name="widevinePriority" id="widevinePriority" ng-model="drmWidevine.priority"
                                     ng-init="drmWidevine.priority='0'">
                                 <option value=0>0</option>
                                 <option value=1>1</option>
@@ -588,7 +588,7 @@
 
                         <div ng-show="prioritiesEnabled">
                             <label class="options-label">Priority</label>
-                            <select name="clearkeyPriority" ng-model="drmClearkey.priority"
+                            <select name="clearkeyPriority" id="clearkeyPriority" ng-model="drmClearkey.priority"
                                     ng-init="drmClearkey.priority='2'">
                                 <option value=0>0</option>
                                 <option value=1>1</option>