aboutsummaryrefslogtreecommitdiffstats
path: root/src/net/java/sip/communicator/impl/protocol
diff options
context:
space:
mode:
authorBoris Grozev <boris@jitsi.org>2013-08-23 16:21:54 +0300
committerBoris Grozev <boris@jitsi.org>2013-08-23 16:22:10 +0300
commitd5fad813b5626f4616c32b403ef14fd567381237 (patch)
treea8ea767b07def3715982031ff1e6dc08caef9e3d /src/net/java/sip/communicator/impl/protocol
parent294d1af473e61d486d70b9782eee24c5b79a1a7e (diff)
downloadjitsi-d5fad813b5626f4616c32b403ef14fd567381237.zip
jitsi-d5fad813b5626f4616c32b403ef14fd567381237.tar.gz
jitsi-d5fad813b5626f4616c32b403ef14fd567381237.tar.bz2
Fixes the choice of the MediaFormat to use for sending media when we accept a
jabber call. Prevents an issue where we would use a format which we did not include in our "answer" (the session-accept), in case it is disabled in the local configuration.
Diffstat (limited to 'src/net/java/sip/communicator/impl/protocol')
-rw-r--r--src/net/java/sip/communicator/impl/protocol/jabber/CallPeerMediaHandlerJabberImpl.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/CallPeerMediaHandlerJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/CallPeerMediaHandlerJabberImpl.java
index 28a7254..aa4fd45 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/CallPeerMediaHandlerJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/CallPeerMediaHandlerJabberImpl.java
@@ -603,12 +603,13 @@ public class CallPeerMediaHandlerJabberImpl
= JingleUtils.getRtpDescription(theirContent);
MediaFormat format = null;
+ List<MediaFormat> localFormats = getLocallySupportedFormats(dev);
for(PayloadTypePacketExtension payload
: theirDescription.getPayloadTypes())
{
format = JingleUtils.payloadTypeToMediaFormat(
payload, getDynamicPayloadTypes());
- if(format != null)
+ if(format != null && localFormats.contains(format))
break;
}