Revert "EME: Fail requestMediaKeySystemAccess if no capabilities specified"

media/test/data/eme_player_js/player_utils.js

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // The PlayerUtils provides utility functions to binding common media events
 // to specific player functions. It also provides functions to load media source
 // base on test configurations.
 var PlayerUtils = new function() {
 }
 
@@ skipping 96 matching lines @@
     audioCapabilities: [],
     videoCapabilities: [],
     persistentState: 'optional',
     sessionTypes: ['temporary'],
   };
 
   // requestMediaKeySystemAccess() requires at least one of 'audioCapabilities'
   // or 'videoCapabilities' to be specified. It also requires only codecs
   // specific to the capability, so unlike MSE cannot have both audio and
   // video codecs in the contentType.
-  if (player.testConfig.mediaType) {
-    if (player.testConfig.mediaType.substring(0, 5) == 'video') {
-      config.videoCapabilities = [{contentType: player.testConfig.mediaType}];
-    } else if (player.testConfig.mediaType.substring(0, 5) == 'audio') {
-      config.audioCapabilities = [{contentType: player.testConfig.mediaType}];
-    }
-    // Handle special cases where both audio and video are needed.
-    if (player.testConfig.mediaType == 'video/webm; codecs="vorbis, vp8"') {
-      config.audioCapabilities = [{contentType: 'audio/webm; codecs="vorbis"'}];
-      config.videoCapabilities = [{contentType: 'video/webm; codecs="vp8"'}];
-    } else if (
-        player.testConfig.mediaType == 'video/webm; codecs="opus, vp9"') {
-      config.audioCapabilities = [{contentType: 'audio/webm; codecs="opus"'}];
-      config.videoCapabilities = [{contentType: 'video/webm; codecs="vp9"'}];
-    }
+  if (player.testConfig.mediaType == 'video/webm; codecs="vp8"' ||
+      player.testConfig.mediaType == 'video/webm; codecs="vp9"' ||
+      player.testConfig.mediaType == 'video/mp4; codecs="avc1.4D000C"') {
+    // Video only.
+    config.videoCapabilities = [{contentType: player.testConfig.mediaType}];
+  } else if (
+      player.testConfig.mediaType == 'audio/webm; codecs="vorbis"' ||
+      player.testConfig.mediaType == 'audio/webm; codecs="opus"' ||
+      player.testConfig.mediaType == 'audio/mp4; codecs="mp4a.40.2"') {
+    // Audio only.
+    config.audioCapabilities = [{contentType: player.testConfig.mediaType}];
+  } else if (
+      player.testConfig.mediaType == 'video/webm; codecs="vorbis, vp8"') {
+    // Both audio and video codecs specified.
+    config.audioCapabilities = [{contentType: 'audio/webm; codecs="vorbis"'}];
+    config.videoCapabilities = [{contentType: 'video/webm; codecs="vp8"'}];
+  } else if (player.testConfig.mediaType == 'video/webm; codecs="opus, vp9"') {
+    // Both audio and video codecs specified.
+    config.audioCapabilities = [{contentType: 'audio/webm; codecs="opus"'}];
+    config.videoCapabilities = [{contentType: 'video/webm; codecs="vp9"'}];
   } else {
     // Some tests (e.g. mse_different_containers.html) specify audio and
     // video codecs seperately.
     if (player.testConfig.videoFormat == 'ENCRYPTED_MP4' ||
         player.testConfig.videoFormat == 'CLEAR_MP4') {
       config.videoCapabilities =
           [{contentType: 'video/mp4; codecs="avc1.4D000C"'}];
     } else if (
         player.testConfig.videoFormat == 'ENCRYPTED_WEBM' ||
         player.testConfig.videoFormat == 'CLEAR_WEBM') {
@@ skipping 69 matching lines @@
       case VERIFY_HOST_FILES_TEST_KEYSYSTEM:
         return UnitTestPlayer;
       default:
         Utils.timeLog(keySystem + ' is not a known key system');
         return ClearKeyPlayer;
     }
   }
   var Player = getPlayerType(testConfig.keySystem);
   return new Player(video, testConfig);
 };