moparisthebest/xeps
1
0
Fork 0
mirror of https://github.com/moparisthebest/xeps synced 2024-11-24 02:02:16 -05:00
Code Issues Releases Wiki Activity

Merge branch 'master' of athena.jabber.org:xmpp

Browse Source
This commit is contained in:
Peter Saint-Andre 2013-12-20 13:50:17 -07:00
commit ce8e9ead82
2 changed files with 25 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
inbox/jingle-grouping.xml
View File

@ -41,7 +41,7 @@ a=group:semantics identification-tag
<code>
a=group:LS voice webcam
</code>
<p>This SDP attribute is translated to Jingle as a &lt;group/&gt; element qualified by the 'urn:xmpp:jingle:apps:grouping:0' namespace, as shown below. The semantics is mapped to a 'semantics' attribute. The identifiation-tags are mapped to content elements whose name attribute is set to the identification-tag.</p>
<p>This SDP attribute is translated to Jingle as a &lt;group/&gt; element qualified by the 'urn:xmpp:jingle:apps:grouping:0' namespace, as shown below. The semantics is mapped to a 'semantics' attribute. The identification-tags are mapped to content elements whose name attribute is set to the identification-tag.</p>
<code><![CDATA[
<group xmlns='urn:xmpp:jingle:apps:grouping:0' semantics='semantics'>
<content name='identification-tag 1'/>
@ -106,7 +106,6 @@ a=group:LS voice webcam
<section1 topic='Acknowledgements' anchor='acks'>
<p>Thanks to Emil Ivov and Lance Stout for their feedback.</p>
<p>The XML format for this specification originates from <cite>libjingle</cite><note>libjingle is now part of the WebRTC Native Code Package available from <link url='http://webrtc.org'>webrtc.org</link>.</note>.</p>
<p>The SDP syntax examples are taken from <cite>RFC 5888</cite>.</p>
</section1>
<section1 topic='Security Considerations' anchor='security'>
<p>This document introduces no additional security considerations above and beyond those defined in the documents on which it depends.</p>

53
inbox/jingle-sources.xml
View File

@ -77,47 +77,41 @@ a=ssrc-group:&lt;semantics&gt; &lt;ssrc-id&gt; ...
</section2>
</section1>
<section1 topic='Example' anchor='example'>
<p>The following example is taken from <cite>RFC 5576</cite>.</p>
<p>A minimal example follows:</p>
<code>
m=video 49174 RTP/AVPF 96 98
a=rtpmap:96 H.264/90000
a=rtpmap:98 rtx/90000
a=fmtp:98 apt=96;rtx-time=3000
a=ssrc-group:FID 11111 22222
a=ssrc:11111 cname:user3@example.com
a=ssrc:22222 cname:user3@example.com
a=ssrc-group:FID 33333 44444
a=ssrc:33333 cname:user3@example.com
a=ssrc:44444 cname:user3@example.com
m=video 1 RTP/SAVPF 100 116 117
a=rtpmap:100 VP8/90000
a=ssrc-group:FID 2301230316 386328120
a=ssrc:2301230316 cname:T5qvrIZj42v//eYQ
a=ssrc:386328120 cname:uEYgNtStZyTF74sM
a=ssrc-group:FID 3139499595 2613715171
a=ssrc:3139499595 cname:re8jhxkly9bxzuxr
a=ssrc:2613715171 cname:f83avsiw6n1m7vi
</code>
<p>This is mapped to Jingle as follows:</p>
<code><![CDATA[
<content creator='initiator' name='webcam'>
<description xmlns='urn:xmpp:jingle:apps:rtp:1' media='video'>
<payload-type id='96' name='H.264' clockrate='90000'/>
<payload-type id='98' name='rtx' clockrate='90000'>
<parameter name='apt' value='96'/>
<parameter name='rtx-time' value='3000'/>
</payload-type>
<payload-type id='100' name='VP8' clockrate='90000'/>
<ssrc-group xmlns='urn:xmpp:jingle:apps:rtp:ssma:0' semantics='FID'>
<source ssrc='11111'/>
<source ssrc='22222'/>
<source ssrc='2301230316'/>
<source ssrc='386328120'/>
</ssrc-group>
<ssrc-group xmlns='urn:xmpp:jingle:apps:rtp:ssma:0' semantics='FID'>
<source ssrc='33333'/>
<source ssrc='44444'/>
<source ssrc='3139499595'/>
<source ssrc='2613715171'/>
</ssrc-group>
<source ssrc='11111' xmlns='urn:xmpp:jingle:apps:rtp:ssma:0'>
<parameter name='cname' value='user3@example.com'/>
<source ssrc='2301230316' xmlns='urn:xmpp:jingle:apps:rtp:ssma:0'>
<parameter name='cname' value='T5qvrIZj42v//eYQ'/>
</source>
<source ssrc='22222' xmlns='urn:xmpp:jingle:apps:rtp:ssma:0'>
<parameter name='cname' value='user3@example.com'/>
<source ssrc='386328120' xmlns='urn:xmpp:jingle:apps:rtp:ssma:0'>
<parameter name='cname' value='uEYgNtStZyTF74sM'/>
</source>
<source ssrc='33333' xmlns='urn:xmpp:jingle:apps:rtp:ssma:0'>
<parameter name='cname' value='user3@example.com'/>
<source ssrc='3139499595' xmlns='urn:xmpp:jingle:apps:rtp:ssma:0'>
<parameter name='cname' value='re8jhxkly9bxzuxr'/>
</source>
<source ssrc='44444' xmlns='urn:xmpp:jingle:apps:rtp:ssma:0'>
<parameter name='cname' value='user3@example.com'/>
<source ssrc='2613715171' xmlns='urn:xmpp:jingle:apps:rtp:ssma:0'>
<parameter name='cname' value='f83avsiw6n1m7vi'/>
</source>
</description>
</content>
@ -146,9 +140,10 @@ a=ssrc:44444 cname:user3@example.com
]]></example>
<p>In order for an application to determine whether an entity supports this protocol, where possible it SHOULD use the dynamic, presence-based profile of service discovery defined in &xep0115;. However, if an application has not received entity capabilities information from an entity, it SHOULD use explicit service discovery instead.</p>
</section1>
<!--
<section1 topic='Acknowledgements' anchor='acks'>
<p>The SDP syntax examples are taken from <cite>RFC 5576</cite>.</p>
</section1>
-->
<section1 topic='Security Considerations' anchor='security'>
<p>This document introduces no additional security considerations above and beyond those defined in the documents on which it depends.</p>
</section1>