From db40ab9d6776caa802c54836a6c78f8e552c6660 Mon Sep 17 00:00:00 2001 From: Bryce Seager van Dyk Date: Wed, 4 Aug 2021 15:01:43 +0000 Subject: [PATCH] Bug 1683737 - Report support for cbcs-1-9 encryption scheme. r=alwu The cbcs-1-9 encryption scheme is a specialized form of the cbcs scheme. Since we already support the general cbcs scheme, we can also report support for cbcs-1-9 for Widevine and Clearkey. Since the functionality this impacts is still behind a pref, this should not have any impact on most users. I plan to add tests for this and some other functionality as needed as part of Bug 1610671 where we'll expose this by removing/toggling the pref. Differential Revision: https://phabricator.services.mozilla.com/D120743 --- dom/media/eme/MediaKeySystemAccess.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dom/media/eme/MediaKeySystemAccess.cpp b/dom/media/eme/MediaKeySystemAccess.cpp index 9eb68ec3a4c7..250e2d97e6a5 100644 --- a/dom/media/eme/MediaKeySystemAccess.cpp +++ b/dom/media/eme/MediaKeySystemAccess.cpp @@ -254,6 +254,7 @@ static nsTArray GetSupportedKeySystems() { clearkey.mSessionTypes.AppendElement(MediaKeySessionType::Temporary); clearkey.mEncryptionSchemes.AppendElement(u"cenc"_ns); clearkey.mEncryptionSchemes.AppendElement(u"cbcs"_ns); + clearkey.mEncryptionSchemes.AppendElement(u"cbcs-1-9"_ns); if (StaticPrefs::media_clearkey_persistent_license_enabled()) { clearkey.mSessionTypes.AppendElement( MediaKeySessionType::Persistent_license); @@ -299,6 +300,7 @@ static nsTArray GetSupportedKeySystems() { widevine.mVideoRobustness.AppendElement(u"SW_SECURE_DECODE"_ns); widevine.mEncryptionSchemes.AppendElement(u"cenc"_ns); widevine.mEncryptionSchemes.AppendElement(u"cbcs"_ns); + widevine.mEncryptionSchemes.AppendElement(u"cbcs-1-9"_ns); #if defined(MOZ_WIDGET_ANDROID) // MediaDrm.isCryptoSchemeSupported only allows passing