From f7ab3fb813eefa0cdd80b407153ffcac8b661e76 Mon Sep 17 00:00:00 2001 From: Emil Ivov Date: Fri, 29 Mar 2013 23:26:31 +0000 Subject: [PATCH] Improves payload type overriding for SIP/XMPP so that it would remove payload type overrides when necessary. --- .../sip/communicator/impl/protocol/sip/sdp/SdpUtils.java | 2 +- .../service/protocol/media/DynamicPayloadTypeRegistry.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/net/java/sip/communicator/impl/protocol/sip/sdp/SdpUtils.java b/src/net/java/sip/communicator/impl/protocol/sip/sdp/SdpUtils.java index 1a38e5afc..494c1628e 100644 --- a/src/net/java/sip/communicator/impl/protocol/sip/sdp/SdpUtils.java +++ b/src/net/java/sip/communicator/impl/protocol/sip/sdp/SdpUtils.java @@ -166,7 +166,7 @@ public static SessionDescription createSessionDescription( //o if (userName == null) - userName = "sip-communicator"; + userName = "jitsi.org"; Origin o = sdpFactory.createOrigin( userName, 0, 0, "IN", addrType, localAddress.getHostAddress()); diff --git a/src/net/java/sip/communicator/service/protocol/media/DynamicPayloadTypeRegistry.java b/src/net/java/sip/communicator/service/protocol/media/DynamicPayloadTypeRegistry.java index 0a7d032c7..0c455af8d 100644 --- a/src/net/java/sip/communicator/service/protocol/media/DynamicPayloadTypeRegistry.java +++ b/src/net/java/sip/communicator/service/protocol/media/DynamicPayloadTypeRegistry.java @@ -243,7 +243,10 @@ public void addMapping(MediaFormat format, byte payloadType) if(alreadyMappedFmt.matches(format)) { //we already have the exact same mapping, so no need to - //create a new one override the old PT number. + //create a new one override the old PT number. However, there + //might be a leftover override from a previous mapping so let's + //remove it if this is the case. + payloadTypeOverrides.remove(payloadType); return; } //else: