From 4bc64ff602f6f1e87daa85172f2e2a138b5f86ed Mon Sep 17 00:00:00 2001 From: Philipp Hancke Date: Sun, 15 Dec 2013 17:22:02 +0100 Subject: [PATCH 1/3] removed rfc examples (where necessary) as requested --- inbox/jingle-grouping.xml | 1 - inbox/jingle-sources.xml | 51 ++++++++++++++++++--------------------- 2 files changed, 23 insertions(+), 29 deletions(-) diff --git a/inbox/jingle-grouping.xml b/inbox/jingle-grouping.xml index e46e7def..04e0a8c8 100644 --- a/inbox/jingle-grouping.xml +++ b/inbox/jingle-grouping.xml @@ -106,7 +106,6 @@ a=group:LS voice webcam

Thanks to Emil Ivov and Lance Stout for their feedback.

The XML format for this specification originates from libjinglelibjingle is now part of the WebRTC Native Code Package available from webrtc.org..

-

The SDP syntax examples are taken from RFC 5888.

This document introduces no additional security considerations above and beyond those defined in the documents on which it depends.

diff --git a/inbox/jingle-sources.xml b/inbox/jingle-sources.xml index 483c41e5..7bfeb944 100644 --- a/inbox/jingle-sources.xml +++ b/inbox/jingle-sources.xml @@ -79,45 +79,39 @@ a=ssrc-group:<semantics> <ssrc-id> ...

The following example is taken from RFC 5576.

-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

This is mapped to Jingle as follows:

- - - - - + - - + + - - + + - - + + - - + + - - + + - - + + @@ -146,9 +140,10 @@ a=ssrc:44444 cname:user3@example.com ]]>

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.

 +

This document introduces no additional security considerations above and beyond those defined in the documents on which it depends.

 From 483ee12abeaa1ce5f56eec1d434e071b14f8b062 Mon Sep 17 00:00:00 2001 From: Philipp Hancke Date: Wed, 18 Dec 2013 18:06:31 +0100 Subject: [PATCH 2/3] fix typo --- inbox/jingle-grouping.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inbox/jingle-grouping.xml b/inbox/jingle-grouping.xml index 04e0a8c8..012e0bb8 100644 --- a/inbox/jingle-grouping.xml +++ b/inbox/jingle-grouping.xml @@ -41,7 +41,7 @@ a=group:semantics identification-tag a=group:LS voice webcam -

This SDP attribute is translated to Jingle as a <group/> 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.

+

This SDP attribute is translated to Jingle as a <group/> 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.

From b3c190b4bd276c4e59f94a5823abb088411bf81c Mon Sep 17 00:00:00 2001 From: Philipp Hancke Date: Wed, 18 Dec 2013 18:06:44 +0100 Subject: [PATCH 3/3] example not taken from 5576 --- inbox/jingle-sources.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inbox/jingle-sources.xml b/inbox/jingle-sources.xml index 7bfeb944..d0e9cb1d 100644 --- a/inbox/jingle-sources.xml +++ b/inbox/jingle-sources.xml @@ -77,7 +77,7 @@ a=ssrc-group:<semantics> <ssrc-id> ... -

The following example is taken from RFC 5576.

+

A minimal example follows:

m=video 1 RTP/SAVPF 100 116 117 a=rtpmap:100 VP8/90000