commit ed90fe04558a54ee9af666b1ca7adbf87aefe9b7
parent 882920db636fd175536e6a4170bb5b335eb4b3ec
Author: iulian moraru <imoraru@mozilla.com>
Date: Wed, 22 Oct 2025 03:36:57 +0300
Revert "Bug 1990159 - part2 : add test. r=media-playback-reviewers,chunmin" for causing android mda failures on test_eme_output_config_check.html
This reverts commit f9499e10c551c63d115c8088d43f4aecd6a9572f.
Revert "Bug 1990159 - part1 : set DistinctiveIdentifier and PersistentState on MediaKeySystemConfiguration. r=media-playback-reviewers,chunmin"
This reverts commit b553a8a667a2584c6e0ff27659556ad40ce75713.
Diffstat:
3 files changed, 0 insertions(+), 71 deletions(-)
diff --git a/dom/media/mediacapabilities/MediaCapabilities.cpp b/dom/media/mediacapabilities/MediaCapabilities.cpp
@@ -68,9 +68,6 @@ MediaCapabilitiesKeySystemConfigurationToMediaKeySystemConfiguration(
}
}
}
- aOutConfig.mDistinctiveIdentifier = keySystemConfig.mDistinctiveIdentifier;
- aOutConfig.mPersistentState = keySystemConfig.mPersistentState;
-
if (aInConfig.mAudio.WasPassed()) {
auto* capabilitiy = aOutConfig.mAudioCapabilities.AppendElement(fallible);
if (NS_WARN_IF(!capabilitiy)) {
diff --git a/dom/media/test/mochitest_eme.toml b/dom/media/test/mochitest_eme.toml
@@ -724,9 +724,6 @@ scheme = "https"
skip-if = ["os == 'android'"] # bug 1149374
scheme = "https"
-["test_eme_output_config_check.html"]
-scheme = "https"
-
["test_eme_playback.html"]
skip-if = [
"os == 'android'", # bug 1149374
diff --git a/dom/media/test/test_eme_output_config_check.html b/dom/media/test/test_eme_output_config_check.html
@@ -1,65 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-<title>MediaKeySystemConfiguration persistentState and distinctiveIdentifier check</title>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-<script type="text/javascript" src="manifest.js"></script>
-</head>
-<script type="application/javascript">
-
-/**
- * This test verifies that the persistentState and distinctiveIdentifier are
- * correctly set in the output configuration, and that they remain consistent
- * between the output configs for MediaKeySystemAccess and MediaCapabilities.
- */
-add_task(async function testConfigResults() {
- const keySystem = "org.w3.clearkey";
- const contentType = 'video/mp4; codecs="avc1.42e01e"';
- const mksa = await navigator.requestMediaKeySystemAccess(keySystem, [{
- persistentState: 'required',
- // Clearkey doesn't support 'required'
- distinctiveIdentifier: 'not-allowed',
- videoCapabilities: [{
- contentType
- }],
- }]);
- is(mksa.getConfiguration().persistentState, 'required',
- `${mksa.getConfiguration().persistentState} should be "required"`);
- is(mksa.getConfiguration().distinctiveIdentifier, 'not-allowed',
- `${mksa.getConfiguration().distinctiveIdentifier} should be "not-allowed"`);
-
- const info = await navigator.mediaCapabilities.decodingInfo({
- type: 'media-source',
- video: {
- width: 1280,
- height: 720,
- framerate: 30,
- bitrate: 10000,
- contentType
- },
- keySystemConfiguration: {
- keySystem,
- persistentState: 'required',
- // Clearkey doesn't support 'required'
- distinctiveIdentifier: 'not-allowed',
- },
- });
- is(info.keySystemAccess.getConfiguration().persistentState, 'required',
- `${info.keySystemAccess.getConfiguration().persistentState} should be "required"`);
- is(info.keySystemAccess.getConfiguration().distinctiveIdentifier, 'not-allowed',
- `${info.keySystemAccess.getConfiguration().distinctiveIdentifier} should be "not-allowed"`);
-
- is(mksa.getConfiguration().persistentState,
- info.keySystemAccess.getConfiguration().persistentState,
- "They should be both 'required'");
- is(mksa.getConfiguration().distinctiveIdentifier,
- info.keySystemAccess.getConfiguration().distinctiveIdentifier,
- "They should be both 'not-allowed'");
-});
-
-
-</script>
-<body>
-</body>
-</html>
