From 0b31123530bfbaed0beb43e9e10a8a992caa93de Mon Sep 17 00:00:00 2001
From: Peter Saint-Andre <stpeter@jabber.org>
Date: Fri, 29 Feb 2008 03:27:19 +0000
Subject: [PATCH] 0.16

git-svn-id: file:///home/ksmith/gitmigration/svn/xmpp/trunk@1707 4b5297f7-1745-476d-ba37-a9c6900126ab
---
 xep-0167.xml | 111 ++++++++++++++++++++++++++++++---------------------
 1 file changed, 65 insertions(+), 46 deletions(-)

diff --git a/xep-0167.xml b/xep-0167.xml
index 7412363d..420763cc 100644
--- a/xep-0167.xml
+++ b/xep-0167.xml
@@ -25,6 +25,12 @@
   &stpeter;
   &seanegan;
   &robmcqueen;
+  <revision>
+    <version>0.16</version>
+    <date>2008-02-28</date>
+    <initials>psa</initials>
+    <remark><p>Moved profile attribute from XEP-0166 to this specification.</p></remark>
+  </revision>
   <revision>
     <version>0.15</version>
     <date>2008-01-11</date>
@@ -182,7 +188,7 @@
     </description>
   ]]></example>
   <p>The &DESCRIPTION; element is intended to be a child of a &CONTENT; element as specified in <cite>XEP-0166</cite>.</p>
-  <p>The &CONTENT; element SHOULD possess a 'profile' attribute that specifies the exact protocol in use as would be encapsulated in SDP (e.g., "RTP/AVP" or "UDP/TLS/RTP/SAVP").</p>
+  <p>The &DESCRIPTION; element SHOULD possess a 'profile' attribute that specifies the profile of RTP in use as would be encapsulated in SDP (e.g., "RTP/AVP" or "UDP/TLS/RTP/SAVP").</p>
   <p>The encodings SHOULD be provided in order of preference by placing the most-preferred &PAYLOADTYPE; element as the first child of the &DESCRIPTION; element (etc.).</p>
   <p>The allowable attributes of the &PAYLOADTYPE; element are as follows:</p>
   <table caption='Payload-Type Attributes'>
@@ -248,8 +254,8 @@
           action='session-initiate'
           initiator='romeo@montague.net/orchard'
           sid='a73sjjvkla37jfea'>
-    <content name='this-is-the-audio-content' profile='RTP/AVP'>
-      <description xmlns='urn:xmpp:tmp:jingle:apps:audio-rtp'>
+    <content name='this-is-the-audio-content'>
+      <description xmlns='urn:xmpp:tmp:jingle:apps:audio-rtp' profile='RTP/AVP'>
         <payload-type id='96' name='speex' clockrate='16000'/>
         <payload-type id='97' name='speex' clockrate='8000'/>
         <payload-type id='18' name='G729'/>
@@ -279,7 +285,7 @@
           action='content-accept'
           initiator='romeo@montague.net/orchard'
           sid='a73sjjvkla37jfea'>
-    <content name='this-is-the-audio-content' profile='RTP/AVP'>
+    <content name='this-is-the-audio-content'>
       <description xmlns='urn:xmpp:tmp:jingle:apps:audio-rtp'>
         <payload-type id='97' name='speex' clockrate='8000'/>
         <payload-type id='18' name='G729'/>
@@ -312,8 +318,8 @@
           initiator='romeo@montague.net/orchard'
           responder='juliet@capulet.com/balcony'
           sid='a73sjjvkla37jfea'>
-    <content creator='initiator' name='this-is-the-audio-content' profile='RTP/AVP'>
-      <description xmlns='urn:xmpp:tmp:jingle:apps:audio-rtp'>
+    <content creator='initiator' name='this-is-the-audio-content'>
+      <description xmlns='urn:xmpp:tmp:jingle:apps:audio-rtp' profile='RTP/AVP'>
         <payload-type id='97' name='speex' clockrate='8000'/>
         <payload-type id='18' name='G729'/>
         <payload-type id='0' name='PCMU' />
@@ -516,7 +522,7 @@ Romeo                         Juliet
   |   ack                       |
   |---------------------------->|
   |   terminate                 |
-  |   (reasoncode = busy)       |
+  |   (reason = busy)           |
   |<----------------------------|
   |   ack                       |
   |---------------------------->|
@@ -532,8 +538,8 @@ Romeo                         Juliet
           action='session-initiate'
           initiator='romeo@montague.lit/orchard'
           sid='a73sjjvkla37jfea'>
-    <content creator='initiator' name='this-is-the-audio-content' profile='RTP/AVP'>
-      <description xmlns='urn:xmpp:tmp:jingle:apps:audio-rtp'>
+    <content creator='initiator' name='this-is-the-audio-content'>
+      <description xmlns='urn:xmpp:tmp:jingle:apps:audio-rtp' profile='RTP/AVP'>
         <payload-type id='96' name='speex' clockrate='16000'/>
         <payload-type id='97' name='speex' clockrate='8000'/>
         <payload-type id='18' name='G729'/>
@@ -578,9 +584,12 @@ Romeo                         Juliet
   <jingle xmlns='urn:xmpp:tmp:jingle'
           action='session-terminate'
           initiator='romeo@montague.lit/orchard'
-          reasoncode='busy'
-          reasontext='No time to chat right now!'
-          sid='a73sjjvkla37jfea'/>
+          sid='a73sjjvkla37jfea'>
+    <reason>
+      <condition><busy/></condition>
+      <text>No time to chat right now!</text>
+    </reason>
+  </jingle>
 </iq>
     ]]></example>
     <p>The other party then acknowledges termination of the session:</p>
@@ -636,8 +645,8 @@ Romeo                         Juliet
           action='session-initiate'
           initiator='romeo@montague.lit/orchard'
           sid='a73sjjvkla37jfea'>
-    <content creator='initiator' name='this-is-the-audio-content' profile='RTP/AVP'>
-      <description xmlns='urn:xmpp:tmp:jingle:apps:audio-rtp'>
+    <content creator='initiator' name='this-is-the-audio-content'>
+      <description xmlns='urn:xmpp:tmp:jingle:apps:audio-rtp' profile='RTP/AVP'>
         <payload-type id='96' name='speex' clockrate='16000'/>
         <payload-type id='97' name='speex' clockrate='8000'/>
         <payload-type id='18' name='G729'/>
@@ -684,8 +693,8 @@ Romeo                         Juliet
           action='content-modify'
           initiator='romeo@montague.lit/orchard'
           sid='a73sjjvkla37jfea'>
-    <content creator='initiator' name='this-is-the-audio-content' profile='RTP/AVP'>
-      <description xmlns='urn:xmpp:tmp:jingle:apps:audio-rtp'>
+    <content creator='initiator' name='this-is-the-audio-content'>
+      <description xmlns='urn:xmpp:tmp:jingle:apps:audio-rtp' profile='RTP/AVP'>
         [ ... ]
       </description>
       <transport xmlns='urn:xmpp:tmp:jingle:transports:ice-tcp'>
@@ -726,8 +735,8 @@ Romeo                         Juliet
           initiator='romeo@montague.lit/orchard'
           responder='juliet@capulet.lit/balcony'
           sid='a73sjjvkla37jfea'>
-    <content creator='initiator' name='this-is-the-audio-content' profile='RTP/AVP'>
-      <description xmlns='urn:xmpp:tmp:jingle:apps:audio-rtp'>
+    <content creator='initiator' name='this-is-the-audio-content'>
+      <description xmlns='urn:xmpp:tmp:jingle:apps:audio-rtp' profile='RTP/AVP'>
         <payload-type id='97' name='speex' clockrate='8000'/>
         <payload-type id='18' name='G729'/>
         <payload-type id='0' name='PCMU' />
@@ -775,9 +784,12 @@ Romeo                         Juliet
   <jingle xmlns='urn:xmpp:tmp:jingle'
           action='session-terminate'
           initiator='romeo@montague.lit/orchard'
-          reasoncode='no-error'
-          reasontext='Sorry, gotta go!'
-          sid='a73sjjvkla37jfea'/>
+          sid='a73sjjvkla37jfea'>
+    <reason>
+      <condition><no-error/></condition>
+      <text>Sorry, gotta go!</text>
+    </reason>
+  </jingle>
 </iq>
     ]]></example>
     <p>The other party then acknowledges termination of the session:</p>
@@ -855,8 +867,8 @@ Romeo                         Juliet
           action='session-initiate'
           initiator='romeo@montague.lit/orchard'
           sid='a73sjjvkla37jfea'>
-    <content creator='initiator' name='this-is-the-audio-content' profile='RTP/AVP'>
-      <description xmlns='urn:xmpp:tmp:jingle:apps:audio-rtp'>
+    <content creator='initiator' name='this-is-the-audio-content'>
+      <description xmlns='urn:xmpp:tmp:jingle:apps:audio-rtp' profile='RTP/AVP'>
         <payload-type id='96' name='speex' clockrate='16000'/>
         <payload-type id='97' name='speex' clockrate='8000'/>
         <payload-type id='18' name='G729'/>
@@ -865,8 +877,8 @@ Romeo                         Juliet
       </description>
       <transport xmlns='urn:xmpp:tmp:jingle:transports:ice-tcp'/>
     </content>
-    <content creator='initiator' name='this-is-the-video-content' profile='RTP/AVP'>
-      <description xmlns='urn:xmpp:tmp:jingle:apps:video-rtp'>
+    <content creator='initiator' name='this-is-the-video-content'>
+      <description xmlns='urn:xmpp:tmp:jingle:apps:video-rtp' profile='RTP/AVP'>
         <payload-type id='96' name='theora' clockrate='90000' height='720' width='1280'>
           <parameter name='delivery-method' value='inline'/>
           <parameter name='configuration' value='somebase16string'/>
@@ -916,7 +928,7 @@ Romeo                         Juliet
           action='content-remove'
           initiator='romeo@montague.lit/orchard'
           sid='a73sjjvkla37jfea'>
-    <content creator='initiator' name='this-is-the-video-content' profile='RTP/AVP'/>
+    <content creator='initiator' name='this-is-the-video-content'>
   </jingle>
 </iq>
     ]]></example>
@@ -937,8 +949,8 @@ Romeo                         Juliet
           action='content-modify'
           initiator='romeo@montague.lit/orchard'
           sid='a73sjjvkla37jfea'>
-    <content creator='initiator' name='this-is-the-audio-content' profile='RTP/AVP'>
-      <description xmlns='urn:xmpp:tmp:jingle:apps:audio-rtp'>
+    <content creator='initiator' name='this-is-the-audio-content'>
+      <description xmlns='urn:xmpp:tmp:jingle:apps:audio-rtp' profile='RTP/AVP'>
         [ ... ]
       </description>
       <transport xmlns='urn:xmpp:tmp:jingle:transports:ice-tcp'>
@@ -979,8 +991,8 @@ Romeo                         Juliet
           initiator='romeo@montague.lit/orchard'
           responder='juliet@capulet.lit/balcony'
           sid='a73sjjvkla37jfea'>
-    <content creator='initiator' name='this-is-the-audio-content' profile='RTP/AVP'>
-      <description xmlns='urn:xmpp:tmp:jingle:apps:audio-rtp'>
+    <content creator='initiator' name='this-is-the-audio-content'>
+      <description xmlns='urn:xmpp:tmp:jingle:apps:audio-rtp' profile='RTP/AVP'>
         <payload-type id='97' name='speex' clockrate='8000'/>
         <payload-type id='18' name='G729'/>
         <payload-type id='0' name='PCMU' />
@@ -1069,8 +1081,8 @@ Romeo                         Juliet
           action='content-add'
           initiator='romeo@montague.lit/orchard'
           sid='a73sjjvkla37jfea'>
-    <content creator='responder' name='video-is-back' profile='RTP/AVP'>
-      <description xmlns='urn:xmpp:tmp:jingle:apps:video-rtp'>
+    <content creator='responder' name='video-is-back'>
+      <description xmlns='urn:xmpp:tmp:jingle:apps:video-rtp' profile='RTP/AVP'>
         <payload-type id='96' name='theora' height='720' width='1280'>
           <parameter name='delivery-method' value='inline'/>
           <parameter name='configuration' value='somebase16string'/>
@@ -1100,8 +1112,8 @@ Romeo                         Juliet
           action='content-accept'
           initiator='romeo@montague.lit/orchard'
           sid='a73sjjvkla37jfea'>
-    <content creator='responder' name='video-is-back' profile='RTP/AVP'>
-      <description xmlns='urn:xmpp:tmp:jingle:apps:video-rtp'>
+    <content creator='responder' name='video-is-back'>
+      <description xmlns='urn:xmpp:tmp:jingle:apps:video-rtp' profile='RTP/AVP'>
         <payload-type id='96' name='theora' height='720' width='1280'>
           <parameter name='delivery-method' value='inline'/>
           <parameter name='configuration' value='somebase16string'/>
@@ -1133,9 +1145,12 @@ Romeo                         Juliet
   <jingle xmlns='urn:xmpp:tmp:jingle'
           action='session-terminate'
           initiator='romeo@montague.lit/orchard'
-          reasoncode='no-error'
-          reasontext='I&apos;m outta here!'
-          sid='a73sjjvkla37jfea'/>
+          sid='a73sjjvkla37jfea'>
+    <reason>
+      <condition><busy/></condition>
+      <text>I&apos;m outta here!</text>
+    </reason>
+  </jingle>
 </iq>
     ]]></example>
     <example caption="Responder acknowledges session-terminate"><![CDATA[
@@ -1198,8 +1213,8 @@ Romeo                         Juliet
           action='session-initiate'
           initiator='romeo@montague.lit/orchard'
           sid='a73sjjvkla37jfea'>
-    <content creator='initiator' name='this-is-the-audio-content' profile='RTP/AVP'>
-      <description xmlns='urn:xmpp:tmp:jingle:apps:audio-rtp'>
+    <content creator='initiator' name='this-is-the-audio-content'>
+      <description xmlns='urn:xmpp:tmp:jingle:apps:audio-rtp' profile='RTP/AVP'>
         <payload-type id='96' name='speex' clockrate='16000'/>
         <payload-type id='97' name='speex' clockrate='8000'/>
         <payload-type id='18' name='G729'/>
@@ -1289,8 +1304,8 @@ Romeo                         Juliet
           action='content-modify'
           initiator='romeo@montague.lit/orchard'
           sid='a73sjjvkla37jfea'>
-    <content creator='initiator' name='this-is-the-audio-content' profile='RTP/AVP'>
-      <description xmlns='urn:xmpp:tmp:jingle:apps:audio-rtp'>
+    <content creator='initiator' name='this-is-the-audio-content'>
+      <description xmlns='urn:xmpp:tmp:jingle:apps:audio-rtp' profile='RTP/AVP'>
         [ ... ]
       </description>
       <transport xmlns='urn:xmpp:tmp:jingle:transports:ice-tcp'>
@@ -1331,8 +1346,8 @@ Romeo                         Juliet
           initiator='romeo@montague.lit/orchard'
           responder='juliet@capulet.lit/balcony'
           sid='a73sjjvkla37jfea'>
-    <content creator='initiator' name='this-is-the-audio-content' profile='UDP/TLS/RTP/SAVP'>
-      <description xmlns='urn:xmpp:tmp:jingle:apps:audio-rtp'>
+    <content creator='initiator' name='this-is-the-audio-content'>
+      <description xmlns='urn:xmpp:tmp:jingle:apps:audio-rtp' profile='UDP/TLS/RTP/SAVP'>
         <payload-type id='97' name='speex' clockrate='8000'/>
         <payload-type id='18' name='G729'/>
         <payload-type id='0' name='PCMU' />
@@ -1380,9 +1395,12 @@ Romeo                         Juliet
   <jingle xmlns='urn:xmpp:tmp:jingle'
           action='session-terminate'
           initiator='romeo@montague.lit/orchard'
-          reasoncode='no-error'
-          reasontext='Sorry, gotta go!'
-          sid='a73sjjvkla37jfea'/>
+          sid='a73sjjvkla37jfea'>
+    <reason>
+      <condition><no-error/></condition>
+      <text>Sorry, gotta go!</text>
+    </reason>
+  </jingle>
 </iq>
     ]]></example>
     <p>The other party then acknowledges termination of the session:</p>
@@ -1460,6 +1478,7 @@ Romeo                         Juliet
       <xs:sequence minOccurs='0' maxOccurs='unbounded'/>
         <xs:element ref='payload-type'/>
       </xs:sequence>
+      <xs:attribute name='profile' use='optional' type='xs:string'/>
     </xs:complexType>
   </xs:element>