--- a/dom/media/test/test_eme_requestKeySystemAccess.html
+++ b/dom/media/test/test_eme_requestKeySystemAccess.html
@@ -6,17 +6,16 @@
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
<script type="text/javascript" src="manifest.js"></script>
<script type="text/javascript" src="eme.js"></script>
</head>
<body>
<pre id="test">
<script class="testbody" type="text/javascript">
-const CLEARKEY_ID = 'org.w3.clearkey';
const SUPPORTED_LABEL = "pass label";
function ValidateConfig(name, expected, observed) {
info("ValidateConfig " + name);
info("expected cfg=" + JSON.stringify(expected));
info("observed cfg=" + JSON.stringify(observed));
is(observed.label, expected.label, name + " label should match");
@@ -31,31 +30,38 @@ function ValidateConfig(name, expected,
}
if (typeof expected.videoCapabilities !== 'undefined') {
info("expected.videoCapabilities=" + expected.videoCapabilities);
dump("expected.videoCapabilities=" + expected.videoCapabilities + "\n");
ok(expected.videoCapabilities.length == 1, "Test function can only handle one capability.");
ok(observed.videoCapabilities.length == 1, "Test function can only handle one capability.");
is(observed.videoCapabilities[0].contentType, expected.videoCapabilities[0].contentType, name + " videoCapabilities should match.");
}
+ if (expected.sessionTypes) {
+ is(expected.sessionTypes.length, observed.sessionTypes.length, "Should have expected number of sessionTypes");
+ for (var i = 0; i < expected.sessionTypes.length; i++) {
+ is(expected[i], observed[i], "Session type " + i + " should match");
+ }
+ }
}
function Test(test) {
var name = "'" + test.name + "'";
return new Promise(function(resolve, reject) {
var p;
if (test.options) {
- p = navigator.requestMediaKeySystemAccess(test.keySystem, test.options);
+ var keySystem = (test.keySystem !== undefined) ? test.keySystem : CLEARKEY_KEYSYSTEM;
+ p = navigator.requestMediaKeySystemAccess(keySystem, test.options);
} else {
- p = navigator.requestMediaKeySystemAccess(test.keySystem);
+ p = navigator.requestMediaKeySystemAccess(keySystem);
}
p.then(
function(keySystemAccess) {
ok(test.shouldPass, name + " passed and was expected to " + (test.shouldPass ? "pass" : "fail"));
- is(keySystemAccess.keySystem, CLEARKEY_ID, "CDM keySystem should be in MediaKeySystemAccess.keySystem");
+ is(keySystemAccess.keySystem, CLEARKEY_KEYSYSTEM, "CDM keySystem should be in MediaKeySystemAccess.keySystem");
ValidateConfig(name, test.expectedConfig, keySystemAccess.getConfiguration());
resolve();
},
function(ex) {
if (test.shouldPass) {
info(name + " failed: " + ex);
}
ok(!test.shouldPass, name + " failed and was expected to " + (test.shouldPass ? "pass" : "fail"));
@@ -73,38 +79,37 @@ var tests = [
initDataTypes: ['cenc'],
videoCapabilities: [{contentType: 'video/mp4'}],
}
],
shouldPass: false,
},
{
name: 'Empty options specified',
- keySystem: CLEARKEY_ID,
options: [ ],
shouldPass: false,
},
{
name: 'Undefined options',
- keySystem: CLEARKEY_ID,
shouldPass: false,
},
{
name: 'Basic MP4 cenc',
- keySystem: CLEARKEY_ID,
options: [
{
label: SUPPORTED_LABEL,
initDataTypes: ['cenc'],
+ audioCapabilities: [{contentType: 'audio/mp4'}],
videoCapabilities: [{contentType: 'video/mp4'}],
}
],
expectedConfig: {
label: SUPPORTED_LABEL,
initDataTypes: ['cenc'],
+ audioCapabilities: [{contentType: 'audio/mp4'}],
videoCapabilities: [{contentType: 'video/mp4'}],
},
shouldPass: true,
},
{
name: 'Invalid keysystem failure',
keySystem: 'bogusKeySystem',
options: [
@@ -112,134 +117,113 @@ var tests = [
initDataTypes: ['cenc'],
videoCapabilities: [{contentType: 'video/mp4'}],
}
],
shouldPass: false,
},
{
name: 'Invalid initDataType',
- keySystem: CLEARKEY_ID,
options: [
{
initDataTypes: ['bogus'],
+ audioCapabilities: [{contentType: 'audio/mp4'}],
}
],
shouldPass: false,
},
{
name: 'Valid initDataType after invalid',
- keySystem: CLEARKEY_ID,
options: [
{
label: SUPPORTED_LABEL,
initDataTypes: ['bogus', 'invalid', 'cenc'],
+ audioCapabilities: [{contentType: 'audio/mp4'}],
}
],
expectedConfig: {
label: SUPPORTED_LABEL,
initDataTypes: ['cenc'],
+ audioCapabilities: [{contentType: 'audio/mp4'}],
},
shouldPass: true,
},
{
- name: 'Empty initDataTypes',
- keySystem: CLEARKEY_ID,
- options: [
- {
- initDataTypes: [],
- }
- ],
- shouldPass: false,
- },
- {
name: 'Invalid videoType',
- keySystem: CLEARKEY_ID,
options: [
{
initDataTypes: ['cenc'],
videoCapabilities: [{contentType: 'video/bogus'}],
}
],
shouldPass: false,
},
{
- name: 'distinctiveIdentifier, persistentState, and robustness ignored',
- keySystem: CLEARKEY_ID,
+ name: 'Invalid distinctiveIdentifier fails',
+ options: [
+ {
+ initDataTypes: ['cenc'],
+ videoCapabilities: [{contentType: 'video/mp4'}],
+ distinctiveIdentifier: 'bogus',
+ persistentState: 'bogus',
+ }
+ ],
+ shouldPass: false,
+ },
+ {
+ name: 'distinctiveIdentifier is prohibited for ClearKey',
+ options: [
+ {
+ initDataTypes: ['cenc'],
+ videoCapabilities: [{contentType: 'video/mp4'}],
+ distinctiveIdentifier: 'required',
+ }
+ ],
+ shouldPass: false,
+ },
+ {
+ name: 'Invalid persistentState fails',
+ options: [
+ {
+ initDataTypes: ['cenc'],
+ videoCapabilities: [{contentType: 'video/mp4'}],
+ persistentState: 'bogus',
+ }
+ ],
+ shouldPass: false,
+ },
+ {
+ name: 'Invalid robustness unsupported',
+ options: [
+ {
+ initDataTypes: ['cenc'],
+ videoCapabilities: [{contentType: 'video/mp4', robustness: 'very much so'}],
+ }
+ ],
+ shouldPass: false,
+ },
+ {
+ name: 'Unexpected config entry should be ignored',
options: [
{
label: SUPPORTED_LABEL,
initDataTypes: ['cenc'],
- videoCapabilities: [{contentType: 'video/mp4', robustness: 'somewhat'}],
- distinctiveIdentifier: 'bogus',
- persistentState: 'bogus',
+ videoCapabilities: [{contentType: 'video/mp4'}],
+ unexpectedEntry: 'this should be ignored',
}
],
expectedConfig: {
label: SUPPORTED_LABEL,
initDataTypes: ['cenc'],
videoCapabilities: [{contentType: 'video/mp4'}],
},
shouldPass: true,
},
{
- name: 'Only unrecognised dict entries specified with unrecognised video type',
- keySystem: CLEARKEY_ID,
- options: [
- {
- videoCapabilities: [{robustness: 'very much so'}],
- distinctiveIdentifier: 'required',
- persistentState: 'required',
- }
- ],
- shouldPass: false,
- },
- {
- name: 'Only unrecognised dict entries specified should be ignored',
- keySystem: CLEARKEY_ID,
- options: [
- {
- label: SUPPORTED_LABEL,
- distinctiveIdentifier: 'required',
- persistentState: 'required',
- }
- ],
- expectedConfig: {
- label: SUPPORTED_LABEL,
- },
- shouldPass: true,
- },
- {
- name: 'Empty config dict',
- keySystem: CLEARKEY_ID,
- options: [{ label: SUPPORTED_LABEL }],
- expectedConfig: {
- label: SUPPORTED_LABEL
- },
- shouldPass: true,
- },
- {
- name: 'Unexpected config entry should be ignored',
- keySystem: CLEARKEY_ID,
- options: [
- {
- label: SUPPORTED_LABEL,
- initDataTypes: ['cenc'],
- unexpectedEntry: 'this should be ignored',
- }
- ],
- expectedConfig: {
- label: SUPPORTED_LABEL,
- initDataTypes: ['cenc'],
- },
- shouldPass: true,
- },
- {
name: 'Invalid option followed by valid',
- keySystem: CLEARKEY_ID,
options: [
{
label: "this config should not be supported",
initDataTypes: ['bogus'],
},
{
label: SUPPORTED_LABEL,
initDataTypes: ['cenc'],
@@ -249,135 +233,177 @@ var tests = [
expectedConfig: {
label: SUPPORTED_LABEL,
initDataTypes: ['cenc'],
videoCapabilities: [{contentType: 'video/mp4'}],
},
shouldPass: true,
},
{
+ name: 'Persistent sessions; persistence required',
+ options: [
+ {
+ label: SUPPORTED_LABEL,
+ initDataTypes: ['cenc'],
+ videoCapabilities: [{contentType: 'video/mp4'}],
+ sessionTypes: ['temporary','persistent-license'],
+ persistentState: 'required',
+ }
+ ],
+ expectedConfig: {
+ label: SUPPORTED_LABEL,
+ initDataTypes: ['cenc'],
+ videoCapabilities: [{contentType: 'video/mp4'}],
+ sessionTypes: ['temporary','persistent-license'],
+ persistentState: 'required',
+ },
+ shouldPass: true,
+ },
+ {
+ name: 'Persistent sessions not allowed when persistentState prohibited',
+ options: [
+ {
+ initDataTypes: ['cenc'],
+ videoCapabilities: [{contentType: 'video/mp4'}],
+ sessionTypes: ['temporary','persistent-license'],
+ persistentState: 'not-allowed',
+ }
+ ],
+ shouldPass: false,
+ },
+ {
+ name: 'Persistent sessions; should bump optional persistState to required',
+ options: [
+ {
+ label: SUPPORTED_LABEL,
+ initDataTypes: ['cenc'],
+ videoCapabilities: [{contentType: 'video/mp4'}],
+ sessionTypes: ['temporary','persistent-license'],
+ persistentState: 'optional',
+ }
+ ],
+ expectedConfig: {
+ label: SUPPORTED_LABEL,
+ initDataTypes: ['cenc'],
+ videoCapabilities: [{contentType: 'video/mp4'}],
+ sessionTypes: ['temporary','persistent-license'],
+ persistentState: 'required',
+ },
+ shouldPass: true,
+ },
+ {
name: 'MP4 audio container',
- keySystem: CLEARKEY_ID,
options: [
{
label: SUPPORTED_LABEL,
initDataTypes: ['cenc'],
audioCapabilities: [{contentType: 'audio/mp4'}],
}
],
expectedConfig: {
label: SUPPORTED_LABEL,
initDataTypes: ['cenc'],
audioCapabilities: [{contentType: 'audio/mp4'}],
},
shouldPass: true,
},
{
name: 'MP4 audio container with AAC-LC',
- keySystem: CLEARKEY_ID,
options: [
{
label: SUPPORTED_LABEL,
initDataTypes: ['cenc'],
audioCapabilities: [{contentType: 'audio/mp4; codecs="mp4a.40.2"'}],
}
],
expectedConfig: {
label: SUPPORTED_LABEL,
initDataTypes: ['cenc'],
audioCapabilities: [{contentType: 'audio/mp4; codecs="mp4a.40.2"'}],
},
shouldPass: true,
},
{
name: 'MP4 audio container with invalid codecs',
- keySystem: CLEARKEY_ID,
options: [
{
initDataTypes: ['cenc'],
audioCapabilities: [{contentType: 'audio/mp4; codecs="bogus"'}],
}
],
shouldPass: false,
},
{
name: 'MP4 audio container with mp3 is unsupported',
- keySystem: CLEARKEY_ID,
options: [
{
initDataTypes: ['cenc'],
audioCapabilities: [{contentType: 'audio/mp4; codecs="mp3"'}],
}
],
shouldPass: false,
},
{
name: 'MP4 video container type with an mp3 codec is unsupported',
- keySystem: CLEARKEY_ID,
options: [
{
initDataTypes: ['cenc'],
videoCapabilities: [{contentType: 'video/mp4; codecs="mp3"'}],
}
],
shouldPass: false,
},
{
name: 'MP4 audio container type with a video codec is unsupported',
- keySystem: CLEARKEY_ID,
options: [
{
initDataTypes: ['cenc'],
audioCapabilities: [{contentType: 'audio/mp4; codecs="avc1.42E01E"'}],
}
],
shouldPass: false,
},
{
name: 'MP4 video container with constrained baseline h.264',
- keySystem: CLEARKEY_ID,
options: [
{
label: SUPPORTED_LABEL,
initDataTypes: ['cenc'],
videoCapabilities: [{contentType: 'video/mp4; codecs="avc1.42E01E"'}],
}
],
expectedConfig: {
label: SUPPORTED_LABEL,
initDataTypes: ['cenc'],
videoCapabilities: [{contentType: 'video/mp4; codecs="avc1.42E01E"'}],
},
shouldPass: true,
},
{
name: 'MP4 video container with invalid codecs',
- keySystem: CLEARKEY_ID,
options: [
{
initDataTypes: ['cenc'],
videoCapabilities: [{contentType: 'video/mp4; codecs="bogus"'}],
}
],
shouldPass: false,
},
{
name: 'MP4 video container with both audio and video codec type in videoType',
- keySystem: CLEARKEY_ID,
options: [
{
initDataTypes: ['cenc'],
videoCapabilities: [{contentType: 'video/mp4; codecs="avc1.42E01E,mp4a.40.2"'}],
}
],
shouldPass: false,
},
{
name: 'MP4 audio and video type both specified',
- keySystem: CLEARKEY_ID,
options: [
{
label: SUPPORTED_LABEL,
initDataTypes: ['cenc'],
videoCapabilities: [{contentType: 'video/mp4; codecs="avc1.42E01E"'}],
audioCapabilities: [{contentType: 'audio/mp4; codecs="mp4a.40.2"'}],
}
],
@@ -386,51 +412,48 @@ var tests = [
initDataTypes: ['cenc'],
videoCapabilities: [{contentType: 'video/mp4; codecs="avc1.42E01E"'}],
audioCapabilities: [{contentType: 'audio/mp4; codecs="mp4a.40.2"'}],
},
shouldPass: true,
},
{
name: 'Basic WebM video',
- keySystem: CLEARKEY_ID,
options: [
{
label: SUPPORTED_LABEL,
initDataTypes: ['webm'],
videoCapabilities: [{contentType: 'video/webm'}],
}
],
expectedConfig: {
label: SUPPORTED_LABEL,
initDataTypes: ['webm'],
videoCapabilities: [{contentType: 'video/webm'}],
},
shouldPass: true,
},
{
name: 'Basic WebM audio',
- keySystem: CLEARKEY_ID,
options: [
{
label: SUPPORTED_LABEL,
initDataTypes: ['webm'],
audioCapabilities: [{contentType: 'audio/webm'}],
}
],
expectedConfig: {
label: SUPPORTED_LABEL,
initDataTypes: ['webm'],
audioCapabilities: [{contentType: 'audio/webm'}],
},
shouldPass: true,
},
{
name: 'Webm with Vorbis audio and VP8 video.',
- keySystem: CLEARKEY_ID,
options: [
{
label: SUPPORTED_LABEL,
initDataTypes: ['webm'],
videoCapabilities: [{contentType: 'video/webm;codecs="vp8"'}],
audioCapabilities: [{contentType: 'audio/webm;codecs="vorbis"'}],
}
],
@@ -439,17 +462,16 @@ var tests = [
initDataTypes: ['webm'],
videoCapabilities: [{contentType: 'video/webm;codecs="vp8"'}],
audioCapabilities: [{contentType: 'audio/webm;codecs="vorbis"'}],
},
shouldPass: true,
},
{
name: 'Webm with Vorbis audio and VP9 video.',
- keySystem: CLEARKEY_ID,
options: [
{
label: SUPPORTED_LABEL,
initDataTypes: ['webm'],
videoCapabilities: [{contentType: 'video/webm;codecs="vp9"'}],
audioCapabilities: [{contentType: 'audio/webm;codecs="vorbis"'}],
}
],
@@ -458,73 +480,72 @@ var tests = [
initDataTypes: ['webm'],
videoCapabilities: [{contentType: 'video/webm;codecs="vp9"'}],
audioCapabilities: [{contentType: 'audio/webm;codecs="vorbis"'}],
},
shouldPass: true,
},
{
name: 'Webm with bogus video.',
- keySystem: CLEARKEY_ID,
options: [
{
initDataTypes: ['webm'],
videoCapabilities: [{contentType: 'video/webm;codecs="bogus"'}],
}
],
shouldPass: false,
},
{
name: "CDM version less than",
- keySystem: CLEARKEY_ID + ".0",
+ keySystem: CLEARKEY_KEYSYSTEM + ".0",
options: [
{
label: SUPPORTED_LABEL,
initDataTypes: ['cenc'],
videoCapabilities: [{contentType: 'video/mp4'}],
}
],
expectedConfig: {
label: SUPPORTED_LABEL,
initDataTypes: ['cenc'],
videoCapabilities: [{contentType: 'video/mp4'}],
},
shouldPass: true
},
{
name: "CDM version equal to",
- keySystem: CLEARKEY_ID + ".1",
+ keySystem: CLEARKEY_KEYSYSTEM + ".1",
options: [
{
label: SUPPORTED_LABEL,
initDataTypes: ['cenc'],
videoCapabilities: [{contentType: 'video/mp4'}],
}
],
expectedConfig: {
label: SUPPORTED_LABEL,
initDataTypes: ['cenc'],
videoCapabilities: [{contentType: 'video/mp4'}],
},
shouldPass: true
},
{
name: "CDM version greater than",
- keySystem: CLEARKEY_ID + ".2",
+ keySystem: CLEARKEY_KEYSYSTEM + ".2",
options: [
{
initDataTypes: ['cenc'],
videoCapabilities: [{contentType: 'video/mp4'}],
}
],
shouldPass: false
},
{
name: "Non-whole number CDM version",
- keySystem: CLEARKEY_ID + ".0.1",
+ keySystem: CLEARKEY_KEYSYSTEM + ".0.1",
options: [
{
initDataTypes: ['cenc'],
videoCapabilities: [{contentType: 'video/mp4'}],
}
],
shouldPass: false
},