Skip to content

Commit

Permalink
feat!: Remove com.adobe.primetime keysystem (#6189)
Browse files Browse the repository at this point in the history
`com.adobe.primetime` is not implemented in any browser and no one has
reported any problems in the 8 years of Shaka Player.
  • Loading branch information
avelad committed Jan 30, 2024
1 parent 038e894 commit 47602c6
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 13 deletions.
1 change: 0 additions & 1 deletion demo/main.js
Expand Up @@ -1877,7 +1877,6 @@ shakaDemo.Main.commonDrmSystems = [
'com.widevine.alpha',
'com.microsoft.playready',
'com.apple.fps',
'com.adobe.primetime',
'org.w3.clearkey',
];

Expand Down
1 change: 0 additions & 1 deletion lib/media/drm_engine.js
Expand Up @@ -1831,7 +1831,6 @@ shaka.media.DrmEngine = class {
'com.microsoft.playready.recommendation',
'com.apple.fps.1_0',
'com.apple.fps',
'com.adobe.primetime',
];

const basicVideoCapabilities = [
Expand Down
3 changes: 1 addition & 2 deletions lib/offline/storage.js
Expand Up @@ -1654,7 +1654,6 @@ shaka.offline.Storage.defaultSystemIds_ = new Map()
.set('com.microsoft.playready.software',
'9a04f07998404286ab92e65be0885f95')
.set('com.microsoft.playready.hardware',
'9a04f07998404286ab92e65be0885f95')
.set('com.adobe.primetime', 'f239e769efa348509c16a903c6932efb');
'9a04f07998404286ab92e65be0885f95');

shaka.Player.registerSupportPlugin('offline', shaka.offline.Storage.support);
2 changes: 0 additions & 2 deletions lib/util/player_configuration.js
Expand Up @@ -133,8 +133,6 @@ shaka.util.PlayerConfiguration = class {
'com.microsoft.playready',
'urn:uuid:79f0049a-4098-8642-ab92-e65be0885f95':
'com.microsoft.playready',
'urn:uuid:f239e769-efa3-4850-9c16-a903c6932efb':
'com.adobe.primetime',
},
manifestPreprocessor: (element) => {
return shaka.util.ConfigUtils.referenceParametersAndReturn(
Expand Down
7 changes: 0 additions & 7 deletions test/dash/dash_parser_content_protection_unit.js
Expand Up @@ -222,8 +222,6 @@ describe('DashParser ContentProtection', () => {
['9a04f079-9840-4286-ab92-e65be0885f95'], ['com.microsoft.playready']);
testKeySystemMappings('for old PlayReady',
['79f0049a-4098-8642-ab92-e65be0885f95'], ['com.microsoft.playready']);
testKeySystemMappings('for Adobe Primetime',
['f239e769-efa3-4850-9c16-a903c6932efb'], ['com.adobe.primetime']);

testKeySystemMappings('for multiple DRMs in the specified order',
[
Expand All @@ -238,11 +236,9 @@ describe('DashParser ContentProtection', () => {
[
'EDEF8BA9-79D6-4ACE-A3C8-27DCD51D21ED',
'9A04F079-9840-4286-AB92-E65BE0885F95',
'F239E769-EFA3-4850-9C16-A903C6932EFB',
], [
'com.widevine.alpha',
'com.microsoft.playready',
'com.adobe.primetime',
]);
});

Expand Down Expand Up @@ -393,7 +389,6 @@ describe('DashParser ContentProtection', () => {
const drmInfos = jasmine.arrayContaining([
buildDrmInfo('com.widevine.alpha'),
buildDrmInfo('com.microsoft.playready'),
buildDrmInfo('com.adobe.primetime'),
]);
const expected = buildExpectedManifest(
/** @type {!Array.<shaka.extern.DrmInfo>} */(drmInfos),
Expand All @@ -420,7 +415,6 @@ describe('DashParser ContentProtection', () => {
const drmInfos = jasmine.arrayContaining([
buildDrmInfo('com.widevine.alpha'),
buildDrmInfo('com.microsoft.playready'),
buildDrmInfo('com.adobe.primetime'),
]);
const expected = buildExpectedManifest(
/** @type {!Array.<shaka.extern.DrmInfo>} */(drmInfos),
Expand Down Expand Up @@ -454,7 +448,6 @@ describe('DashParser ContentProtection', () => {
// PlayReady has two associated UUIDs, so it appears twice.
buildDrmInfo('com.microsoft.playready', keyIds),
buildDrmInfo('com.microsoft.playready', keyIds),
buildDrmInfo('com.adobe.primetime', keyIds),
], variantKeyIds);
await testDashParser(source, expected, /* ignoreDrmInfo= */ true);
});
Expand Down

0 comments on commit 47602c6

Please sign in to comment.