aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGeorge Politis <gp@jitsi.org>2015-03-31 11:47:15 +0200
committerGeorge Politis <gp@jitsi.org>2015-03-31 12:04:36 +0200
commitb3398fd60bf5afbcc300678ae13f9952c34cda8b (patch)
tree9cc0d103f2adcd1bb419bfab5cd0cf047d53c1e5 /src
parentd2fa6532001876bdd28c6126306a5a251dd9ba4d (diff)
downloadjitsi-b3398fd60bf5afbcc300678ae13f9952c34cda8b.zip
jitsi-b3398fd60bf5afbcc300678ae13f9952c34cda8b.tar.gz
jitsi-b3398fd60bf5afbcc300678ae13f9952c34cda8b.tar.bz2
Adds support for a payload-type element in the ColibriIQ.
Diffstat (limited to 'src')
-rw-r--r--src/net/java/sip/communicator/impl/protocol/jabber/extensions/colibri/ColibriIQProvider.java18
1 files changed, 18 insertions, 0 deletions
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/colibri/ColibriIQProvider.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/colibri/ColibriIQProvider.java
index 0b4743a..6756de9 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/colibri/ColibriIQProvider.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/colibri/ColibriIQProvider.java
@@ -36,6 +36,11 @@ public class ColibriIQProvider
new DefaultPacketExtensionProvider<PayloadTypePacketExtension>(
PayloadTypePacketExtension.class));
providerManager.addExtensionProvider(
+ RtcpFbPacketExtension.ELEMENT_NAME,
+ RtcpFbPacketExtension.NAMESPACE,
+ new DefaultPacketExtensionProvider<RtcpFbPacketExtension>(
+ RtcpFbPacketExtension.class));
+ providerManager.addExtensionProvider(
RTPHdrExtPacketExtension.ELEMENT_NAME,
ColibriConferenceIQ.NAMESPACE,
new DefaultPacketExtensionProvider<RTPHdrExtPacketExtension>(
@@ -688,6 +693,19 @@ public class ColibriIQProvider
peName = name;
peNamespace = namespace;
}
+ else if (RtcpFbPacketExtension.ELEMENT_NAME.equals(
+ name)
+ && RtcpFbPacketExtension.NAMESPACE
+ .equals(parser.getNamespace()))
+ {
+ /*
+ * The channel element of the Jitsi Videobridge
+ * protocol reuses the payload-type element defined
+ * in XEP-0167: Jingle RTP Sessions.
+ */
+ peName = name;
+ peNamespace = namespace;
+ }
else if (RTPHdrExtPacketExtension.ELEMENT_NAME.equals(
name))
{