Skip to content

To Demonstrate CML DRM Work (DON'T MERGE) #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 29 commits into
base: development
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
32cd04b
Delete CommonEncryption.js
agajassi Mar 19, 2025
5e9a24c
Update ProtectionController.js
agajassi Mar 19, 2025
a8d5268
Update ProtectionKeyController.js
agajassi Mar 20, 2025
ad81972
Update KeySystemClearKey.js
agajassi Mar 20, 2025
a41512f
Update KeySystemPlayReady.js
agajassi Mar 20, 2025
bac4047
Update KeySystemW3CClearKey.js
agajassi Mar 20, 2025
258a83e
Update KeySystemWidevine.js
agajassi Mar 20, 2025
44ff2f6
Delete streaming.protection.CommonEncryption.js
agajassi Mar 20, 2025
01d4fe0
Update package.json
agajassi Mar 20, 2025
8d4f1cb
Update package-lock.json
agajassi Mar 20, 2025
dcc729f
Update index.d.ts
agajassi Mar 20, 2025
e6017d2
Revert "Delete streaming.protection.CommonEncryption.js"
agajassi Mar 20, 2025
fe1a156
Update MssParser.js
agajassi Mar 21, 2025
bc65a84
Update ProtectionKeyController.js
agajassi Mar 21, 2025
0e36109
Update KeySystemClearKey.js
agajassi Mar 21, 2025
6b3e21d
Update KeySystemPlayReady.js
agajassi Mar 21, 2025
34c87bc
Update KeySystemW3CClearKey.js
agajassi Mar 21, 2025
d20f23d
Update KeySystemWidevine.js
agajassi Mar 21, 2025
882ab9b
Update ProtectionModel_01b.js
agajassi Mar 21, 2025
dc8f868
Update DRMToday.js
agajassi Mar 21, 2025
a1587fb
Update LicenseRequestComplete.js
agajassi Mar 21, 2025
8d6df80
Update Capabilities.js
agajassi Mar 21, 2025
3c7a347
Update ProtectionModel_3Feb2014.js
agajassi Mar 21, 2025
d9bffc8
Update DefaultProtectionModel.js
agajassi Mar 21, 2025
4d90717
Update KeySystemConfiguration.js
agajassi Mar 21, 2025
5345b31
Update KeyMessage.js
agajassi Mar 21, 2025
becc754
Update ProtectionController.js
agajassi Mar 21, 2025
a8d75fe
Delete ProtectionConstants.js
agajassi Mar 21, 2025
69980fb
Update index.d.ts
agajassi Mar 21, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 0 additions & 44 deletions index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2989,46 +2989,6 @@ declare namespace dashjs {
HTTP_REQUEST_DVB_REPORTING_TYPE: 'DVBReporting',
}

export interface ProtectionConstants {
CLEARKEY_KEYSTEM_STRING: 'org.w3.clearkey',
WIDEVINE_KEYSTEM_STRING: 'com.widevine.alpha',
PLAYREADY_KEYSTEM_STRING: 'com.microsoft.playready',
PLAYREADY_RECOMMENDATION_KEYSTEM_STRING: 'com.microsoft.playready.recommendation',
WIDEVINE_UUID: 'edef8ba9-79d6-4ace-a3c8-27dcd51d21ed',
PLAYREADY_UUID: '9a04f079-9840-4286-ab92-e65be0885f95',
CLEARKEY_UUID: 'e2719d58-a985-b3c9-781a-b030af78d30e',
W3C_CLEARKEY_UUID: '1077efec-c0b2-4d02-ace3-3c1e52e2fb4b',
INITIALIZATION_DATA_TYPE_CENC: 'cenc',
INITIALIZATION_DATA_TYPE_KEYIDS: 'keyids',
INITIALIZATION_DATA_TYPE_WEBM: 'webm',
ENCRYPTION_SCHEME_CENC: 'cenc',
ENCRYPTION_SCHEME_CBCS: 'cbcs',
MEDIA_KEY_MESSAGE_TYPES: {
LICENSE_REQUEST: 'license-request',
LICENSE_RENEWAL: 'license-renewal',
LICENSE_RELEASE: 'license-release',
INDIVIDUALIZATION_REQUEST: 'individualization-request',
},
ROBUSTNESS_STRINGS: {
WIDEVINE: {
SW_SECURE_CRYPTO: 'SW_SECURE_CRYPTO',
SW_SECURE_DECODE: 'SW_SECURE_DECODE',
HW_SECURE_CRYPTO: 'HW_SECURE_CRYPTO',
HW_SECURE_DECODE: 'HW_SECURE_DECODE',
HW_SECURE_ALL: 'HW_SECURE_ALL'
}
},
MEDIA_KEY_STATUSES: {
USABLE: 'usable',
EXPIRED: 'expired',
RELEASED: 'released',
OUTPUT_RESTRICTED: 'output-restricted',
OUTPUT_DOWNSCALED: 'output-downscaled',
STATUS_PENDING: 'status-pending',
INTERNAL_ERROR: 'internal-error',
}
}

/**
* Streaming - Controllers
**/
Expand Down Expand Up @@ -4636,10 +4596,6 @@ declare namespace dashjs {
VIDEO_ELEMENT_SELECTED: 'videoElementSelected';
}

export interface CommonEncryption {
// Does not export anything
}

export interface Protection {
createProtectionSystem(config: object): void;
}
Expand Down
12 changes: 6 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"chai": "^4.4.1",
"chai-spies": "^1.1.0",
"clean-jsdoc-theme": "^4.2.17",
"core-js": "^3.39.0",
"core-js": "^3.41.0",
"eslint": "^9.13.0",
"eslint-webpack-plugin": "^4.2.0",
"globals": "^15.11.0",
Expand Down
15 changes: 10 additions & 5 deletions src/mss/parser/MssParser.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,12 @@

import BigInt from '../../../externals/BigInteger.js';
import FactoryMaker from '../../core/FactoryMaker.js';
import ProtectionConstants from '../../streaming/constants/ProtectionConstants.js';

// imports from common-media-library
import { PLAYREADY_UUID } from '@svta/common-media-library/drm/common/const/PLAYREADY_UUID.js';
import { WIDEVINE_UUID } from '@svta/common-media-library/drm/common/const/WIDEVINE_UUID.js';
import { WIDEVINE_KEY_SYSTEM } from '@svta/common-media-library/drm/common/const/WIDEVINE_KEY_SYSTEM.js';
import { PLAYREADY_KEY_SYSTEM } from '@svta/common-media-library/drm/common/const/PLAYREADY_KEY_SYSTEM.js';

function MssParser(config) {
config = config || {};
Expand Down Expand Up @@ -532,16 +537,16 @@ function MssParser(config) {
__prefix: 'mspr'
};
return {
schemeIdUri: 'urn:uuid:' + ProtectionConstants.PLAYREADY_UUID,
value: ProtectionConstants.PLAYREADY_KEYSTEM_STRING,
schemeIdUri: 'urn:uuid:' + PLAYREADY_UUID,
value: PLAYREADY_KEY_SYSTEM,
pro: pro
};
}

function createWidevineContentProtection(KID) {
let widevineCP = {
schemeIdUri: 'urn:uuid:' + ProtectionConstants.WIDEVINE_UUID,
value: ProtectionConstants.WIDEVINE_KEYSTEM_STRING
schemeIdUri: 'urn:uuid:' + WIDEVINE_UUID,
value: WIDEVINE_KEY_SYSTEM
};
if (!KID) {
return widevineCP;
Expand Down
76 changes: 0 additions & 76 deletions src/streaming/constants/ProtectionConstants.js

This file was deleted.

Loading
Loading