Revert "Work in progress: join bridge through network connections, avoiding the use of a mixer. Issue #1550."

This reverts commit fbf327b.

Author: ghjansen

restcomm/restcomm.mscontrol.api/src/main/java/org/restcomm/connect/mscontrol/api/messages/JoinBridge.java

@@ -21,7 +21,6 @@
 
 package org.restcomm.connect.mscontrol.api.messages;
 
-import akka.actor.ActorRef;
 import jain.protocol.ip.mgcp.message.parms.ConnectionMode;
 
 import org.restcomm.connect.commons.annotations.concurrency.Immutable;
@@ -35,18 +34,10 @@ public final class JoinBridge {
 
     private final Object endpoint;
     private final ConnectionMode connectionMode;
-    private final ActorRef call;
-    private final boolean usingMixer; // true if call controller should join using mixer, false to join using network
 
     public JoinBridge(final Object endpoint, final ConnectionMode connectionMode) {
-        this(endpoint, connectionMode, null, true);
-    }
-
-    public JoinBridge(final Object endpoint, final ConnectionMode connectionMode, final ActorRef call, final boolean usingMixer) {
         this.endpoint = endpoint;
         this.connectionMode = connectionMode;
-        this.call = call;
-        this.usingMixer = usingMixer;
     }
 
     public Object getEndpoint() {
@@ -56,8 +47,4 @@ public Object getEndpoint() {
     public ConnectionMode getConnectionMode() {
         return connectionMode;
     }
-
-    public ActorRef getCall() { return call; }
-
-    public boolean isUsingMixer() { return usingMixer; }
 }

restcomm/restcomm.mscontrol.api/src/main/java/org/restcomm/connect/mscontrol/api/messages/JoinBridgeNoMixer.java

@@ -27,7 +27,6 @@
 
 import akka.actor.ActorRef;
 import org.restcomm.connect.commons.dao.Sid;
-import org.restcomm.connect.dao.entities.MediaAttributes;
 
 /**
  * @author Henrique Rosa (henrique.rosa@telestax.com)
@@ -36,34 +35,22 @@
 @Immutable
 public final class JoinCall {
 
-    private final ActorRef inboundCall;
-    private final ActorRef outboundCall;
-    private final MediaAttributes mediaAttributes;
+    private final ActorRef call;
     private final ConnectionMode connectionMode;
     private final Sid sid;
 
     public JoinCall(final ActorRef call, final ConnectionMode connectionMode) {
-        this(call, connectionMode, null, null, new MediaAttributes());
+        this(call, connectionMode, null);
     }
 
     public JoinCall(final ActorRef call, final ConnectionMode connectionMode, final Sid sid) {
-        this(call, connectionMode, sid, null, new MediaAttributes());
-    }
-
-    public JoinCall(final ActorRef call, final ConnectionMode connectionMode, final ActorRef outboundCall,  final MediaAttributes mediaAttributes) {
-        this(call, connectionMode, null, outboundCall, mediaAttributes);
-    }
-
-    public JoinCall(final ActorRef call, final ConnectionMode connectionMode, final Sid sid, final ActorRef outboundCall, final MediaAttributes mediaAttributes) {
-        this.inboundCall = call;
-        this.outboundCall = outboundCall;
-        this.mediaAttributes = mediaAttributes;
+        this.call = call;
         this.connectionMode = connectionMode;
         this.sid = sid;
     }
 
-    public ActorRef getInboundCall() {
-        return inboundCall;
+    public ActorRef getCall() {
+        return call;
     }
 
     public ConnectionMode getConnectionMode() {
@@ -73,8 +60,4 @@ public ConnectionMode getConnectionMode() {
     public Sid getSid () {
         return sid;
     }
-
-    public ActorRef getOutboundCall() { return outboundCall; }
-
-    public MediaAttributes getMediaAttributes() { return mediaAttributes; }
 }

restcomm/restcomm.mscontrol.api/src/main/java/org/restcomm/connect/mscontrol/api/messages/JoinCall.java

@@ -379,18 +379,9 @@ private void onCreateMediaSession(CreateMediaSession message, ActorRef self, Act
     }
 
     private void onJoinCall(JoinCall message, ActorRef self, ActorRef sender) {
-        MediaAttributes.MediaType mediaType = message.getMediaAttributes().getMediaType();
-        if(!mediaType.equals(MediaAttributes.MediaType.AUDIO_ONLY)){
-            // Tell outbound call to share the network connection of its call controller
-            // with the call controller of the inbound call, so the call controller of the inbound call
-            // can proceed joining calls without using a mixer
-            final JoinBridge join = new JoinBridge(this.mediaMixer, message.getConnectionMode(), message.getInboundCall(), false);
-            message.getOutboundCall().tell(join, sender);
-        } else {
-            // Tell inbound call to join bridge by passing reference to the media mixer
-            final JoinBridge join = new JoinBridge(this.mediaMixer, message.getConnectionMode());
-            message.getInboundCall().tell(join, sender);
-        }
+        // Tell call to join bridge by passing reference to the media mixer
+        final JoinBridge join = new JoinBridge(this.mediaMixer, message.getConnectionMode());
+        message.getCall().tell(join, sender);
     }
 
     private void onStop(Stop message, ActorRef self, ActorRef sender) throws Exception {
@@ -468,22 +459,21 @@ public void execute(Object message) throws Exception {
                 if (MediaAttributes.MediaType.VIDEO_ONLY.equals(mediaAttributes.getMediaType())) {
                     // video only
                     configureVideoMediaSession(mediaAttributes);
-                    //Parameters mixerParams = createMixerParams();
-                    //mediaMixer = mediaSession.createMediaMixer(MediaMixer.AUDIO_VIDEO, mixerParams);
+                    Parameters mixerParams = createMixerParams();
+                    mediaMixer = mediaSession.createMediaMixer(MediaMixer.AUDIO_VIDEO, mixerParams);
                 } else if (MediaAttributes.MediaType.AUDIO_VIDEO.equals(mediaAttributes.getMediaType())) {
                     // audio and video
                     configureVideoMediaSession(mediaAttributes);
-                    //Parameters mixerParams = createMixerParams();
-                    //mediaMixer = mediaSession.createMediaMixer(MediaMixer.AUDIO_VIDEO, mixerParams);
+                    Parameters mixerParams = createMixerParams();
+                    mediaMixer = mediaSession.createMediaMixer(MediaMixer.AUDIO_VIDEO, mixerParams);
                 } else {
                     // audio only
-                    //Parameters mixerParams = createMixerParams();
-                    //mediaMixer = mediaSession.createMediaMixer(MediaMixer.AUDIO, mixerParams);
+                    Parameters mixerParams = createMixerParams();
+                    mediaMixer = mediaSession.createMediaMixer(MediaMixer.AUDIO, mixerParams);
                 }
 
-                //mediaMixer.addListener(mixerAllocationListener);
-                //mediaMixer.confirm();
-                fsm.transition(msg, active);
+                mediaMixer.addListener(mixerAllocationListener);
+                mediaMixer.confirm();
                 // Wait for event confirmation before sending response to the conference
             } catch (MsControlException e) {
                 // Move to a failed state, cleaning all resources and closing media session

restcomm/restcomm.mscontrol.api/src/main/java/org/restcomm/connect/mscontrol/api/messages/ShareBridgeNetworkConnection.java

@@ -74,7 +74,6 @@
 import org.restcomm.connect.mscontrol.api.messages.Collect;
 import org.restcomm.connect.mscontrol.api.messages.CreateMediaSession;
 import org.restcomm.connect.mscontrol.api.messages.JoinBridge;
-import org.restcomm.connect.mscontrol.api.messages.JoinBridgeNoMixer;
 import org.restcomm.connect.mscontrol.api.messages.JoinComplete;
 import org.restcomm.connect.mscontrol.api.messages.JoinConference;
 import org.restcomm.connect.mscontrol.api.messages.Leave;
@@ -87,7 +86,6 @@
 import org.restcomm.connect.mscontrol.api.messages.Mute;
 import org.restcomm.connect.mscontrol.api.messages.Play;
 import org.restcomm.connect.mscontrol.api.messages.Record;
-import org.restcomm.connect.mscontrol.api.messages.ShareBridgeNetworkConnection;
 import org.restcomm.connect.mscontrol.api.messages.StartRecording;
 import org.restcomm.connect.mscontrol.api.messages.Stop;
 import org.restcomm.connect.mscontrol.api.messages.StopMediaGroup;
@@ -454,12 +452,8 @@ public void onReceive(Object message) throws Exception {
             onCollect((Collect) message, self, sender);
         } else if (Record.class.equals(klass)) {
             onRecord((Record) message, self, sender);
-        } else if (ShareBridgeNetworkConnection.class.equals(klass)){
-            onShareBridgeNetworkConnection((ShareBridgeNetworkConnection) message, self, sender);
         } else if (JoinBridge.class.equals(klass)) {
             onJoinBridge((JoinBridge) message, self, sender);
-        } else if (JoinBridgeNoMixer.class.equals(klass)) {
-            onJoinBridgeNoMixer((JoinBridgeNoMixer) message, self, sender);
         } else if (JoinConference.class.equals(klass)) {
             onJoinConference((JoinConference) message, self, sender);
         } else if (Stop.class.equals(klass)) {
@@ -727,43 +721,18 @@ private void onRecord(Record message, ActorRef self, ActorRef sender) {
         }
     }
 
-    private void onShareBridgeNetworkConnection(ShareBridgeNetworkConnection message, ActorRef self, ActorRef sender) throws Exception {
-        final JoinBridgeNoMixer joinBridgeNoMixer = new JoinBridgeNoMixer(message.getEndpoint(), message.getConnectionMode(), networkConnection);
-        message.getCall().tell(joinBridgeNoMixer, sender);
-    }
-
     private void onJoinBridge(JoinBridge message, ActorRef self, ActorRef sender) throws Exception {
         if (is(active)) {
             try {
-                // join call leg to bridge using mixer
+                // join call leg to bridge
                 this.bridge = sender;
                 this.mediaMixer = (MediaMixer) message.getEndpoint();
                 this.networkConnection.join(Direction.DUPLEX, mediaMixer);
 
                 // alert call has joined successfully
                 this.call.tell(new JoinComplete(), self);
             } catch (MsControlException e) {
-                logger.error("Call bridging using mixer failed: " + e.getMessage());
-                fsm.transition(e, failed);
-            }
-        }
-    }
-
-    private void onJoinBridgeNoMixer(JoinBridgeNoMixer message, ActorRef self, ActorRef sender) throws Exception {
-        if (is(active)) {
-            try {
-                // join call leg to bridge using network connection
-                this.bridge = sender;
-                final NetworkConnection bridgeNetworkConnection = (NetworkConnection) message.getNetworkConnection();
-                this.networkConnection.join(Direction.DUPLEX, bridgeNetworkConnection);
-                //this.networkConnection.getJoinableStream(JoinableStream.StreamType.audio).join(Direction.DUPLEX, bridgeNetworkConnection.getJoinableStream(JoinableStream.StreamType.audio));
-                //this.networkConnection.getJoinableStream(JoinableStream.StreamType.video).join(Direction.DUPLEX, bridgeNetworkConnection.getJoinableStream(JoinableStream.StreamType.video));
-                //this.networkConnection.joinInitiate(Direction.DUPLEX, bridgeNetworkConnection, null);
-
-                // alert call has joined successfully
-                this.call.tell(new JoinComplete(), self);
-            } catch (MsControlException e) {
-                logger.error("Call bridging using network connection failed: " + e.getMessage());
+                logger.error("Call bridging failed: " + e.getMessage());
                 fsm.transition(e, failed);
             }
         }

restcomm/restcomm.mscontrol.jsr309/src/main/java/org/restcomm/connect/mscontrol/jsr309/Jsr309BridgeController.java

@@ -341,7 +341,7 @@ private void onJoinCall(JoinCall message, ActorRef self, ActorRef sender) {
         if (is(active)) {
             // Tell call to join conference by passing reference of the media mixer
             final JoinConference join = new JoinConference(this.mediaMixer, message.getConnectionMode(), message.getSid());
-            message.getInboundCall().tell(join, sender);
+            message.getCall().tell(join, sender);
         }
     }
 

restcomm/restcomm.mscontrol.jsr309/src/main/java/org/restcomm/connect/mscontrol/jsr309/Jsr309CallController.java

@@ -285,7 +285,7 @@ private void onCreateMediaSession(CreateMediaSession message, ActorRef self, Act
     private void onJoinCall(JoinCall message, ActorRef self, ActorRef sender) {
         // Tell call to join bridge by passing reference to the media mixer
         final JoinBridge join = new JoinBridge(this.endpoint, message.getConnectionMode());
-        message.getInboundCall().tell(join, sender);
+        message.getCall().tell(join, sender);
     }
 
     private void onStop(Stop message, ActorRef self, ActorRef sender) throws Exception {

restcomm/restcomm.mscontrol.jsr309/src/main/java/org/restcomm/connect/mscontrol/jsr309/Jsr309ConferenceController.java

@@ -382,7 +382,7 @@ private void onJoinCall(JoinCall message, ActorRef self, ActorRef sender) {
         connectionMode = message.getConnectionMode();
         // Tell call to join conference by passing reference to the media mixer
         final JoinConference join = new JoinConference(this.cnfEndpoint, connectionMode, message.getSid());
-        message.getInboundCall().tell(join, sender);
+        message.getCall().tell(join, sender);
     }
 
     /*private void onStopMediaGroup(StopMediaGroup message, ActorRef self, ActorRef sender) {

restcomm/restcomm.mscontrol.mms/src/main/java/org/restcomm/connect/mscontrol/mms/MmsBridgeController.java

@@ -307,7 +307,7 @@ public Bridging(ActorRef source) {
         @Override
         public void execute(Object message) throws Exception {
             // Ask mscontroller to join inbound call
-            final JoinCall join = new JoinCall(inboundCall, ConnectionMode.SendRecv, outboundCall, mediaAttributes);
+            final JoinCall join = new JoinCall(inboundCall, ConnectionMode.SendRecv);
             mscontroller.tell(join, super.source);
         }