From 5bb546a4685619b76795e8e8e4681efd5ab2cf45 Mon Sep 17 00:00:00 2001
From: "Matthew A. Miller" <linuxwolf@outer-planes.net>
Date: Wed, 25 Mar 2015 11:05:55 -0500
Subject: [PATCH] XEP-0293 v0.2 -- Added XML Schema; Updated based on last call
 feedback

---
 xep-0293.xml | 63 ++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 59 insertions(+), 4 deletions(-)
 mode change 100755 => 100644 xep-0293.xml

diff --git a/xep-0293.xml b/xep-0293.xml
old mode 100755
new mode 100644
index 46d80796..4104e031
--- a/xep-0293.xml
+++ b/xep-0293.xml
@@ -29,6 +29,12 @@
     <jid>olivier.crete@collabora.co.uk</jid>
   </author>
   <discuss>jingle</discuss>
+  <revision>
+    <version>0.2</version>
+    <date>2015-03-25</date>
+    <initials>ph</initials>
+    <remark><p>Added XML Schema; Updated based on last-call feedback.</p></remark>
+  </revision>
   <revision>
     <version>0.1</version>
     <date>2011-03-24</date>
@@ -100,8 +106,8 @@
 
 <p>Any type or subtype of feedback message that requires extra
 parameters in the a=b form can use the &lt;parameter/&gt; element to
-describe it. Any other form of parameter can be store in the CDATA
-inside the &lt;rtcp-fb/&gt; element.</p>
+describe it. Any other form of parameter can be stored as the 'key' attribute in a parameter element with an empty value.</p>
+<p>Note: this overlaps with the subtype attribute. If there is only one parameter, use the subtype. The only known example where this is required is ccm.</p>
 
 <p>The element &lt;rtcp-fb-trr-int/&gt; is used to specify the minimum
 interval between two Regular (full compound) RTCP packets in
@@ -169,7 +175,7 @@ milliseconds for this media session. It corresponds to the
   <p>Example reply where the responder rejects the "sli" but
   accepts the "pli".</p>
 
- <example caption='Reponder sends description inside session-accept'><![CDATA[
+ <example caption='Responder sends description inside session-accept'><![CDATA[
 <description xmlns='urn:xmpp:jingle:apps:rtp:1' media='video'>
   <rtcp-fb xmlns='urn:xmpp:jingle:apps:rtp:rtcp-fb:0' type='nack' subtype='pli'/>
   <payload-type id='96' name='H264' clockrate='90000'>
@@ -332,7 +338,56 @@ milliseconds for this media session. It corresponds to the
   </section2>
 </section1>
 <section1 topic='XML Schemas'>
-<p>TODO: Write actual schema</p>
+  <code><![CDATA[
+<?xml version='1.0' encoding='UTF-8'?>
+
+<xs:schema
+    xmlns:xs='http://www.w3.org/2001/XMLSchema'
+    targetNamespace='urn:xmpp:jingle:apps:rtp:rtcp-fb:0'
+    xmlns='urn:xmpp:jingle:apps:rtp:rtcp-fb:0'
+    elementFormDefault='qualified'>
+
+  <xs:annotation>
+    <xs:documentation>
+      The protocol documented by this schema is defined in
+      XEP-0293: http://www.xmpp.org/extensions/xep-0293.html
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:element name='rtcp-fb'>
+    <xs:complexType>
+      <xs:sequence>  
+        <xs:element name='parameter'
+            type='parameterElementType'
+            minOccurs='0' 
+            maxOccurs='unbounded'/>
+      </xs:sequence>
+      <xs:attribute name='type' type='xs:string' use='required'/>
+      <xs:attribute name='subtype' type='xs:string' use='optional'/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name='rtcp-fb-trr-int'>
+    <xs:complexType>
+      <xs:simpleContent>
+        <xs:extension base='empty'>
+          <xs:attribute name='value' type='xs:positiveInteger' use='required'/>
+        </xs:extension>
+      </xs:simpleContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:complexType name='parameterElementType'>
+    <xs:simpleContent>
+      <xs:extension base='empty'>
+        <xs:attribute name='name' type='xs:string' use='required'/>
+        <xs:attribute name='value' type='xs:string' use='optional'/>
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+</xs:schema>
+  ]]></code>
 </section1>
 <section1 topic='Acknowledgements' anchor='ack'>
   <p>Thanks to Youness Alaoui for his feedback.</p>