Fixes the changes introduced in r10752. When deciding what the MediaStream direction should be, uses the directions of the jingle sessions in a Call, instead of the previous direction of the MediaStream.

src/net/java/sip/communicator/impl/protocol/jabber/CallPeerMediaHandlerJabberImpl.java

@@ -14,6 +14,7 @@
 
 import net.java.sip.communicator.impl.protocol.jabber.extensions.colibri.*;
 import net.java.sip.communicator.impl.protocol.jabber.extensions.jingle.*;
+import net.java.sip.communicator.impl.protocol.jabber.extensions.jingle.ContentPacketExtension.SendersEnum;
 import net.java.sip.communicator.impl.protocol.jabber.jinglesdp.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.media.*;
@@ -1422,29 +1423,29 @@ private void processContent(
         //determine the direction that we need to announce.
         MediaDirection remoteDirection
             = JingleUtils.getDirection(content, getPeer().isInitiator());
-
-        boolean checkUserPreference = true;
-        /* If we are the focus of a conference and a peer is sending video to
-         * us, we should announce at least SENDONLY, even if we are not
-         * sending video ourselves.
+        /* If we are the focus of a conference, we need to take into account
+         * the other participants.
          */
-        if (MediaType.VIDEO.equals(mediaType))
+        CallJabberImpl call = getPeer().getCall();
+        if (call != null && call.getConference().isConferenceFocus())
         {
-            Call call = getPeer().getCall();
-            if (call != null && call.getConference().isConferenceFocus())
+            for (CallPeerJabberImpl peer : call.getCallPeerList())
             {
-                /* We don't keep per-CallPeer MediaDirections, so we use the
-                 * current direction of our video MediaStream as a hint that
-                 * one of our peers is sending video to us.
-                 */
-                MediaStream mediaStream = getStream(MediaType.VIDEO);
-                if (mediaStream != null)
+                ContentPacketExtension remoteContent
+                    = peer.getMediaHandler()
+                        .getRemoteContent(mediaType.toString());
+                boolean initiator = peer.isInitiator();
+                if (remoteContent != null)
                 {
-                    MediaDirection streamDirection = mediaStream.getDirection();
-                    if (streamDirection != null &&
-                            streamDirection.allowsReceiving())
+                    SendersEnum senders = remoteContent.getSenders();
+                    //check if the direction of the jingle session we have with
+                    //this peer allows us receiving media. If senders is null,
+                    //assume the default of 'both'
+                    if (senders == null ||
+                            (SendersEnum.both == senders) ||
+                            (initiator && SendersEnum.initiator == senders) ||
+                            (!initiator && SendersEnum.responder == senders))
                     {
-                        checkUserPreference = false;
                         remoteDirection
                                 = remoteDirection.or(MediaDirection.SENDONLY);
                     }
@@ -1452,14 +1453,6 @@ private void processContent(
             }
         }
 
-        if (checkUserPreference)
-        {
-            // Take the preference of the user with respect to streaming
-            // mediaType into account.
-            devDirection
-                    = devDirection.and(getDirectionUserPreference(mediaType));
-        }
-
         MediaDirection direction
             = devDirection.getDirectionForAnswer(remoteDirection);