Commit 827937a5 authored by bradburyr's avatar bradburyr
Browse files

Merge branch 'in-session-repair' into 'REL-19' 

[AMD_PRO-MED] In-session unicast repair (26346-CR0677) and time service endpoints (26517-CR0031)

See merge request !9
parents 433272f9 c50b2647

TS26346_AssociatedDeliveryProceduresDescription.xsd

+6 −2
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<xs:schema targetNamespace="urn:3gpp:metadata:2005:MBMS:associatedProcedure" version="2"

<xs:schema targetNamespace="urn:3gpp:metadata:2005:MBMS:associatedProcedure" version="3"

	xmlns="urn:3gpp:metadata:2005:MBMS:associatedProcedure"

	xmlns:xs="http://www.w3.org/2001/XMLSchema"

	xmlns:r12="urn:3gpp:metadata:2005:MBMS:associatedProcedure-rel-12-extension"

	xmlns:r13="urn:3gpp:metadata:2005:MBMS:associatedProcedure-rel-13-extension"

	xmlns:r14="urn:3gpp:metadata:2005:MBMS:associatedProcedure-rel-14-extension"

	xmlns:r19="urn:3gpp:metadata:2005:MBMS:associatedProcedure-rel-19-extension"

	xmlns:sv="urn:3gpp:metadata:2009:MBMS:schemaVersion"

	elementFormDefault="qualified">

	<xs:annotation>

		<xs:documentation>MBMS Associated Delivery Procedures Description schema</xs:documentation>

		<xs:documentation>3GPP TS 26.346 clause 9.5.1</xs:documentation>

		<xs:documentation>Copyright © 2005, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.</xs:documentation>

		<xs:documentation>Copyright © 2005-2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.</xs:documentation>

	</xs:annotation>



	<xs:import namespace="urn:3gpp:metadata:2009:MBMS:schemaVersion" schemaLocation="TS26346_SchemaVersion.xsd"/>

	<xs:import namespace="urn:3gpp:metadata:2005:MBMS:associatedProcedure-rel-12-extension" schemaLocation="TS26346_AssociatedDeliveryProceduresDescription_Extensions_Rel-12.xsd"/>

	<xs:import namespace="urn:3gpp:metadata:2005:MBMS:associatedProcedure-rel-13-extension" schemaLocation="TS26346_AssociatedDeliveryProceduresDescription_Extensions_Rel-13.xsd"/>

	<xs:import namespace="urn:3gpp:metadata:2005:MBMS:associatedProcedure-rel-14-extension" schemaLocation="TS26346_AssociatedDeliveryProceduresDescription_Extensions_Rel-14.xsd"/>

	<xs:import namespace="urn:3gpp:metadata:2005:MBMS:associatedProcedure-rel-19-extension" schemaLocation="TS26346_AssociatedDeliveryProceduresDescription_Extensions_Rel-19.xsd"/>



	<xs:element name="associatedProcedureDescription" type="associatedProcedureType"/>

	<xs:complexType name="associatedProcedureType">
@@ -28,6 +30,8 @@ 
			<xs:element ref="sv:schemaVersion"/>

			<xs:element ref="r13:DASHQoEProcedure" minOccurs="0"/>

			<xs:element ref="sv:delimiter"/>

			<xs:element ref="r19:InSessionRepair" minOccurs="0"/>

			<xs:element ref="sv:delimiter"/>

			<xs:any namespace="##other" processContents="skip" minOccurs="0" maxOccurs="unbounded"/>

		</xs:sequence>

	</xs:complexType>

TS26346_AssociatedDeliveryProceduresDescription_Extensions_Rel-19.xsd

0 → 100755
+20 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<xs:schema xmlns="urn:3gpp:metadata:2005:MBMS:associatedProcedure-rel-19-extension" xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:3gpp:metadata:2005:MBMS:associatedProcedure-rel-19-extension" elementFormDefault="qualified">

	<xs:annotation>

		<xs:documentation>MBMS Associated Delivery Procedures Description schema extensions (Release 13)</xs:documentation>

		<xs:documentation>3GPP TS 26.346 clause 9.5.1</xs:documentation>

		<xs:documentation>Copyright © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.</xs:documentation>

	</xs:annotation>

	<xs:element name="InSessionRepair" type="InSessionRepairType"/>

	<xs:complexType name="InSessionRepairType">

		<xs:sequence>

			<xs:element name="ObjectDistributionBaseLocator" type="xs:anyURI" minOccurs="0"/>

			<xs:element name="ObjectRepairBaseLocator" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded"/>

			<xs:any namespace="##other" processContents="skip" minOccurs="0" maxOccurs="unbounded"/>

		</xs:sequence>

		<xs:attribute name="offsetTime" type="xs:unsignedInt"/>

		<xs:attribute name="randomTimePeriod" type="xs:unsignedInt"/>

		<xs:attribute name="repairLimitPercentage" type="xs:unsignedInt"/>

		<xs:anyAttribute processContents="skip"/>

	</xs:complexType>

</xs:schema>

TS26346_FLUTE-FDT.xsd

+7 −2
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<xs:schema targetNamespace="urn:IETF:metadata:2005:FLUTE:FDT" version="4"

<xs:schema targetNamespace="urn:IETF:metadata:2005:FLUTE:FDT" version="5"

	xmlns="urn:IETF:metadata:2005:FLUTE:FDT" 

	xmlns:xs="http://www.w3.org/2001/XMLSchema"

	xmlns:mbms2005="urn:3GPP:metadata:2005:MBMS:FLUTE:FDT"
@@ -8,12 +8,13 @@ 
	xmlns:mbms2009="urn:3GPP:metadata:2009:MBMS:FLUTE:FDT_ext"

	xmlns:mbms2012="urn:3GPP:metadata:2012:MBMS:FLUTE:FDT"

	xmlns:mbms2015="urn:3GPP:metadata:2015:MBMS:FLUTE:FDT"

	xmlns:mbms2025="urn:3GPP:metadata:2025:MBMS:FLUTE:FDT"

	xmlns:sv="urn:3gpp:metadata:2009:MBMS:schemaVersion"

	elementFormDefault="qualified">

	<xs:annotation>

		<xs:documentation>Consolidated MBMS FLUTE File Delivery Table schema</xs:documentation>

		<xs:documentation>3GPP TS 26.346 clause 7.2.10.1</xs:documentation>

		<xs:documentation>Copyright © 2005, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.</xs:documentation>

		<xs:documentation>Copyright © 2005-2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.</xs:documentation>

	</xs:annotation>



	<xs:import namespace="urn:3GPP:metadata:2005:MBMS:FLUTE:FDT"
@@ -28,6 +29,8 @@ 
		schemaLocation="TS26346_FLUTE-FDT_Extensions_Rel-11.xsd"/>

	<xs:import namespace="urn:3GPP:metadata:2015:MBMS:FLUTE:FDT"

		schemaLocation="TS26346_FLUTE-FDT_Extensions_Rel-13.xsd"/>

	<xs:import namespace="urn:3GPP:metadata:2025:MBMS:FLUTE:FDT"

		schemaLocation="TS26346_FLUTE-FDT_Extensions_Rel-19.xsd"/>

	<xs:import namespace="urn:3gpp:metadata:2009:MBMS:schemaVersion"

		schemaLocation="TS26346_SchemaVersion.xsd"/>
@@ -85,6 +88,8 @@ 
		<xs:attribute ref="mbms2012:FEC-Redundancy-Level" use="optional"/>

		<xs:attribute ref="mbms2012:File-ETag" use="optional"/>

		<xs:attribute ref="mbms2015:IndependentUnitPositions" use="optional"/>

		<xs:attribute ref="mbms2025:Repair-Start" use="optional"/>

		<xs:attribute ref="mbms2025:Repair-Limit-Percentage" use="optional"/>

		<xs:anyAttribute processContents="skip"/>

	</xs:complexType>

</xs:schema>

TS26346_FLUTE-FDT_Extensions_Rel-19.xsd

0 → 100755
+14 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<xs:schema targetNamespace="urn:3GPP:metadata:2025:MBMS:FLUTE:FDT"

	xmlns="urn:3GPP:metadata:2025:MBMS:FLUTE:FDT" 

	xmlns:xs="http://www.w3.org/2001/XMLSchema" 

	elementFormDefault="qualified">

	<xs:annotation>

		<xs:documentation>MBMS FLUTE FDT schema extensions (Release 19)</xs:documentation>

		<xs:documentation>3GPP TS 26.346 clause 7.2.10.2</xs:documentation>

		<xs:documentation>Copyright © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.</xs:documentation>

	</xs:annotation>



	<xs:attribute name="Repair-Start" type="xs:dateTime"/>

    <xs:attribute name="Repair-Limit-Percentage" type="xs:unsignedInt"/>

</xs:schema>

TS26346_FLUTE-FDT_Profiled.xsd

+4 −3
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<xs:schema targetNamespace="urn:3GPP:metadata:2022:FLUTE:FDT" version="2"

<xs:schema targetNamespace="urn:3GPP:metadata:2022:FLUTE:FDT" version="3"

	xmlns="urn:3GPP:metadata:2022:FLUTE:FDT"

	xmlns:xs="http://www.w3.org/2001/XMLSchema"

	elementFormDefault="qualified">

	<xs:annotation>

		<xs:documentation>Consolidated MBMS FLUTE File Delivery Table schema</xs:documentation>

		<xs:documentation>3GPP TS 26.346 clause L.6.1</xs:documentation>

		<xs:documentation>Copyright © 2022, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.</xs:documentation>

		<xs:documentation>Copyright © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.</xs:documentation>

	</xs:annotation>



	<xs:element name="FDT-Instance" type="FDT-InstanceType"/>
@@ -34,7 +34,6 @@ 
			<xs:element name="Cache-Control" type="CacheControlType" minOccurs="0"/>

			<xs:any namespace="##other" processContents="skip" minOccurs="0" maxOccurs="unbounded"/>

		</xs:sequence>

		<xs:attribute name="Expires" type="xs:string" use="optional"/>

		<xs:attribute name="Content-Location" type="xs:anyURI" use="required"/>

		<xs:attribute name="TOI" type="xs:positiveInteger" use="required"/>

		<xs:attribute name="Content-Length" type="xs:unsignedLong" use="optional"/>
@@ -50,6 +49,8 @@ 
		<xs:attribute name="FEC-OTI-Scheme-Specific-Info" type="xs:base64Binary" use="optional"/>

		<xs:attribute name="FEC-Redundancy-Level" type="xs:unsignedInt" use="optional"/>

		<xs:attribute name="File-ETag" type="xs:string" use="optional"/>

		<xs:attribute name="Repair-Start" type="xs:dateTime"/>

		<xs:attribute name="Repair-Limit-Percentage" type="xs:unsignedInt"/>

		<xs:anyAttribute processContents="skip"/>

	</xs:complexType>