Merge pull request #107 from lpiron/master

Dash-Industry-Forum · Aug 8, 2023 · a9c3f14 · a9c3f14
2 parents b7ececf + 181dacf
commit a9c3f14
Show file tree

Hide file tree

Showing 44 changed files with 644 additions and 660 deletions.
diff --git a/Cpix.bs.md b/Cpix.bs.md
diff --git a/Diagrams/DocumentKeyStructure.wsd b/Diagrams/DocumentKeyStructure.wsd
diff --git a/Diagrams/UseCase-ClearDeliveryToOne.wsd b/Diagrams/UseCase-ClearDeliveryToOne.wsd
diff --git a/Diagrams/UseCase-DeliveryWithDrmSignaling.wsd b/Diagrams/UseCase-DeliveryWithDrmSignaling.wsd
diff --git a/Diagrams/UseCase-DeliveryWithIncrementalUpdate_Part1.wsd b/Diagrams/UseCase-DeliveryWithIncrementalUpdate_Part1.wsd
diff --git a/Diagrams/UseCase-DeliveryWithIncrementalUpdate_Part2.wsd b/Diagrams/UseCase-DeliveryWithIncrementalUpdate_Part2.wsd
diff --git a/Diagrams/UseCase-DeliveryWithUsageRules.wsd b/Diagrams/UseCase-DeliveryWithUsageRules.wsd
diff --git a/Diagrams/UseCase-EncryptedDeliveryToMany.wsd b/Diagrams/UseCase-EncryptedDeliveryToMany.wsd
diff --git a/Images/Architecture.png b/Images/Architecture.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-AudioFilter.png b/Images/Schema-AudioFilter.png
diff --git a/Images/Schema-BitrateFilter.png b/Images/Schema-BitrateFilter.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-Cpix.png b/Images/Schema-Cpix.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-HLSSignalingData.png b/Images/Schema-HLSSignalingData.png
diff --git a/Images/Schema-Key.png b/Images/Schema-Key.png
diff --git a/Images/Schema-KeyPeriodFilter.png b/Images/Schema-KeyPeriodFilter.png
diff --git a/Images/Schema-LabelFilter.png b/Images/Schema-LabelFilter.png
diff --git a/Images/Schema-UpdateHistoryItem.png b/Images/Schema-UpdateHistoryItem.png
diff --git a/Images/Schema-UpdateHistoryItemList.png b/Images/Schema-UpdateHistoryItemList.png
diff --git a/Images/Schema-VideoFilter.png b/Images/Schema-VideoFilter.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/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,9 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSpy v2008 (http://www.altova.com) by It licence (Nagravision SA) -->
+<!-- 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"/>
 	<xs:import namespace="urn:ietf:params:xml:ns:keyprov:pskc" schemaLocation="pskc.xsd"/>
+	<xs:simpleType name="UUIDType">
+		<xs:restriction base="xs:string">
+			<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:restriction base="xs:string">
+			<xs:enumeration value="master"/>
+			<xs:enumeration value="media"/>
+		</xs:restriction>
+	</xs:simpleType>
 	<xs:complexType name="UpdateHistoryItemType">
 		<xs:attribute name="id" type="xs:ID" use="optional"/>
 		<xs:attribute name="updateVersion" type="xs:integer" use="required"/>
@@ -49,7 +60,7 @@
 			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
 		</xs:sequence>
 		<xs:attribute name="id" type="xs:ID" use="optional"/>
-		<xs:attribute name="kid" type="xs:string" use="required"/>
+		<xs:attribute name="kid" type="cpix:UUIDType" use="required"/>
 		<xs:attribute name="intendedTrackType" type="xs:string" use="optional"/>
 	</xs:complexType>
 	<xs:complexType name="ContentKeyUsageRuleListType">
@@ -79,12 +90,6 @@
 			</xs:extension>
 		</xs:simpleContent>
 	</xs:complexType>
-	<xs:simpleType name="PlaylistType" final="restriction">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="master"/>
-			<xs:enumeration value="media"/>
-		</xs:restriction>
-	</xs:simpleType>
 	<xs:complexType name="DRMSystemType">
 		<xs:sequence>
 			<xs:element name="PSSH" type="xs:base64Binary" minOccurs="0"/>
@@ -97,8 +102,8 @@
 		</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="xs:string" use="required"/>
-		<xs:attribute name="kid" type="xs:string" use="required"/>
+		<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:complexType>
 	<xs:complexType name="DRMSystemListType">
@@ -128,23 +133,13 @@
 		<xs:attribute name="id" type="xs:ID" use="optional"/>
 		<xs:attribute name="Algorithm" type="pskc:KeyAlgorithmType" use="optional"/>
 	</xs:complexType>
-	<xs:simpleType name="CencSchemeType" final="restriction">
-		<xs:restriction base="xs:string">
-			<xs:length value="4"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="KeyIdType">
-		<xs:restriction base="xs:string">
-			<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:complexType name="ContentKeyType">
 		<xs:complexContent>
 			<xs:extension base="cpix:KeyType">
-				<xs:attribute name="kid" type="cpix:KeyIdType" use="required"/>
+				<xs:attribute name="kid" type="cpix:UUIDType" use="required"/>
 				<xs:attribute name="explicitIV" type="xs:base64Binary" use="optional"/>
-				<xs:attribute name="dependsOnKey" type="xs:string" use="optional"/>
-				<xs:attribute name="commonEncryptionScheme" type="cpix:CencSchemeType" 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:complexType>