diff options
Diffstat (limited to 'src')
3 files changed, 14 insertions, 3 deletions
diff --git a/src/net/java/sip/communicator/service/neomedia/QualityPreset.java b/src/net/java/sip/communicator/service/neomedia/QualityPreset.java index 9f0777b..7371802 100644 --- a/src/net/java/sip/communicator/service/neomedia/QualityPreset.java +++ b/src/net/java/sip/communicator/service/neomedia/QualityPreset.java @@ -96,7 +96,11 @@ public class QualityPreset */ public int compareTo(QualityPreset o) { - if(resolution.equals(o.resolution)) + if(resolution == null) + return -1; + else if(o == null) + return 1; + else if(resolution.equals(o.resolution)) return 0; else if((resolution.height < o.resolution.height) && (resolution.width < o.resolution.width)) diff --git a/src/net/java/sip/communicator/service/protocol/media/CallPeerMediaHandler.java b/src/net/java/sip/communicator/service/protocol/media/CallPeerMediaHandler.java index 98cc3d6..e9966b2 100644 --- a/src/net/java/sip/communicator/service/protocol/media/CallPeerMediaHandler.java +++ b/src/net/java/sip/communicator/service/protocol/media/CallPeerMediaHandler.java @@ -370,7 +370,14 @@ public abstract class CallPeerMediaHandler< } else { - //off hold - make sure that we re-enable sending + //off hold - make sure that we re-enable sending, only + // if other party is not on hold + if (CallPeerState.ON_HOLD_MUTUALLY.equals( + getPeer().getState())) + { + return; + } + if(audioStream != null) { audioStream.setDirection(audioStream.getDirection() diff --git a/src/net/java/sip/communicator/service/protocol/media/MediaAwareCallPeer.java b/src/net/java/sip/communicator/service/protocol/media/MediaAwareCallPeer.java index 5dcfd29..e71e0b6 100644 --- a/src/net/java/sip/communicator/service/protocol/media/MediaAwareCallPeer.java +++ b/src/net/java/sip/communicator/service/protocol/media/MediaAwareCallPeer.java @@ -649,7 +649,7 @@ public abstract class MediaAwareCallPeer } /** - * Implements {@link CsrcAudioLevelListener#audioLevelsReceived(long[][])} + * Implements {@link CsrcAudioLevelListener#audioLevelsReceived(long[])} * so that we could deliver to {@link ConferenceMembersSoundLevelListener}s * the events corresponding to the audio level changes that are being * reported here. |