Skip to content

Commit 8fdf095

Browse files
author
Bryan Yao
committed
remove the fmp4 SAMPLE-AES check
1 parent 6acc9bf commit 8fdf095

File tree

6 files changed

+52
-244
lines changed

6 files changed

+52
-244
lines changed

package-lock.json

Lines changed: 22 additions & 214 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
"sinon-chai": "^3.5.0",
103103
"typescript": "^3.9.5",
104104
"webpack": "^4.43.0",
105-
"webpack-cli": "^3.1.2",
105+
"webpack-cli": "^3.3.12",
106106
"webpack-dev-server": "^3.11.0",
107107
"webpack-merge": "^4.2.2",
108108
"webworkify-webpack": "^2.1.5"

src/controller/eme-controller.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,10 @@ const getSupportedMediaKeySystemConfigurations = function (
105105
drmSystemOptions: DRMSystemOptions
106106
): MediaKeySystemConfiguration[] {
107107
switch (keySystem) {
108-
case KeySystems.WIDEVINE:
109-
return createWidevineMediaKeySystemConfigurations(audioCodecs, videoCodecs, drmSystemOptions);
110-
case KeySystems.CLEARKEY:
111-
return createClearkeyMediaKeySystemConfigurations(audioCodecs, videoCodecs, drmSystemOptions);
108+
case KeySystems.WIDEVINE:
109+
return createWidevineMediaKeySystemConfigurations(audioCodecs, videoCodecs, drmSystemOptions);
110+
case KeySystems.CLEARKEY:
111+
return createClearkeyMediaKeySystemConfigurations(audioCodecs, videoCodecs, drmSystemOptions);
112112
default:
113113
throw new Error(`Unknown key-system: ${keySystem}`);
114114
}
@@ -294,7 +294,7 @@ class EMEController implements ComponentAPI {
294294
logger.error('Failed to load the keys');
295295
}
296296

297-
let license = this._generateLicense(message);
297+
const license = this._generateLicense(message);
298298

299299
keySession.update(license).catch(
300300
function (error) {
@@ -306,17 +306,17 @@ class EMEController implements ComponentAPI {
306306

307307
private _generateLicense (message) {
308308
// Parse the clearkey license request.
309-
let request = JSON.parse(new TextDecoder().decode(message));
309+
const request = JSON.parse(new TextDecoder().decode(message));
310310
type responseFormat = {
311311
kty?: string,
312312
alg?: string,
313313
kid?: string,
314314
k?: string
315315
}
316316

317-
let keyarray: responseFormat[] = [];
318-
for (let id of request.kids) {
319-
let decodedBase64 = this.base64ToHex(id);
317+
const keyarray: responseFormat[] = [];
318+
for (const id of request.kids) {
319+
const decodedBase64 = this.base64ToHex(id);
320320
// logger.log(`decodedBase64: ${decodedBase64}`);
321321
if (!this._clearkeyPair.hasOwnProperty(decodedBase64)) {
322322
logger.error('No pair key, please use lower case');
@@ -345,7 +345,7 @@ class EMEController implements ComponentAPI {
345345

346346
private hexToBase64 (hexstring) {
347347
var encodedBase64 = btoa(hexstring.match(/\w{2}/g).map(function (a) {
348-
return String.fromCharCode(parseInt(a, 16));
348+
return String.fromCharCode(parseInt(a, 16));
349349
}).join(''));
350350

351351
var start = 0;

src/demux/mp4demuxer.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ class MP4Demuxer implements Demuxer {
5959
};
6060
}
6161

62-
demuxSampleAes (data: Uint8Array, decryptData: Uint8Array, timeOffset: number): Promise<DemuxerResult> {
63-
return Promise.reject(new Error('The MP4 demuxer does not support SAMPLE-AES decryption'));
64-
}
62+
// demuxSampleAes (data: Uint8Array, decryptData: Uint8Array, timeOffset: number): Promise<DemuxerResult> {
63+
// return Promise.reject(new Error('The MP4 demuxer does not support SAMPLE-AES decryption'));
64+
// }
6565

6666
destroy () {}
6767
}

0 commit comments

Comments
 (0)