feat: parse mp4protection ContentProtection tags

videojs · Dec 8, 2023 · cc0c2e4 · cc0c2e4
1 parent 56eee17
commit cc0c2e4
Show file tree

Hide file tree

Showing 7 changed files with 171 additions and 8 deletions.
diff --git a/src/inheritAttributes.js b/src/inheritAttributes.js
@@ -10,7 +10,9 @@ const keySystemsMap = {
  'urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b': 'org.w3.clearkey',
  'urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed': 'com.widevine.alpha',
  'urn:uuid:9a04f079-9840-4286-ab92-e65be0885f95': 'com.microsoft.playready',
- 'urn:uuid:f239e769-efa3-4850-9c16-a903c6932efb': 'com.adobe.primetime'
+ 'urn:uuid:f239e769-efa3-4850-9c16-a903c6932efb': 'com.adobe.primetime',
+ // ISO-IEC 23009-1_2022 5.8.5.2.2 The mp4 Protection Scheme
+ 'urn:mpeg:dash:mp4protection:2011': 'mp4protection'
 };
 
 /**

diff --git a/test/inheritAttributes.test.js b/test/inheritAttributes.test.js
@@ -2556,6 +2556,13 @@ QUnit.test('keySystem info for representation - lowercase UUIDs', function(asser
  value: 'Widevine'
  },
  pssh: widevinePsshBytes
+ },
+ 'mp4protection': {
+ attributes: {
+ 'cenc:default_KID': '0872786e-f9e7-465f-a3a2-4e5b0ef8fa45',
+ 'schemeIdUri': 'urn:mpeg:dash:mp4protection:2011',
+ 'value': 'cenc'
+ }
  }
  },
  'height': 404,
@@ -2644,6 +2651,13 @@ QUnit.test('keySystem info for representation - uppercase UUIDs', function(asser
  value: 'Widevine'
  },
  pssh: widevinePsshBytes
+ },
+ 'mp4protection': {
+ attributes: {
+ 'cenc:default_KID': '0872786E-F9E7-465F-A3A2-4E5B0EF8FA45',
+ 'schemeIdUri': 'urn:mpeg:dash:mp4protection:2011',
+ 'value': 'cenc'
+ }
  }
  },
  'height': 404,

diff --git a/test/manifests/maat_vtt_segmentTemplate.js b/test/manifests/maat_vtt_segmentTemplate.js
@@ -84,6 +84,13 @@ export const parsedManifest = {
  schemeIdUri: 'urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed'
  },
  pssh: new Uint8Array([181, 235, 45])
+ },
+ 'mp4protection': {
+ attributes: {
+ 'cenc:default_KID': 'aaa',
+ 'schemeIdUri': 'urn:mpeg:dash:mp4protection:2011',
+ 'value': 'cenc'
+ }
  }
  }
  },
@@ -159,6 +166,13 @@ export const parsedManifest = {
  schemeIdUri: 'urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed'
  },
  pssh: new Uint8Array([181, 235, 45])
+ },
+ 'mp4protection': {
+ attributes: {
+ 'cenc:default_KID': 'aaa',
+ 'schemeIdUri': 'urn:mpeg:dash:mp4protection:2011',
+ 'value': 'cenc'
+ }
  }
  }
  }
@@ -242,6 +256,13 @@ export const parsedManifest = {
  schemeIdUri: 'urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed'
  },
  pssh: new Uint8Array([181, 235, 45])
+ },
+ 'mp4protection': {
+ attributes: {
+ 'cenc:default_KID': 'aaa',
+ 'schemeIdUri': 'urn:mpeg:dash:mp4protection:2011',
+ 'value': 'cenc'
+ }
  }
  }
  },
@@ -317,6 +338,13 @@ export const parsedManifest = {
  schemeIdUri: 'urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed'
  },
  pssh: new Uint8Array([181, 235, 45])
+ },
+ 'mp4protection': {
+ attributes: {
+ 'cenc:default_KID': 'aaa',
+ 'schemeIdUri': 'urn:mpeg:dash:mp4protection:2011',
+ 'value': 'cenc'
+ }
  }
  }
  }
@@ -480,6 +508,13 @@ export const parsedManifest = {
  schemeIdUri: 'urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed'
  },
  pssh: new Uint8Array([181, 235, 45])
+ },
+ 'mp4protection': {
+ attributes: {
+ 'cenc:default_KID': 'aaa',
+ 'schemeIdUri': 'urn:mpeg:dash:mp4protection:2011',
+ 'value': 'cenc'
+ }
  }
  }
  },
@@ -562,6 +597,13 @@ export const parsedManifest = {
  schemeIdUri: 'urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed'
  },
  pssh: new Uint8Array([181, 235, 45])
+ },
+ 'mp4protection': {
+ attributes: {
+ 'cenc:default_KID': 'aaa',
+ 'schemeIdUri': 'urn:mpeg:dash:mp4protection:2011',
+ 'value': 'cenc'
+ }
  }
  }
  }

diff --git a/test/manifests/multiperiod-dynamic.js b/test/manifests/multiperiod-dynamic.js
@@ -310,6 +310,13 @@ export const parsedManifest = {
  schemeIdUri: 'urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed'
  },
  pssh: new Uint8Array([181, 235, 45])
+ },
+ 'mp4protection': {
+ attributes: {
+ 'cenc:default_KID': 'aaa',
+ 'schemeIdUri': 'urn:mpeg:dash:mp4protection:2011',
+ 'value': 'cenc'
+ }
  }
  }
  },
@@ -596,6 +603,13 @@ export const parsedManifest = {
  schemeIdUri: 'urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed'
  },
  pssh: new Uint8Array([181, 235, 45])
+ },
+ 'mp4protection': {
+ attributes: {
+ 'cenc:default_KID': 'aaa',
+ 'schemeIdUri': 'urn:mpeg:dash:mp4protection:2011',
+ 'value': 'cenc'
+ }
  }
  }
  }
@@ -901,6 +915,13 @@ export const parsedManifest = {
  schemeIdUri: 'urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed'
  },
  pssh: new Uint8Array([181, 235, 45])
+ },
+ 'mp4protection': {
+ attributes: {
+ 'cenc:default_KID': 'aaa',
+ 'schemeIdUri': 'urn:mpeg:dash:mp4protection:2011',
+ 'value': 'cenc'
+ }
  }
  }
  },
@@ -1194,6 +1215,13 @@ export const parsedManifest = {
  schemeIdUri: 'urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed'
  },
  pssh: new Uint8Array([181, 235, 45])
+ },
+ 'mp4protection': {
+ attributes: {
+ 'cenc:default_KID': 'aaa',
+ 'schemeIdUri': 'urn:mpeg:dash:mp4protection:2011',
+ 'value': 'cenc'
+ }
  }
  }
  },
@@ -1487,6 +1515,13 @@ export const parsedManifest = {
  schemeIdUri: 'urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed'
  },
  pssh: new Uint8Array([181, 235, 45])
+ },
+ 'mp4protection': {
+ attributes: {
+ 'cenc:default_KID': 'aaa',
+ 'schemeIdUri': 'urn:mpeg:dash:mp4protection:2011',
+ 'value': 'cenc'
+ }
  }
  }
  }

diff --git a/test/manifests/multiperiod.js b/test/manifests/multiperiod.js
@@ -310,6 +310,13 @@ export const parsedManifest = {
  schemeIdUri: 'urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed'
  },
  pssh: new Uint8Array([181, 235, 45])
+ },
+ 'mp4protection': {
+ attributes: {
+ 'cenc:default_KID': 'aaa',
+ 'schemeIdUri': 'urn:mpeg:dash:mp4protection:2011',
+ 'value': 'cenc'
+ }
  }
  }
  },
@@ -596,6 +603,13 @@ export const parsedManifest = {
  schemeIdUri: 'urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed'
  },
  pssh: new Uint8Array([181, 235, 45])
+ },
+ 'mp4protection': {
+ attributes: {
+ 'cenc:default_KID': 'aaa',
+ 'schemeIdUri': 'urn:mpeg:dash:mp4protection:2011',
+ 'value': 'cenc'
+ }
  }
  }
  }
@@ -901,6 +915,13 @@ export const parsedManifest = {
  schemeIdUri: 'urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed'
  },
  pssh: new Uint8Array([181, 235, 45])
+ },
+ 'mp4protection': {
+ attributes: {
+ 'cenc:default_KID': 'aaa',
+ 'schemeIdUri': 'urn:mpeg:dash:mp4protection:2011',
+ 'value': 'cenc'
+ }
  }
  }
  },
@@ -1194,6 +1215,13 @@ export const parsedManifest = {
  schemeIdUri: 'urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed'
  },
  pssh: new Uint8Array([181, 235, 45])
+ },
+ 'mp4protection': {
+ attributes: {
+ 'cenc:default_KID': 'aaa',
+ 'schemeIdUri': 'urn:mpeg:dash:mp4protection:2011',
+ 'value': 'cenc'
+ }
  }
  }
  },
@@ -1487,6 +1515,13 @@ export const parsedManifest = {
  schemeIdUri: 'urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed'
  },
  pssh: new Uint8Array([181, 235, 45])
+ },
+ 'mp4protection': {
+ attributes: {
+ 'cenc:default_KID': 'aaa',
+ 'schemeIdUri': 'urn:mpeg:dash:mp4protection:2011',
+ 'value': 'cenc'
+ }
  }
  }
  }

diff --git a/test/manifests/vtt_codecs.js b/test/manifests/vtt_codecs.js
@@ -90,6 +90,13 @@ export const parsedManifest = {
  schemeIdUri: 'urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed'
  },
  pssh: new Uint8Array([181, 235, 45])
+ },
+ 'mp4protection': {
+ attributes: {
+ 'cenc:default_KID': 'aaa',
+ 'schemeIdUri': 'urn:mpeg:dash:mp4protection:2011',
+ 'value': 'cenc'
+ }
  }
  }
  },
@@ -168,6 +175,13 @@ export const parsedManifest = {
  schemeIdUri: 'urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed'
  },
  pssh: new Uint8Array([181, 235, 45])
+ },
+ 'mp4protection': {
+ attributes: {
+ 'cenc:default_KID': 'aaa',
+ 'schemeIdUri': 'urn:mpeg:dash:mp4protection:2011',
+ 'value': 'cenc'
+ }
  }
  }
  }
@@ -254,6 +268,13 @@ export const parsedManifest = {
  schemeIdUri: 'urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed'
  },
  pssh: new Uint8Array([181, 235, 45])
+ },
+ 'mp4protection': {
+ attributes: {
+ 'cenc:default_KID': 'aaa',
+ 'schemeIdUri': 'urn:mpeg:dash:mp4protection:2011',
+ 'value': 'cenc'
+ }
  }
  }
  },
@@ -332,6 +353,13 @@ export const parsedManifest = {
  schemeIdUri: 'urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed'
  },
  pssh: new Uint8Array([181, 235, 45])
+ },
+ 'mp4protection': {
+ attributes: {
+ 'cenc:default_KID': 'aaa',
+ 'schemeIdUri': 'urn:mpeg:dash:mp4protection:2011',
+ 'value': 'cenc'
+ }
  }
  }
  }
@@ -505,6 +533,13 @@ export const parsedManifest = {
  schemeIdUri: 'urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed'
  },
  pssh: new Uint8Array([181, 235, 45])
+ },
+ 'mp4protection': {
+ attributes: {
+ 'cenc:default_KID': 'aaa',
+ 'schemeIdUri': 'urn:mpeg:dash:mp4protection:2011',
+ 'value': 'cenc'
+ }
  }
  }
  },
@@ -590,6 +625,13 @@ export const parsedManifest = {
  schemeIdUri: 'urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed'
  },
  pssh: new Uint8Array([181, 235, 45])
+ },
+ 'mp4protection': {
+ attributes: {
+ 'cenc:default_KID': 'aaa',
+ 'schemeIdUri': 'urn:mpeg:dash:mp4protection:2011',
+ 'value': 'cenc'
+ }
  }
  }
  }

diff --git a/test/segment/segmentTemplate.test.js b/test/segment/segmentTemplate.test.js
@@ -760,13 +760,6 @@ QUnit.test('correctly handles negative @r repeat value for last S', function(ass
  );
 });
 
-QUnit.skip(
- 'detects discontinuity when @t time is greater than expected start time',
- function(assert) {
-
- }
-);
-
 QUnit.module('segmentTemplate - type ="dynamic"');
 
 QUnit.test('correctly handles duration', function(assert) {