Merge branch 'feature/xep-0167'

xep-0167.xml

@@ -42,6 +42,12 @@
   &seanegan;
   &robmcqueen;
   &diana;
+  <revision>
+    <version>1.2.0</version>
+    <date>2020-04-22</date>
+    <initials>dg</initials>
+    <remark><p>Introduce &lt;rtcp-mux/&gt; element to signal the ability to multiplex RTP Data and Control Packets.</p></remark>
+  </revision>
   <revision>
     <version>1.1.2</version>
     <date>2020-03-19</date>
@@ -341,12 +347,14 @@
       <payload-type id='0' name='PCMU' clockrate='16000'/>
       <payload-type id='8' name='PCMA'/>
       <payload-type id='13' name='CN'/>
+      <rtcp-mux/>
     </description>
 ]]></code>
   <p>The &DESCRIPTION; element is intended to be a child of a Jingle &CONTENT; element as specified in <cite>XEP-0166</cite>.</p>
   <p>The &DESCRIPTION; element MUST possess a 'media' attribute that specifies the media type, such as "audio" or "video", where the media type SHOULD be as registered at &ianamedia;.</p>
   <p>The &DESCRIPTION; element MAY possess a 'ssrc' attribute that specifies the 32-bit synchronization source for this media stream, as defined in <cite>RFC 3550</cite>.</p>
   <p>After inclusion of one or more &PAYLOADTYPE; child elements, the &DESCRIPTION; element MAY also contain a &lt;bandwidth/&gt; element that specifies the allowable or preferred bandwidth for use by this application type. The 'type' attribute of the &lt;bandwidth/&gt; element SHOULD be a value for the SDP "bwtype" parameter as listed in the &ianasdp;. For RTP sessions, often the &lt;bandwidth/&gt; element will specify the "session bandwidth" as described in Section 6.2 of <cite>RFC 3550</cite>, measured in kilobits per second as described in Section 5.2 of <cite>RFC 4566</cite>.</p>
+  <p>Also, the &DESCRIPTION; element MAY contain a &lt;rtcp-mux/&gt; element that specifies the ability to multiplex RTP Data and Control Packets on a single port as described in &rfc5761;.</p>
   <p>The encodings SHOULD be provided in order of preference by placing the most-preferred payload type as the first &PAYLOADTYPE; child of the &DESCRIPTION; element and the least-preferred payload type as the last child.</p>
   <p>The attributes of the &PAYLOADTYPE; element are as follows:</p>
   <table caption='Payload-Type Attributes'>
@@ -1759,6 +1767,9 @@ Romeo                         Juliet
                     type='payloadElementType'
                     minOccurs='0'
                     maxOccurs='unbounded'/>
+        <xs:element name='rtcp-mux'
+                    minOccurs='0'
+                    maxOccurs='1'/>
         <xs:element name='encryption'
                     type='encryptionElementType'
                     minOccurs='0'

xep.ent

@@ -637,6 +637,7 @@ THE SOFTWARE.
 <!ENTITY rfc5574 "<span class='ref'><link url='http://tools.ietf.org/html/rfc5574'>RFC 5574</link></span> <note>RFC 5574: RTP Payload Format for the Speex Codec &lt;<link url='http://tools.ietf.org/html/rfc5574'>http://tools.ietf.org/html/rfc5574</link>&gt;.</note>" >
 <!ENTITY rfc5576 "<span class='ref'><link url='http://tools.ietf.org/html/rfc5576'>RFC 5576</link></span> <note>RFC 5576: Source-Specific Media Attributes in the Session Description Protocol (SDP) &lt;<link url='http://tools.ietf.org/html/rfc5576'>http://tools.ietf.org/html/rfc5576</link>&gt;.</note>" >
 <!ENTITY rfc5646 "<span class='ref'><link url='http://tools.ietf.org/html/rfc5646'>RFC 5646</link></span> <note>RFC 5646: Tags for Identifying Languages &lt;<link url='http://tools.ietf.org/html/rfc5646'>http://tools.ietf.org/html/rfc5646</link>&gt;.</note>" >
+<!ENTITY rfc5761 "<span class='ref'><link url='http://tools.ietf.org/html/rfc5761'>RFC 5761</link></span> <note>RFC 5761: Multiplexing RTP Data and Control Packets on a Single Port &lt;<link url='http://tools.ietf.org/html/rfc5761'>http://tools.ietf.org/html/rfc5761</link>&gt;.</note>" >
 <!ENTITY rfc5763 "<span class='ref'><link url='http://tools.ietf.org/html/rfc5763'>RFC 5763</link></span> <note>RFC 5763: Framework for Establishing a Secure Real-time Transport Protocol (SRTP) Security Context Using Datagram Transport Layer Security (DTLS) &lt;<link url='http://tools.ietf.org/html/rfc5763'>http://tools.ietf.org/html/rfc5763</link>&gt;.</note>" >
 <!ENTITY rfc5766 "<span class='ref'><link url='http://tools.ietf.org/html/rfc5766'>RFC 5766</link></span> <note>RFC 5766: Traversal Using Relays around NAT (TURN): Relay Extensions to Session Traversal Utilities for NAT (STUN) &lt;<link url='http://tools.ietf.org/html/rfc5766'>http://tools.ietf.org/html/rfc5766</link>&gt;.</note>" >
 <!ENTITY rfc5785 "<span class='ref'><link url='http://tools.ietf.org/html/rfc5785'>RFC 5785</link></span> <note>RFC 5785: Defining Well-Known Uniform Resource Identifiers (URIs) &lt;<link url='http://tools.ietf.org/html/rfc5785'>http://tools.ietf.org/html/rfc5785</link>&gt;.</note>" >