nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1878713 - part2 : implement GetStatusForPolicy for ClearKey CDM. r=media-playback-reviewers,jolin

Browse source 
This patch implement GetStatusForPolicy for ClearKey CDM so that we can
extend our test coverage.

Differential Revision: https://phabricator.services.mozilla.com/D200757
This commit is contained in:
alwu 2024-02-10 00:24:32 +00:00
parent d8f7773781
commit 26d844a92e
5 changed files with 75 additions and 45 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

12
dom/media/eme/MediaKeys.cpp
View file

@ -816,18 +816,6 @@ already_AddRefed<Promise> MediaKeys::GetStatusForPolicy(
return promise.forget(); return promise.forget();
} }
// Currently, only widevine CDM supports for this API.
if (!IsWidevineKeySystem(mKeySystem)) {
EME_LOG(
"MediaKeys[%p]::GetStatusForPolicy() HDCP policy check on unsupported "
"keysystem ",
this);
NS_WARNING("Tried to query without a CDM");
promise->MaybeRejectWithNotSupportedError(
"HDCP policy check on unsupported keysystem");
return promise.forget();
}
if (!mProxy) { if (!mProxy) {
NS_WARNING("Tried to use a MediaKeys without a CDM"); NS_WARNING("Tried to use a MediaKeys without a CDM");
promise->MaybeRejectWithInvalidStateError( promise->MaybeRejectWithInvalidStateError(

92
dom/media/test/test_eme_getstatusforpolicy.html
View file

@ -1,7 +1,7 @@
<!DOCTYPE HTML> <!DOCTYPE HTML>
<html> <html>
<head> <head>
<title>Test Encrypted Media Extensions</title> <title>Test getStatusForPolicy on ClearKey CDM</title>
<script src="/tests/SimpleTest/SimpleTest.js"></script> <script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" /> <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
<script type="text/javascript" src="manifest.js"></script> <script type="text/javascript" src="manifest.js"></script>
@ -12,8 +12,70 @@
<video id="v" controls></video> <video id="v" controls></video>
<script class="testbody" type="text/javascript"> <script class="testbody" type="text/javascript">
SimpleTest.waitForExplicitFinish(); add_task(async function setupTestingPrefs() {
await SpecialPowers.pushPrefEnv({
set: [
["media.eme.hdcp-policy-check.enabled", true],
],
});
});
// We expect that ClearKey has HDCP 2.0 compliant.
const expectedResults = [
{
minHdcpVersion : "1.0",
expectedResult : "usable"
},
{
minHdcpVersion : "1.1",
expectedResult : "usable"
},
{
minHdcpVersion : "1.2",
expectedResult : "usable"
},
{
minHdcpVersion : "1.3",
expectedResult : "usable"
},
{
minHdcpVersion : "1.4",
expectedResult : "usable"
},
{
minHdcpVersion : "2.0",
expectedResult : "usable"
},
{
minHdcpVersion : "2.1",
expectedResult : "usable"
},
{
minHdcpVersion : "2.2",
expectedResult : "output-restricted"
},
{
minHdcpVersion : "2.3",
expectedResult : "output-restricted"
},
];
add_task(async function testGetStatusForPolicy() {
for (let result of expectedResults) {
let mediaKey = await createMediaKeysAndSet();
let video = document.getElementById("v");
is(video.mediaKeys, mediaKey,
"Should have set MediaKeys on media element");
let keyStatus = await
video.mediaKeys.getStatusForPolicy({minHdcpVersion : result.minHdcpVersion})
.catch(e => ok(false, "getStatusForPolicy failed!"));
info(`getStatusForPolicy for HDCP ${result.minHdcpVersion} : ${keyStatus}`);
is(keyStatus, result.expectedResult,
`Expected ${result.expectedResult}, got ${keyStatus}`);
}
});
// Helper function
function createMediaKeysAndSet() { function createMediaKeysAndSet() {
return navigator.requestMediaKeySystemAccess(CLEARKEY_KEYSYSTEM, gCencMediaKeySystemConfig) return navigator.requestMediaKeySystemAccess(CLEARKEY_KEYSYSTEM, gCencMediaKeySystemConfig)
.then(function (access) { .then(function (access) {
@ -25,31 +87,7 @@ function createMediaKeysAndSet() {
}); });
} }
function test() {
createMediaKeysAndSet()
.then((m) => {
let video = document.getElementById("v");
is(video.mediaKeys, m, "Should have set MediaKeys on media element");
// getStatusForPolicy() is not suppored by ClearKey key system.
// The promise will always be rejected with NotSupportedError.
return video.mediaKeys.getStatusForPolicy({minHdcpVersion: "hdcp-2.0"});
})
.then((mediaKeyStatus) => {
ok(false, "Promise of getStatusForPolicy should not be resolved with clearkey key system");
})
// Promise rejected with NotSupportedError as expected.
.catch(reason => is("NotSupportedError", reason.name,
"Promise should be rejected with NotSupportedError."))
.then(() => SimpleTest.finish());
}
SpecialPowers.pushPrefEnv({"set":
[
["media.eme.hdcp-policy-check.enabled", true],
]
}, test);
</script> </script>
</pre> </pre>
</body> </body>
</html> </html>

11
media/gmp-clearkey/0.1/ClearKeyCDM.cpp
View file

@ -25,10 +25,13 @@ void ClearKeyCDM::Initialize(bool aAllowDistinctiveIdentifier,
void ClearKeyCDM::GetStatusForPolicy(uint32_t aPromiseId, void ClearKeyCDM::GetStatusForPolicy(uint32_t aPromiseId,
const Policy& aPolicy) { const Policy& aPolicy) {
// MediaKeys::GetStatusForPolicy checks the keysystem and // Pretend the device is HDCP 2.1 compliant.
// reject the promise with NS_ERROR_DOM_NOT_SUPPORTED_ERR without calling CDM. const cdm::HdcpVersion kDeviceHdcpVersion = cdm::kHdcpVersion2_1;
// This function should never be called and is not supported. if (aPolicy.min_hdcp_version <= kDeviceHdcpVersion) {
assert(false); mHost->OnResolveKeyStatusPromise(aPromiseId, KeyStatus::kUsable);
} else {
mHost->OnResolveKeyStatusPromise(aPromiseId, KeyStatus::kOutputRestricted);
}
} }
void ClearKeyCDM::SetServerCertificate(uint32_t aPromiseId, void ClearKeyCDM::SetServerCertificate(uint32_t aPromiseId,
const uint8_t* aServerCertificateData, const uint8_t* aServerCertificateData,

2
testing/web-platform/meta/encrypted-media/__dir__.ini
View file

@ -1,3 +1,3 @@
prefs: [dom.security.featurePolicy.experimental.enabled:true, dom.security.featurePolicy.header.enabled:true, dom.security.featurePolicy.webidl.enabled:true] prefs: [dom.security.featurePolicy.experimental.enabled:true, dom.security.featurePolicy.header.enabled:true, dom.security.featurePolicy.webidl.enabled:true, media.eme.hdcp-policy-check.enabled:true]
lsan-disabled: true lsan-disabled: true
leak-threshold: [default:51200] leak-threshold: [default:51200]

3
testing/web-platform/meta/encrypted-media/clearkey-check-status-for-hdcp.https.html.ini
View file

@ -5,4 +5,5 @@
expected: FAIL expected: FAIL
[org.w3.clearkey support for HDCP 1.0.] [org.w3.clearkey support for HDCP 1.0.]
expected: FAIL expected:
if (os == "android"): [FAIL, PASS]