Merge pull request #111 from lpiron/master

CPIX 2.4
Dash-Industry-Forum · Sep 30, 2024 · d672ce1 · d672ce1
2 parents 34aaf9e + cb92934
commit d672ce1
Show file tree

Hide file tree

Showing 39 changed files with 1,272 additions and 272 deletions.
diff --git a/Cpix.bs.md b/Cpix.bs.md
diff --git a/Images/Diagram-EncryptionOneDocumentKey.png b/Images/Diagram-EncryptionOneDocumentKey.png
diff --git a/Images/Diagram-EncryptionSeveralDocumentKeys.png b/Images/Diagram-EncryptionSeveralDocumentKeys.png
diff --git a/Images/DocumentKeyStructure.png b/Images/DocumentKeyStructure.png
diff --git a/Images/ExampleWorkflow-Live.png b/Images/ExampleWorkflow-Live.png
diff --git a/Images/ExampleWorkflow-OnDemand.png b/Images/ExampleWorkflow-OnDemand.png
diff --git a/Images/Schema-ContentKey.png b/Images/Schema-ContentKey.png
diff --git a/Images/Schema-ContentKeyList.png b/Images/Schema-ContentKeyList.png
diff --git a/Images/Schema-ContentKeyPeriod.png b/Images/Schema-ContentKeyPeriod.png
diff --git a/Images/Schema-ContentKeyPeriodList.png b/Images/Schema-ContentKeyPeriodList.png
diff --git a/Images/Schema-ContentKeyUsageRule.png b/Images/Schema-ContentKeyUsageRule.png
diff --git a/Images/Schema-ContentKeyUsageRuleList.png b/Images/Schema-ContentKeyUsageRuleList.png
diff --git a/Images/Schema-ContentProtectionData.png b/Images/Schema-ContentProtectionData.png
diff --git a/Images/Schema-Cpix.png b/Images/Schema-Cpix.png
diff --git a/Images/Schema-CpixView.png b/Images/Schema-CpixView.png
diff --git a/Images/Schema-DRMSystem.png b/Images/Schema-DRMSystem.png
diff --git a/Images/Schema-DRMSystemList.png b/Images/Schema-DRMSystemList.png
diff --git a/Images/Schema-DeliveryData.png b/Images/Schema-DeliveryData.png
diff --git a/Images/Schema-DeliveryDataList.png b/Images/Schema-DeliveryDataList.png
diff --git a/Images/Schema-DocumentKey.png b/Images/Schema-DocumentKey.png
diff --git a/Images/Schema-HDCPData.png b/Images/Schema-HDCPData.png
diff --git a/Images/Schema-HLSSignalingData.png b/Images/Schema-HLSSignalingData.png
diff --git a/Images/Schema-OutputProtectionData.png b/Images/Schema-OutputProtectionData.png
diff --git a/Images/Schema-TopLevel.png b/Images/Schema-TopLevel.png
diff --git a/Images/Schema-UpdateHistoryItemList.png b/Images/Schema-UpdateHistoryItemList.png
diff --git a/Images/UseCase-ClearDeliveryToOne.png b/Images/UseCase-ClearDeliveryToOne.png
diff --git a/Images/UseCase-DeliveryWithDrmSignaling.png b/Images/UseCase-DeliveryWithDrmSignaling.png
diff --git a/Images/UseCase-DeliveryWithIncrementalUpdate.png b/Images/UseCase-DeliveryWithIncrementalUpdate.png
diff --git a/Images/UseCase-DeliveryWithUsageRules.png b/Images/UseCase-DeliveryWithUsageRules.png
diff --git a/Images/UseCase-EncryptedDeliveryToMany.png b/Images/UseCase-EncryptedDeliveryToMany.png
diff --git a/Images/UseCase-MultiplesAssets.png b/Images/UseCase-MultiplesAssets.png
diff --git a/Images/Workflow-EncryptorConsumer-Steps.png b/Images/Workflow-EncryptorConsumer-Steps.png
diff --git a/Images/Workflow-EncryptorConsumer.png b/Images/Workflow-EncryptorConsumer.png
diff --git a/Images/Workflow-EncryptorProducer-Steps.png b/Images/Workflow-EncryptorProducer-Steps.png
diff --git a/Images/Workflow-EncryptorProducer.png b/Images/Workflow-EncryptorProducer.png
diff --git a/Images/Workflow-MultipleProducers-Steps.png b/Images/Workflow-MultipleProducers-Steps.png
diff --git a/Images/Workflow-MultipleProducers.png b/Images/Workflow-MultipleProducers.png
diff --git a/XmlSchema/cpix.xsd b/XmlSchema/cpix.xsd
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSpy v2020 rel. 2 (x64) (http://www.altova.com) by licence@nagra.com (Nagravision SA Kudelski Group) -->
 <xs:schema xmlns:cpix="urn:dashif:org:cpix" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:pskc="urn:ietf:params:xml:ns:keyprov:pskc" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" targetNamespace="urn:dashif:org:cpix" elementFormDefault="qualified" attributeFormDefault="unqualified">
 	<xs:import namespace="http://www.w3.org/XML/1998/namespace"/>
 	<xs:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="xmldsig-core-schema.xsd"/>
@@ -9,9 +8,9 @@
 			<xs:pattern value="[A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}"/>
 		</xs:restriction>
 	</xs:simpleType>
-		<xs:simpleType name="PlaylistType" final="restriction">
+	<xs:simpleType name="PlaylistType" final="restriction">
 		<xs:restriction base="xs:string">
-			<xs:enumeration value="master"/>
+			<xs:enumeration value="multiVariant"/>
 			<xs:enumeration value="media"/>
 		</xs:restriction>
 	</xs:simpleType>
@@ -24,7 +23,7 @@
 	</xs:complexType>
 	<xs:complexType name="UpdateHistoryItemListType">
 		<xs:sequence>
-			<xs:element name="UpdateHistoryItem" type="cpix:UpdateHistoryItemType" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="UpdateHistoryItem" type="cpix:UpdateHistoryItemType" minOccurs="1" maxOccurs="unbounded"/>
 		</xs:sequence>
 		<xs:attribute name="id" type="xs:ID" use="optional"/>
 	</xs:complexType>
@@ -65,20 +64,24 @@
 	</xs:complexType>
 	<xs:complexType name="ContentKeyUsageRuleListType">
 		<xs:sequence>
-			<xs:element name="ContentKeyUsageRule" type="cpix:ContentKeyUsageRuleType" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="ContentKeyUsageRule" type="cpix:ContentKeyUsageRuleType" minOccurs="1" maxOccurs="unbounded"/>
 		</xs:sequence>
 		<xs:attribute name="id" type="xs:ID" use="optional"/>
 		<xs:attribute name="updateVersion" type="xs:integer" use="optional"/>
 	</xs:complexType>
 	<xs:complexType name="ContentKeyPeriodType">
 		<xs:attribute name="id" type="xs:ID" use="optional"/>
 		<xs:attribute name="index" type="xs:integer" use="optional"/>
+		<xs:attribute name="label" type="xs:string" use="optional"/>		
 		<xs:attribute name="start" type="xs:dateTime" use="optional"/>
 		<xs:attribute name="end" type="xs:dateTime" use="optional"/>
+		<xs:attribute name="startOffset" type="xs:duration" use="optional"/>
+		<xs:attribute name="endOffset" type="xs:duration" use="optional"/>
+		<xs:attribute name="duration" type="xs:duration" use="optional"/>
 	</xs:complexType>
 	<xs:complexType name="ContentKeyPeriodListType">
 		<xs:sequence>
-			<xs:element name="ContentKeyPeriod" type="cpix:ContentKeyPeriodType" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="ContentKeyPeriod" type="cpix:ContentKeyPeriodType" minOccurs="1" maxOccurs="unbounded"/>
 		</xs:sequence>
 		<xs:attribute name="id" type="xs:ID" use="optional"/>
 		<xs:attribute name="updateVersion" type="xs:integer" use="optional"/>
@@ -87,28 +90,35 @@
 		<xs:simpleContent>
 			<xs:extension base="xs:base64Binary">
 				<xs:attribute name="playlist" type="cpix:PlaylistType" use="optional"/>
+				<xs:attribute name="allowedCPC" type="xs:string" use="optional"/>
+			</xs:extension>
+		</xs:simpleContent>
+	</xs:complexType>
+	<xs:complexType name="ContentProtectionDataType">
+		<xs:simpleContent>
+			<xs:extension base="xs:base64Binary">
+				<xs:attribute name="robustness" type="xs:string" use="optional"/>
 			</xs:extension>
 		</xs:simpleContent>
 	</xs:complexType>
 	<xs:complexType name="DRMSystemType">
 		<xs:sequence>
-			<xs:element name="PSSH" type="xs:base64Binary" minOccurs="0"/>
-			<xs:element name="ContentProtectionData" type="xs:base64Binary" minOccurs="0"/>
-			<xs:element name="URIExtXKey" type="xs:base64Binary" minOccurs="0"/>
+			<xs:element name="PSSH" type="xs:base64Binary" minOccurs="0" maxOccurs="1"/>
+			<xs:element name="ContentProtectionData" type="cpix:ContentProtectionDataType" minOccurs="0" maxOccurs="1"/>
 			<xs:element name="HLSSignalingData" type="cpix:HLSSignalingDataType" minOccurs="0" maxOccurs="2"/>
 			<xs:element name="SmoothStreamingProtectionHeaderData" type="xs:string" minOccurs="0"/>
-			<xs:element name="HDSSignalingData" type="xs:base64Binary" minOccurs="0"/>
 			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
 		</xs:sequence>
 		<xs:attribute name="id" type="xs:ID" use="optional"/>
 		<xs:attribute name="updateVersion" type="xs:integer" use="optional"/>
 		<xs:attribute name="systemId" type="cpix:UUIDType" use="required"/>
 		<xs:attribute name="kid" type="cpix:UUIDType" use="required"/>
 		<xs:attribute name="name" type="xs:string" use="optional"/>
+		<xs:attribute name="HLSAllowedCPC" type="xs:string" use="optional"/>
 	</xs:complexType>
 	<xs:complexType name="DRMSystemListType">
 		<xs:sequence>
-			<xs:element name="DRMSystem" type="cpix:DRMSystemType" minOccurs="0" maxOccurs="unbounded">
+			<xs:element name="DRMSystem" type="cpix:DRMSystemType" minOccurs="1" maxOccurs="unbounded">
 				<xs:unique name="uniquePlaylistForHLSSignalingData">
 					<xs:selector xpath="cpix:HLSSignalingData"/>
 					<xs:field xpath="@playlist"/>
@@ -118,67 +128,67 @@
 		<xs:attribute name="id" type="xs:ID" use="optional"/>
 		<xs:attribute name="updateVersion" type="xs:integer" use="optional"/>
 	</xs:complexType>
-	<xs:complexType name="KeyType">
+	<xs:complexType name="HDCPData">
 		<xs:sequence>
-			<xs:element name="Issuer" type="xs:string" minOccurs="0"/>
-			<xs:element name="AlgorithmParameters" type="pskc:AlgorithmParametersType" minOccurs="0"/>
-			<xs:element name="KeyProfileId" type="xs:string" minOccurs="0"/>
-			<xs:element name="KeyReference" type="xs:string" minOccurs="0"/>
-			<xs:element name="FriendlyName" type="xs:string" minOccurs="0"/>
-			<xs:element name="Data" type="pskc:KeyDataType" minOccurs="0"/>
-			<xs:element name="UserId" type="xs:string" minOccurs="0"/>
-			<xs:element name="Policy" type="pskc:PolicyType" minOccurs="0"/>
-			<xs:element name="Extensions" type="pskc:ExtensionsType" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="HDCPOutputProtectionData" type="xs:base64Binary" minOccurs="0" maxOccurs="1"/>
 		</xs:sequence>
-		<xs:attribute name="id" type="xs:ID" use="optional"/>
-		<xs:attribute name="Algorithm" type="pskc:KeyAlgorithmType" use="optional"/>
+		<xs:attribute name="HLSHDCPLevel" type="xs:string" use="optional"/>
 	</xs:complexType>
 	<xs:complexType name="ContentKeyType">
-		<xs:complexContent>
-			<xs:extension base="cpix:KeyType">
-				<xs:attribute name="kid" type="cpix:UUIDType" use="required"/>
-				<xs:attribute name="explicitIV" type="xs:base64Binary" use="optional"/>
-				<xs:attribute name="dependsOnKey" type="cpix:UUIDType" use="optional"/>
-				<xs:attribute name="commonEncryptionScheme" type="xs:string" use="optional"/>
-			</xs:extension>
-		</xs:complexContent>
+		<xs:sequence>
+			<xs:element name="HDCPData" type="cpix:HDCPData" minOccurs="0" maxOccurs="1"/>
+			<xs:element name="Data" type="pskc:KeyDataType" minOccurs="0" maxOccurs="1"/>
+		</xs:sequence>
+		<xs:attribute name="id" type="xs:ID" use="optional"/>
+		<xs:attribute name="contentId" type="xs:string" use="optional"/>
+		<xs:attribute name="kid" type="cpix:UUIDType" use="required"/>
+		<xs:attribute name="explicitIV" type="xs:base64Binary" use="optional"/>
+		<xs:attribute name="dependsOnKey" type="cpix:UUIDType" use="optional"/>
+		<xs:attribute name="commonEncryptionScheme" type="xs:string" use="optional"/>
 	</xs:complexType>
 	<xs:complexType name="ContentKeyListType">
 		<xs:sequence>
-			<xs:element name="ContentKey" type="cpix:ContentKeyType" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="ContentKey" type="cpix:ContentKeyType" minOccurs="1" maxOccurs="unbounded"/>
 		</xs:sequence>
 		<xs:attribute name="id" type="xs:ID" use="optional"/>
 		<xs:attribute name="updateVersion" type="xs:integer" use="optional"/>
 	</xs:complexType>
+	<xs:complexType name="DocumentKeyType">
+		<xs:sequence>
+			<xs:element name="Data" type="pskc:KeyDataType" minOccurs="1" maxOccurs="1"/>
+		</xs:sequence>
+		<xs:attribute name="id" type="xs:ID" use="optional"/>
+		<xs:attribute name="encryptsKey" type="cpix:UUIDType" use="optional"/>
+	</xs:complexType>
 	<xs:complexType name="DeliveryDataType">
 		<xs:sequence>
-			<xs:element name="DeliveryKey" type="ds:KeyInfoType"/>
-			<xs:element name="DocumentKey" type="cpix:KeyType"/>
-			<xs:element name="MACMethod" type="pskc:MACMethodType" minOccurs="0"/>
-			<xs:element name="Description" type="xs:string" minOccurs="0"/>
-			<xs:element name="SendingEntity" type="xs:string" minOccurs="0"/>
-			<xs:element name="SenderPointOfContact" type="xs:string" minOccurs="0"/>
-			<xs:element name="ReceivingEntity" type="xs:string" minOccurs="0"/>
+			<xs:element name="DeliveryKey" type="ds:KeyInfoType" minOccurs="1" maxOccurs="1"/>
+			<xs:element name="DocumentKey" type="cpix:DocumentKeyType" minOccurs="1" maxOccurs="unbounded"/>
+			<xs:element name="MACMethod" type="pskc:MACMethodType" minOccurs="0" maxOccurs="1"/>
+			<xs:element name="Description" type="xs:string" minOccurs="0" maxOccurs="1"/>
+			<xs:element name="SendingEntity" type="xs:string" minOccurs="0" maxOccurs="1"/>
+			<xs:element name="SenderPointOfContact" type="xs:string" minOccurs="0" maxOccurs="1"/>
+			<xs:element name="ReceivingEntity" type="xs:string" minOccurs="0" maxOccurs="1"/>
 		</xs:sequence>
 		<xs:attribute name="id" type="xs:ID" use="optional"/>
 		<xs:attribute name="updateVersion" type="xs:integer" use="optional"/>
 		<xs:attribute name="name" type="xs:string" use="optional"/>
 	</xs:complexType>
 	<xs:complexType name="DeliveryDataListType">
 		<xs:sequence>
-			<xs:element name="DeliveryData" type="cpix:DeliveryDataType" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="DeliveryData" type="cpix:DeliveryDataType" minOccurs="1" maxOccurs="unbounded"/>
 		</xs:sequence>
 		<xs:attribute name="id" type="xs:ID" use="optional"/>
 		<xs:attribute name="updateVersion" type="xs:integer" use="optional"/>
 	</xs:complexType>
 	<xs:complexType name="CpixType">
 		<xs:sequence>
-			<xs:element name="DeliveryDataList" type="cpix:DeliveryDataListType" minOccurs="0"/>
-			<xs:element name="ContentKeyList" type="cpix:ContentKeyListType" minOccurs="0"/>
-			<xs:element name="DRMSystemList" type="cpix:DRMSystemListType" minOccurs="0"/>
-			<xs:element name="ContentKeyPeriodList" type="cpix:ContentKeyPeriodListType" minOccurs="0"/>
-			<xs:element name="ContentKeyUsageRuleList" type="cpix:ContentKeyUsageRuleListType" minOccurs="0"/>
-			<xs:element name="UpdateHistoryItemList" type="cpix:UpdateHistoryItemListType" minOccurs="0"/>
+			<xs:element name="DeliveryDataList" type="cpix:DeliveryDataListType" minOccurs="0" maxOccurs="1"/>
+			<xs:element name="ContentKeyList" type="cpix:ContentKeyListType" minOccurs="0" maxOccurs="1"/>
+			<xs:element name="DRMSystemList" type="cpix:DRMSystemListType" minOccurs="0" maxOccurs="1"/>
+			<xs:element name="ContentKeyPeriodList" type="cpix:ContentKeyPeriodListType" minOccurs="0" maxOccurs="1"/>
+			<xs:element name="ContentKeyUsageRuleList" type="cpix:ContentKeyUsageRuleListType" minOccurs="0" maxOccurs="1"/>
+			<xs:element name="UpdateHistoryItemList" type="cpix:UpdateHistoryItemListType" minOccurs="0" maxOccurs="1"/>
 			<xs:element ref="ds:Signature" minOccurs="0" maxOccurs="unbounded"/>
 		</xs:sequence>
 		<xs:attribute name="id" type="xs:ID" use="optional"/>