Merge pull request #36 from MPEGGroup/dev

Merge dev into master
MPEGGroup · Aug 7, 2019 · c78a23f · c78a23f
2 parents 881cc59 + 4a0ce7d
commit c78a23f
Show file tree

Hide file tree

Showing 7 changed files with 59 additions and 95 deletions.
diff --git a/DASH-MPD.xsd b/DASH-MPD.xsd
@@ -130,7 +130,6 @@
 				<xs:attribute ref="xlink:href"/>
 				<xs:attribute ref="xlink:actuate" default="onRequest"/>
 				<xs:attribute ref="xlink:type" fixed="simple"/>
-				<xs:attribute ref="xlink:show" fixed="embed"/>
 				<xs:attribute name="id" type="xs:unsignedInt" use="required"/>
 				<xs:attribute name="inAllPeriods" type="xs:boolean" default="true"/>
 				<xs:attribute name="contentType" type="RFC6838ContentTypeType"/>
@@ -148,8 +147,8 @@
 			<xs:element name="Scope" type="DescriptorType" minOccurs="0" maxOccurs="unbounded"/>
 			<xs:element name="Latency" type="LatencyType" minOccurs="0" maxOccurs="unbounded"/>
 			<xs:element name="PlaybackRate" type="PlaybackRateType" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="OperatingQuality" type="PlaybackRateType" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="OperatingBandwidth" type="PlaybackRateType" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="OperatingQuality" type="OperatingQualityType" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="OperatingBandwidth" type="OperatingBandwidthType" minOccurs="0" maxOccurs="unbounded"/>
 			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
 		</xs:sequence>
 		<xs:attribute name="id" type="xs:unsignedInt"/>
@@ -175,7 +174,15 @@
 	</xs:complexType>
 	<!-- Service Description Operating Quality -->
 	<xs:complexType name="OperatingQualityType">
-		<xs:attribute name="mediaType" type="xs:string"/>
+		<xs:attribute name="mediaType" default="any">
+			<xs:simpleType>
+				<xs:restriction base="xs:string">
+					<xs:enumeration value="video"/>
+					<xs:enumeration value="audio"/>
+					<xs:enumeration value="any"/>
+				</xs:restriction>
+			</xs:simpleType>
+		</xs:attribute>
 		<xs:attribute name="min" type="xs:unsignedInt"/>
 		<xs:attribute name="max" type="xs:unsignedInt"/>
 		<xs:attribute name="target" type="xs:unsignedInt"/>
@@ -185,7 +192,7 @@
 	</xs:complexType>
 	<!-- Service Description Operating Bandwidth -->
 	<xs:complexType name="OperatingBandwidthType">
-		<xs:attribute name="mediaType">
+		<xs:attribute name="mediaType" default="all">
 			<xs:simpleType>
 				<xs:restriction base="xs:string">
 					<xs:enumeration value="video"/>
@@ -472,7 +479,7 @@
 				<xs:attribute name="id" type="StringNoWhitespaceType" default="1"/>
 				<xs:attribute name="preselectionComponents" type="StringVectorType" use="required"/>
 				<xs:attribute name="lang" type="xs:language"/>
-				<xs:attribute name="order" type="PreselectionOrderType" default="unordered"/>
+				<xs:attribute name="order" type="PreselectionOrderType" default="undefined"/>
 			</xs:extension>
 		</xs:complexContent>
 	</xs:complexType>
@@ -540,7 +547,7 @@
 	<!--Preselection Order type-->
 	<xs:simpleType name="PreselectionOrderType">
 		<xs:restriction base="xs:string">
-			<xs:enumeration value="unordered"/>
+			<xs:enumeration value="undefined"/>
 			<xs:enumeration value="time-ordered"/>
 			<xs:enumeration value="fully-ordered"/>
 		</xs:restriction>
@@ -558,7 +565,7 @@
 		<xs:attribute name="presentationTimeOffset" type="xs:unsignedLong"/>
 		<xs:attribute name="presentationDuration" type="xs:unsignedLong"/>
 		<xs:attribute name="timeShiftBufferDepth" type="xs:duration"/>
-		<xs:attribute name="indexRange" type="xs:string"/>
+		<xs:attribute name="indexRange" type="SingleRFC7233RangeType"/>
 		<xs:attribute name="indexRangeExact" type="xs:boolean" default="false"/>
 		<xs:attribute name="availabilityTimeOffset" type="xs:double"/>
 		<xs:attribute name="availabilityTimeComplete" type="xs:boolean"/>
@@ -584,9 +591,14 @@
 			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
 		</xs:sequence>
 		<xs:attribute name="sourceURL" type="xs:anyURI"/>
-		<xs:attribute name="range" type="xs:string"/>
+		<xs:attribute name="range" type="SingleRFC7233RangeType"/>
 		<xs:anyAttribute namespace="##other" processContents="lax"/>
 	</xs:complexType>
+	<xs:simpleType name="SingleRFC7233RangeType"> 
+		<xs:restriction base="xs:string">
+			<xs:pattern value="([0-9]*)(\-([0-9]*))?"/>
+		</xs:restriction>
+	</xs:simpleType>
 	<!-- Failover Content -->
 	<xs:complexType name="FailoverContentType">
 		<xs:sequence>
@@ -622,9 +634,9 @@
 			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
 		</xs:sequence>
 		<xs:attribute name="media" type="xs:anyURI"/>
-		<xs:attribute name="mediaRange" type="xs:string"/>
+		<xs:attribute name="mediaRange" type="SingleRFC7233RangeType"/>
 		<xs:attribute name="index" type="xs:anyURI"/>
-		<xs:attribute name="indexRange" type="xs:string"/>
+		<xs:attribute name="indexRange" type="SingleRFC7233RangeType"/>
 		<xs:anyAttribute namespace="##other" processContents="lax"/>
 	</xs:complexType>
 	<!-- Segment Template -->

diff --git a/example_G15.mpd b/example_G15.mpd
@@ -24,7 +24,6 @@
     </AdaptationSet>
     <!-- Audio (M&E) -->
     <AdaptationSet id="2" mimeType="audio/mp4" codecs="mhm2.0x0C" segmentAlignment="true" startWithSAP="1">
-      <AudioChannelConfiguration schemeIdUri="urn:mpeg:mpegB:cicp:ChannelConfiguration" value="2"/>
       <EssentialProperty schemeIdUri="urn:mpeg:dash:preselection:2016" value="1,2 3"/>
       <EssentialProperty schemeIdUri="urn:mpeg:dash:preselection:2016" value="2,2 4"/>
       <Role schemeIdUri="urn:mpeg:dash:role:2011" value="main"/>
@@ -37,7 +36,6 @@
     </AdaptationSet>
     <!-- Audio (English) -->
     <AdaptationSet id="3" mimeType="audio/mp4" lang="en" codecs="mhm2.0x0C" segmentAlignment="true" startWithSAP="1">
-      <AudioChannelConfiguration schemeIdUri="urn:mpeg:mpegB:cicp:ChannelConfiguration" value="1"/>
       <EssentialProperty schemeIdUri="urn:mpeg:dash:preselection:2016"/>
       <Role schemeIdUri="urn:mpeg:dash:role:2011" value="main"/>
       <SegmentTemplate timescale="48000" media="audio1_$Number$.mp4" initialization="audio1.mp4">
@@ -49,7 +47,6 @@
     </AdaptationSet>
     <!-- Audio (Spanish) -->
     <AdaptationSet id="4" mimeType="audio/mp4" lang="es" codecs="mhm2.0x0C" segmentAlignment="true" startWithSAP="1">
-      <AudioChannelConfiguration schemeIdUri="urn:mpeg:mpegB:cicp:ChannelConfiguration" value="1"/>
       <EssentialProperty schemeIdUri="urn:mpeg:dash:preselection:2016"/>
       <Role schemeIdUri="urn:mpeg:dash:role:2011" value="dub"/>
       <SegmentTemplate timescale="48000" media="audio2_$Number$.mp4" initialization="audio2.mp4">

diff --git a/example_G16.mpd b/example_G16.mpd
@@ -23,7 +23,6 @@
     </AdaptationSet>
     <!-- Audio (M&E) -->
     <AdaptationSet id="2" mimeType="audio/mp4" segmentAlignment="true" startWithSAP="1">
-      <AudioChannelConfiguration schemeIdUri="urn:mpeg:mpegB:cicp:ChannelConfiguration" value="2"/>
       <EssentialProperty schemeIdUri="urn:mpeg:dash:preselection:2016"/>
       <SegmentTemplate timescale="48000" media="audio0_$Number$.mp4" initialization="audio0.mp4">
         <SegmentTimeline>
@@ -34,7 +33,6 @@
     </AdaptationSet>
     <!-- Audio (English) -->
     <AdaptationSet id="3" mimeType="audio/mp4" lang="en" segmentAlignment="true" startWithSAP="1">
-      <AudioChannelConfiguration schemeIdUri="urn:mpeg:mpegB:cicp:ChannelConfiguration" value="1"/>
       <EssentialProperty schemeIdUri="urn:mpeg:dash:preselection:2016"/>
       <SegmentTemplate timescale="48000" media="audio1_$Number$.mp4" initialization="audio1.mp4">
         <SegmentTimeline>
@@ -45,7 +43,6 @@
     </AdaptationSet>
     <!-- Audio (Spanish) -->
     <AdaptationSet id="4" mimeType="audio/mp4" lang="es" segmentAlignment="true" startWithSAP="1">
-      <AudioChannelConfiguration schemeIdUri="urn:mpeg:mpegB:cicp:ChannelConfiguration" value="1"/>
       <EssentialProperty schemeIdUri="urn:mpeg:dash:preselection:2016"/>
       <SegmentTemplate timescale="48000" media="audio2_$Number$.mp4" initialization="audio2.mp4">
         <SegmentTimeline>
@@ -55,11 +52,13 @@
       <Representation id="4" bandwidth="32825" codecs="mhm2.0xC0" audioSamplingRate="48000"/>
     </AdaptationSet>
     <!-- Preselections -->
-    <Preselection id="1" lang="en" preselectionComponents="2 3">
+    <Preselection id="1" tag="1" lang="en" preselectionComponents="2 3">
+      <AudioChannelConfiguration schemeIdUri="urn:mpeg:mpegB:cicp:ChannelConfiguration" value="2"/>
       <Label id="1">Main English</Label>
       <Role schemeIdUri="urn:mpeg:dash:role:2011" value="main"/>
     </Preselection>
-    <Preselection id="2" lang="es" preselectionComponents="2 4">
+    <Preselection id="2" tag="2" lang="es" preselectionComponents="2 4">
+      <AudioChannelConfiguration schemeIdUri="urn:mpeg:mpegB:cicp:ChannelConfiguration" value="2"/>
       <Label id="1">Main Spanish</Label>
       <Role schemeIdUri="urn:mpeg:dash:role:2011" value="dub"/>
     </Preselection>

diff --git a/example_G17.mpd b/example_G17.mpd
@@ -22,7 +22,6 @@
     </AdaptationSet>
     <!-- Audio -->
     <AdaptationSet id="2" mimeType="audio/mp4" codecs="mp4a.40.2,mp4a.40.2,mp4a.40.2" segmentAlignment="true" startWithSAP="1">
-      <AudioChannelConfiguration schemeIdUri="urn:mpeg:dash:23003:3:audio_channel_configuration:2011" value="2"/>
       <EssentialProperty schemeIdUri="urn:mpeg:dash:preselection:2016"/>
       <ContentComponent id="3">
         <Role schemeIdUri="urn:mpeg:dash:role:2011" value="main"/>
@@ -41,11 +40,13 @@
       <Representation id="2" bandwidth="132669" audioSamplingRate="48000"/>
     </AdaptationSet>
     <!-- Preselections -->
-    <Preselection id="1" lang="en" preselectionComponents="3 4">
+    <Preselection id="1" tag="1" lang="en" preselectionComponents="3 4">
+      <AudioChannelConfiguration schemeIdUri="urn:mpeg:mpegB:cicp:ChannelConfiguration" value="2"/>
       <Label id="1">Main English</Label>
       <Role schemeIdUri="urn:mpeg:dash:role:2011" value="main"/>
     </Preselection>
-    <Preselection id="2" lang="es" preselectionComponents="3 5">
+    <Preselection id="2" tag="2" lang="es" preselectionComponents="3 5">
+      <AudioChannelConfiguration schemeIdUri="urn:mpeg:mpegB:cicp:ChannelConfiguration" value="2"/>
       <Label id="1">Main Spanish</Label>
       <Role schemeIdUri="urn:mpeg:dash:role:2011" value="dub"/>
     </Preselection>

diff --git a/example_G18.mpd b/example_G18.mpd
@@ -1,45 +1,28 @@
-<?xml version="1.0" encoding="utf-8"?>
-<MPD
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:mpeg:dash:schema:mpd:2011"
- xsi:schemaLocation="urn:mpeg:dash:schema:mpd:2011 DASH-MPD.xsd"
- type="dynamic"
- availabilityStartTime="2018-12-20T06:28:37Z"
- publishTime="2018-12-20T06:28:37Z"
- minimumUpdatePeriod="PT2S"
- mediaPresentationDuration="PT0H0M54.554S"
- minBufferTime="PT4S"
- profiles="urn:mpeg:dash:profile:isoff-live:2011">
- <Period id="1" start="PT0S">
-    <!-- Video -->
-    <AdaptationSet id="1" mimeType="video/mp4" segmentAlignment="true" startWithSAP="1">
-      <Role schemeIdUri="urn:mpeg:dash:role:2011" value="main"/>
-      <SegmentTemplate timescale="5994" media="video_$Number$.mp4" initialization="video.mp4">
-        <SegmentTimeline>
-          <S t="0" d="12000" r="33"/>
-        </SegmentTimeline>
-      </SegmentTemplate>
-      <Representation id="1" bandwidth="2030173" codecs="hev1.1.6.L120.90" width="1920" height="1080"/>
-    </AdaptationSet>
-    <!-- Audio -->
-    <AdaptationSet id="2" mimeType="audio/mp4" segmentAlignment="true" startWithSAP="1">
-      <SegmentTemplate timescale="48000" media="audio_$Number$.mp4" initialization="audio.mp4">
-        <SegmentTimeline>
-          <S t="0" d="90112" r="129"/>
-        </SegmentTimeline>
-      </SegmentTemplate>
-      <Representation id="2" bandwidth="434965" codecs="mhm1.0x0C" audioSamplingRate="48000"/>
-    </AdaptationSet>
-    <!-- Preselections -->
-    <Preselection id="1" lang="en" tag="101" preselectionComponents="2">
-      <AudioChannelConfiguration schemeIdUri="urn:mpeg:mpegB:cicp:ChannelConfiguration" value="2"/>
-      <Label id="1">Main English</Label>
-      <Role schemeIdUri="urn:mpeg:dash:role:2011" value="main"/>
-    </Preselection>
-    <Preselection id="2" lang="es" tag="202" preselectionComponents="2">
-      <AudioChannelConfiguration schemeIdUri="urn:mpeg:mpegB:cicp:ChannelConfiguration" value="2"/>
-      <Label id="1">Main Spanish</Label>
-      <Role schemeIdUri="urn:mpeg:dash:role:2011" value="dub"/>
-    </Preselection>
- </Period>
+<?xml version="1.0" encoding="UTF-8"?>
+<MPD type="dynamic" xmlns="urn:mpeg:dash:schema:mpd:2011"  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:mpeg:dash:schema:mpd:2011 DASH-MPD.xsd" profiles="urn:mpeg:dash:profile:isoff-ext-live:2014" minBufferTime="PT1.143S" maxSegmentDuration="PT3.84S" minimumUpdatePeriod="PT1H" timeShiftBufferDepth="PT2M" availabilityStartTime="2019-08-06T13:31:00Z"  publishTime="2019-08-06T13:31:00Z">
+	<ServiceDescription id="0">
+		<Scope schemeIdUri="tag:example.com,082019:lowlatencyclients" value="2"/>
+		<Latency min="4800" max="34800" target="6800" referenceId="7"/>
+		<PlaybackRate min="0.96" max="1.04"/>
+	</ServiceDescription>
+	<Period id="first" start="PT0S">
+		<AdaptationSet startWithSAP="2" segmentAlignment="true" par="16:9" id="1" contentType="video" mimeType="video/mp4" >
+			<InbandEventStream schemeIdUri="urn:mpeg:dash:event:2012" value="1" />
+			<ProducerReferenceTime id="7" wallClockTime="2019-08-06T13:44:12Z" presentationTime="158400">
+				<UTCTiming schemeIdUri="urn:mpeg:dash:utc:http-xsdate:2014" value="https://example.com/iso"/>
+			</ProducerReferenceTime>
+			<Role schemeIdUri="urn:mpeg:dash:role:2011" value="main"/>
+		    <SegmentTemplate startNumber="404547501" presentationTimeOffset="310692480000" timescale="200" duration="768" media="$RepresentationID$/$Number%06d$.m4s" initialization="$RepresentationID$/IS.mp4" availabilityTimeOffset="2.88" availabilityTimeComplete="false"/>
+			<Representation id="1280x720p50" codecs="avc3.640020" height="720" width="1280" frameRate="50" bandwidth="5447392" scanType="progressive" />
+		</AdaptationSet>
+		<AdaptationSet startWithSAP="2" segmentAlignment="true" id="6" codecs="mp4a.40.2" audioSamplingRate="48000" contentType="audio" lang="eng" mimeType="audio/mp4" >
+			<AudioChannelConfiguration schemeIdUri="urn:mpeg:dash:23003:3:audio_channel_configuration:2011" value="6"/>
+			<InbandEventStream schemeIdUri="urn:mpeg:dash:event:2012" value="1"/>
+			<Role schemeIdUri="urn:mpeg:dash:role:2011" value="main"/>
+			<SegmentTemplate startNumber="404547501" presentationTimeOffset="74566195200000" timescale="48000" duration="184320" media="$RepresentationID$/$Number%06d$.m4s" initialization="$RepresentationID$/IS.mp4" availabilityTimeOffset="2.88" availabilityTimeComplete="false" />
+			<Representation id="320kbps-5_1" bandwidth="319520" />
+		</AdaptationSet>
+	</Period>
+	<UTCTiming schemeIdUri="urn:mpeg:dash:utc:http-xsdate:2014" value="https://example.com/iso"/>
+	<LeapSecondInformation availabilityStartLeapOffset="37"/>
 </MPD>
diff --git a/example_G19.mpd b/example_G19.mpd
diff --git a/example_G6.mpd b/example_G6.mpd
@@ -25,7 +25,7 @@
                 <SubRepresentation level="0" contentComponent="0" bandwidth="128000" codecs="avc1.4D401E" maxPlayoutRate="4"/> 
                 <SubRepresentation level="1" dependencyLevel="0" contentComponent="0" bandwidth="320000" codecs="avc2.4D401E"/>
                 <SubRepresentation level="2" contentComponent="1" bandwidth="64000" codecs="mp4a.40"/> 
-                <SegmentBase indexRange="7632" />
+                <SegmentBase indexRange="7632-7632" />
             </Representation> 
         </AdaptationSet> 
     </Period>