Bridge configuration using media attributes. Issue #1550.

ghjansen · ghjansen · commit 3ced59c1da3a · 2017-10-06T00:01:59.000-03:00
diff --git a/restcomm/restcomm.interpreter/src/main/java/org/restcomm/connect/interpreter/VoiceInterpreter.java b/restcomm/restcomm.interpreter/src/main/java/org/restcomm/connect/interpreter/VoiceInterpreter.java
@@ -3256,7 +3256,7 @@ public CreatingBridge(ActorRef source) {
 
         @Override
         public void execute(Object message) throws Exception {
-            final CreateBridge create = new CreateBridge();
+            final CreateBridge create = new CreateBridge(outboundCallInfo.mediaAttributes());
             bridgeManager.tell(create, super.source);
         }
 
diff --git a/restcomm/restcomm.mscontrol.api/src/main/java/org/restcomm/connect/mscontrol/api/messages/CreateMediaSession.java b/restcomm/restcomm.mscontrol.api/src/main/java/org/restcomm/connect/mscontrol/api/messages/CreateMediaSession.java
@@ -70,8 +70,8 @@ public CreateMediaSession(Sid callSid) {
         this("", "", false, false, callSid, null, new MediaAttributes());
     }
 
-    public CreateMediaSession() {
-        this("", "", false, false, null, null, new MediaAttributes());
+    public CreateMediaSession(final MediaAttributes mediaAttributes) {
+        this("", "", false, false, null, null, mediaAttributes);
     }
 
     public String getConnectionMode() {
diff --git a/restcomm/restcomm.mscontrol.jsr309/src/main/java/org/restcomm/connect/mscontrol/jsr309/Jsr309BridgeController.java b/restcomm/restcomm.mscontrol.jsr309/src/main/java/org/restcomm/connect/mscontrol/jsr309/Jsr309BridgeController.java
@@ -483,7 +483,7 @@ public void execute(Object message) throws Exception {
 
         private void configureVideoMediaSession(final MediaAttributes mediaAttributes) {
             // resolution configuration
-            mediaSession.setAttribute("CONFERENCE_VIDEO_SIZE", mediaAttributes.getVideoResolution().toString());
+            mediaSession.setAttribute("NC_VIDEO_SIZE", mediaAttributes.getVideoResolution().toString());
         }
 
         private Parameters createMixerParams() {
diff --git a/restcomm/restcomm.telephony.api/src/main/java/org/restcomm/connect/telephony/api/CallInfo.java b/restcomm/restcomm.telephony.api/src/main/java/org/restcomm/connect/telephony/api/CallInfo.java
@@ -25,6 +25,7 @@
 import org.joda.time.DateTime;
 import org.restcomm.connect.commons.annotations.concurrency.Immutable;
 import org.restcomm.connect.commons.dao.Sid;
+import org.restcomm.connect.dao.entities.MediaAttributes;
 
 /**
  * @author quintana.thomas@gmail.com (Thomas Quintana)
@@ -47,10 +48,11 @@ public final class CallInfo {
     private final boolean webrtc;
     private boolean muted;
     private boolean isFromApi;
+    private final MediaAttributes mediaAttributes;
 
     public CallInfo(final Sid sid, final CallStateChanged.State state, final CreateCall.Type type, final String direction,
                     final DateTime dateCreated, final String forwardedFrom, final String fromName, final String from, final String to,
-                    final SipServletRequest invite, final SipServletResponse lastResponse, final boolean webrtc, final boolean muted, final boolean isFromApi, final DateTime dateConUpdated) {
+                    final SipServletRequest invite, final SipServletResponse lastResponse, final boolean webrtc, final boolean muted, final boolean isFromApi, final DateTime dateConUpdated, final MediaAttributes mediaAttributes) {
         super();
         this.sid = sid;
         this.state = state;
@@ -67,6 +69,7 @@ public CallInfo(final Sid sid, final CallStateChanged.State state, final CreateC
         this.webrtc = webrtc;
         this.muted = muted;
         this.isFromApi = isFromApi;
+        this.mediaAttributes = mediaAttributes;
     }
 
     public DateTime dateCreated() {
@@ -136,4 +139,8 @@ public void setMute(boolean muted) {
     public boolean isFromApi() {
         return isFromApi;
     }
+
+    public MediaAttributes mediaAttributes(){
+        return this.mediaAttributes;
+    }
 }
diff --git a/restcomm/restcomm.telephony.api/src/main/java/org/restcomm/connect/telephony/api/CreateBridge.java b/restcomm/restcomm.telephony.api/src/main/java/org/restcomm/connect/telephony/api/CreateBridge.java
@@ -22,6 +22,7 @@
 package org.restcomm.connect.telephony.api;
 
 import org.restcomm.connect.commons.annotations.concurrency.Immutable;
+import org.restcomm.connect.dao.entities.MediaAttributes;
 
 /**
  * @author Henrique Rosa (henrique.rosa@telestax.com)
@@ -30,8 +31,18 @@
 @Immutable
 public final class CreateBridge {
 
-    public CreateBridge() {
+    private final MediaAttributes mediaAttributes;
+
+    public CreateBridge(final MediaAttributes mediaAttributes) {
         super();
+        this.mediaAttributes = mediaAttributes;
     }
 
+    public CreateBridge() {
+        this(new MediaAttributes());
+    };
+
+    public MediaAttributes mediaAttributes() {
+        return mediaAttributes;
+    }
 }
diff --git a/restcomm/restcomm.telephony/src/main/java/org/restcomm/connect/telephony/Bridge.java b/restcomm/restcomm.telephony/src/main/java/org/restcomm/connect/telephony/Bridge.java
@@ -26,6 +26,7 @@
 import java.util.List;
 import java.util.Set;
 
+import org.restcomm.connect.dao.entities.MediaAttributes;
 import org.restcomm.connect.telephony.api.BridgeStateChanged;
 import org.restcomm.connect.telephony.api.JoinCalls;
 import org.restcomm.connect.telephony.api.StartBridge;
@@ -83,7 +84,10 @@ public class Bridge extends UntypedActor {
     // Observer pattern
     private final List<ActorRef> observers;
 
-    public Bridge(final ActorRef mscontroller) {
+    // Media
+    private final MediaAttributes mediaAttributes;
+
+    public Bridge(final ActorRef mscontroller, final MediaAttributes mediaAttributes) {
         final ActorRef source = self();
 
         // Media Server Controller
@@ -120,6 +124,9 @@ public Bridge(final ActorRef mscontroller) {
 
         // Observer pattern
         this.observers = new ArrayList<ActorRef>(3);
+
+        // Media
+        this.mediaAttributes = mediaAttributes;
     }
 
     private boolean is(final State state) {
@@ -271,7 +278,7 @@ public void execute(Object message) throws Exception {
             mscontroller.tell(observe, super.source);
 
             // Initialize the MS Controller
-            final CreateMediaSession createMediaSession = new CreateMediaSession();
+            final CreateMediaSession createMediaSession = new CreateMediaSession(mediaAttributes);
             mscontroller.tell(createMediaSession, super.source);
         }
 
diff --git a/restcomm/restcomm.telephony/src/main/java/org/restcomm/connect/telephony/BridgeManager.java b/restcomm/restcomm.telephony/src/main/java/org/restcomm/connect/telephony/BridgeManager.java
@@ -29,6 +29,7 @@
 import akka.event.Logging;
 import akka.event.LoggingAdapter;
 import org.restcomm.connect.commons.patterns.Observe;
+import org.restcomm.connect.dao.entities.MediaAttributes;
 import org.restcomm.connect.mscontrol.api.MediaServerControllerFactory;
 import org.restcomm.connect.telephony.api.BridgeManagerResponse;
 import org.restcomm.connect.telephony.api.BridgeStateChanged;
@@ -51,13 +52,13 @@ public BridgeManager(final MediaServerControllerFactory factory) {
         this.system = context().system();
     }
 
-    private ActorRef createBridge() {
+    private ActorRef createBridge(final MediaAttributes mediaAttributes) {
         final Props props = new Props(new UntypedActorFactory() {
             private static final long serialVersionUID = 1L;
 
             @Override
             public UntypedActor create() throws Exception {
-                return new Bridge(factory.provideBridgeController());
+                return new Bridge(factory.provideBridgeController(), mediaAttributes);
             }
         });
         return system.actorOf(props);
@@ -82,7 +83,7 @@ public void onReceive(Object message) throws Exception {
 
     private void onCreateBridge(CreateBridge message, ActorRef self, ActorRef sender) {
         // Create a new bridge
-        ActorRef bridge = createBridge();
+        ActorRef bridge = createBridge(message.mediaAttributes());
 
         // Observe state changes in the bridge for termination purposes
         bridge.tell(new Observe(self), self);
diff --git a/restcomm/restcomm.telephony/src/main/java/org/restcomm/connect/telephony/Call.java b/restcomm/restcomm.telephony/src/main/java/org/restcomm/connect/telephony/Call.java
@@ -451,7 +451,7 @@ private CallResponse<CallInfo> info() {
             } else {
                 to = ((TelURL) this.to).getPhoneNumber();
             }
-            final CallInfo info = new CallInfo(id, external, type, direction, created, forwardedFrom, name, from, to, invite, lastResponse, webrtc, muted, isFromApi, callUpdatedTime);
+            final CallInfo info = new CallInfo(id, external, type, direction, created, forwardedFrom, name, from, to, invite, lastResponse, webrtc, muted, isFromApi, callUpdatedTime, mediaAttributes);
             return new CallResponse<CallInfo>(info);
         } catch (Exception e) {
             if (logger.isInfoEnabled()) {
diff --git a/restcomm/restcomm.ussd/src/main/java/org/restcomm/connect/ussd/telephony/UssdCall.java b/restcomm/restcomm.ussd/src/main/java/org/restcomm/connect/ussd/telephony/UssdCall.java
@@ -202,7 +202,7 @@ private CallResponse<CallInfo> info() {
         final String from = this.from.getUser();
         final String to = this.to.getUser();
         final CallInfo info = new CallInfo(id, external, type, direction, created, null, name, from, to, invite, lastResponse,
-                false, false, isFromApi, null);
+                false, false, isFromApi, null, null);
         return new CallResponse<CallInfo>(info);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -3256,7 +3256,7 @@ public CreatingBridge(ActorRef source) {`
`3256`	`3256`
`3257`	`3257`	`@Override`
`3258`	`3258`	`public void execute(Object message) throws Exception {`
`3259`		`- final CreateBridge create = new CreateBridge();`
	`3259`	`+ final CreateBridge create = new CreateBridge(outboundCallInfo.mediaAttributes());`
`3260`	`3260`	`bridgeManager.tell(create, super.source);`
`3261`	`3261`	`}`
`3262`	`3262`
Original file line number	Diff line number	Diff line change
`@@ -70,8 +70,8 @@ public CreateMediaSession(Sid callSid) {`
`70`	`70`	`this("", "", false, false, callSid, null, new MediaAttributes());`
`71`	`71`	`}`
`72`	`72`
`73`		`- public CreateMediaSession() {`
`74`		`- this("", "", false, false, null, null, new MediaAttributes());`
	`73`	`+ public CreateMediaSession(final MediaAttributes mediaAttributes) {`
	`74`	`+ this("", "", false, false, null, null, mediaAttributes);`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`public String getConnectionMode() {`
Original file line number	Diff line number	Diff line change
`@@ -483,7 +483,7 @@ public void execute(Object message) throws Exception {`
`483`	`483`
`484`	`484`	`private void configureVideoMediaSession(final MediaAttributes mediaAttributes) {`
`485`	`485`	`// resolution configuration`
`486`		`- mediaSession.setAttribute("CONFERENCE_VIDEO_SIZE", mediaAttributes.getVideoResolution().toString());`
	`486`	`+ mediaSession.setAttribute("NC_VIDEO_SIZE", mediaAttributes.getVideoResolution().toString());`
`487`	`487`	`}`
`488`	`488`
`489`	`489`	`private Parameters createMixerParams() {`
Original file line number	Diff line number	Diff line change
`@@ -451,7 +451,7 @@ private CallResponse<CallInfo> info() {`
`451`	`451`	`} else {`
`452`	`452`	`to = ((TelURL) this.to).getPhoneNumber();`
`453`	`453`	`}`
`454`		`- final CallInfo info = new CallInfo(id, external, type, direction, created, forwardedFrom, name, from, to, invite, lastResponse, webrtc, muted, isFromApi, callUpdatedTime);`
	`454`	`+ final CallInfo info = new CallInfo(id, external, type, direction, created, forwardedFrom, name, from, to, invite, lastResponse, webrtc, muted, isFromApi, callUpdatedTime, mediaAttributes);`
`455`	`455`	`return new CallResponse<CallInfo>(info);`
`456`	`456`	`} catch (Exception e) {`
`457`	`457`	`if (logger.isInfoEnabled()) {`
Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,7 @@ private CallResponse<CallInfo> info() {`
`202`	`202`	`final String from = this.from.getUser();`
`203`	`203`	`final String to = this.to.getUser();`
`204`	`204`	`final CallInfo info = new CallInfo(id, external, type, direction, created, null, name, from, to, invite, lastResponse,`
`205`		`- false, false, isFromApi, null);`
	`205`	`+ false, false, isFromApi, null, null);`
`206`	`206`	`return new CallResponse<CallInfo>(info);`
`207`	`207`	`}`
`208`	`208`