Address @joeyparrish feedback

shaka-project · Sep 7, 2017 · feb1d87 · feb1d87
1 parent c1a81dc
commit feb1d87
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 30 deletions.
diff --git a/demo/asset_section.js b/demo/asset_section.js
@@ -37,6 +37,7 @@ shakaDemo.setupAssets_ = function() {
   /** @type {!Object.<string, !HTMLOptGroupElement>} */
   var groups = {};
   var first = null;
+  var robustnessSuggestions = document.getElementById('robustnessSuggestions');
   shakaAssets.testAssets.forEach(function(asset) {
     if (asset.disabled) return;
 
@@ -57,6 +58,14 @@ shakaDemo.setupAssets_ = function() {
     if (asset.drm.length && !asset.drm.some(
         function(keySystem) { return shakaDemo.support_.drm[keySystem]; })) {
       option.disabled = true;
+      asset.drm.forEach(function(keySystem) {
+        robustnessSuggestions.childNodes.forEach(function(suggestion) {
+          if (suggestion.nodeName == 'OPTION' &&
+              keySystem === suggestion.dataset.keysystem) {
+            suggestion.disabled = true;
+          }
+        });
+      });
     }
 
     var mimeTypes = [];
@@ -233,8 +242,6 @@ shakaDemo.load = function() {
 
     shakaDemo.hashShouldChange_();
 
-    shakaDemo.updateRobustnessSuggestions_();
-
     // Set a different poster for audio-only assets.
     if (player.isAudioOnly()) {
       shakaDemo.localVideo_.poster = shakaDemo.audioOnlyPoster_;

diff --git a/demo/configuration_section.js b/demo/configuration_section.js
@@ -54,25 +54,6 @@ shakaDemo.setupConfiguration_ = function() {
 };
 
 
-/** @private */
-shakaDemo.updateRobustnessSuggestions_ = function() {
-  var drmInfo = shakaDemo.player_.drmInfo();
-  var drmSettingsVideoRobustness =
-      document.getElementById('drmSettingsVideoRobustness');
-  var drmSettingsAudioRobustness =
-      document.getElementById('drmSettingsAudioRobustness');
-
-  // Suggest appropriate robustness values for Widevine.
-  if (drmInfo && drmInfo.keySystem === 'com.widevine.alpha') {
-    drmSettingsVideoRobustness.setAttribute('list', 'widevineRobustnessValues');
-    drmSettingsAudioRobustness.setAttribute('list', 'widevineRobustnessValues');
-  } else {
-    drmSettingsVideoRobustness.removeAttribute('list');
-    drmSettingsAudioRobustness.removeAttribute('list');
-  }
-};
-
-
 /** @private */
 shakaDemo.onAutoplayChange_ = function() {
   // Change the hash, to mirror this.

diff --git a/demo/index.html b/demo/index.html
@@ -172,18 +172,18 @@ <h1>Shaka Player <span id="version"></span></h1>
         </div>
         <div>
           <label for="drmSettingsVideoRobustness">Video Robustness:</label>
-          <input id="drmSettingsVideoRobustness" type="text" class="flex-grow">
+          <input id="drmSettingsVideoRobustness" type="text" class="flex-grow" list="robustnessSuggestions">
         </div>
         <div>
           <label for="drmSettingsAudioRobustness">Audio Robustness:</label>
-          <input id="drmSettingsAudioRobustness" type="text" class="flex-grow">
-        </div>
-        <datalist id="widevineRobustnessValues">
-          <option value="SW_SECURE_CRYPTO">SW_SECURE_CRYPTO (Widevine)</option>
-          <option value="SW_SECURE_DECODE">SW_SECURE_DECODE (Widevine)</option>
-          <option value="HW_SECURE_CRYPTO">HW_SECURE_CRYPTO (Widevine)</option>
-          <option value="HW_SECURE_DECODE">HW_SECURE_DECODE (Widevine)</option>
-          <option value="HW_SECURE_ALL">HW_SECURE_ALL (Widevine)</option>
+          <input id="drmSettingsAudioRobustness" type="text" class="flex-grow" list="robustnessSuggestions">
+        </div>
+        <datalist id="robustnessSuggestions">
+          <option data-keysystem="com.widevine.alpha" value="SW_SECURE_CRYPTO">Widevine</option>
+          <option data-keysystem="com.widevine.alpha" value="SW_SECURE_DECODE">Widevine</option>
+          <option data-keysystem="com.widevine.alpha" value="HW_SECURE_CRYPTO">Widevine</option>
+          <option data-keysystem="com.widevine.alpha" value="HW_SECURE_DECODE">Widevine</option>
+          <option data-keysystem="com.widevine.alpha" value="HW_SECURE_ALL">Widevine</option>
         </datalist>
       </details>