Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(160)

Unified Diff: media/test/data/test_key_system_instantiation.html

Issue 2349813002: EME: Update MediaKeySystemConfiguration defaults; require non-empty capabilities (Closed)
Patch Set: changes Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/test/data/test_key_system_instantiation.html
diff --git a/media/test/data/test_key_system_instantiation.html b/media/test/data/test_key_system_instantiation.html
index 5a76e199f9ee47ec77768ccd13183ae4c8855512..f4e99933529d455db79b875953dc6ce0eeadc651 100644
--- a/media/test/data/test_key_system_instantiation.html
+++ b/media/test/data/test_key_system_instantiation.html
@@ -33,15 +33,17 @@
// lists, and then verifies the result. Sets page title when done.
function requestMediaKeySystemAccessAndVerifyConfiguration(
keySystem, initDataType, audioCodecList, videoCodecList) {
- var configuration = {initDataTypes: [initDataType]};
+ var configuration = {
+ initDataTypes: [initDataType],
+ audioCapabilities: [],
+ videoCapabilities: []
+ };
if (audioCodecList !== null) {
- configuration.audioCapabilities = [];
for (entry of audioCodecList) {
configuration.audioCapabilities.push({contentType: entry});
};
}
if (videoCodecList !== null) {
- configuration.videoCapabilities = [];
for (entry of videoCodecList) {
configuration.videoCapabilities.push({contentType: entry});
};
@@ -68,7 +70,7 @@
setResultInTitle(result);
return;
}
- } else if (allowedConfig.audioCapabilities) {
+ } else if (allowedConfig.audioCapabilities.length > 0) {
setResultInTitle("audioCapabilities set when none expected");
return;
}
@@ -77,7 +79,7 @@
verifyCapabilitiesAreEqual(allowedConfig.videoCapabilities,
configuration.videoCapabilities));
return;
- } else if (allowedConfig.videoCapabilities) {
+ } else if (allowedConfig.videoCapabilities.length > 0) {
setResultInTitle("videoCapabilities set when none expected");
return;
}

Powered by Google App Engine
This is Rietveld 408576698