Migration of attribute CAPTION from conference media session to participant media session. Issue #1552.

ghjansen · ghjansen · commit 958ca866e588 · 2017-05-07T18:11:45.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
@@ -199,6 +199,7 @@ public final class VoiceInterpreter extends BaseVoiceInterpreter {
     Tag conferenceVerb;
     List<URI> conferenceWaitUris;
     private boolean playMusicForConference = false;
+    private MediaAttributes mediaAttributes;
     //Used for system apps, such as when WebRTC client is dialing out.
     //The rcml will be used instead of download the RCML
     private String rcml;
@@ -433,6 +434,7 @@ public VoiceInterpreter(final Configuration configuration, final Sid account, fi
         this.asImsUa = asImsUa;
         this.imsUaLogin = imsUaLogin;
         this.imsUaPassword = imsUaPassword;
+        this.mediaAttributes = new MediaAttributes();
     }
 
     private boolean is(State state) {
@@ -2057,7 +2059,6 @@ public void execute(final Object message) throws Exception {
                 final Tag child = conference(verb);
                 if (child != null) {
                     String name = null;
-                    MediaAttributes mediaAttributes = new MediaAttributes();
                     final Tag grandchild = video(child);
                     if (grandchild == null) {
                         name = child.text();
@@ -2720,7 +2721,7 @@ public void execute(final Object message) throws Exception {
                 //Adding conference record in DB
                 //For outbound call the CDR will be updated at Call.InProgress()
                 addConferenceStuffInCDR(conferenceSid);
-                final AddParticipant request = new AddParticipant(call);
+                final AddParticipant request = new AddParticipant(call, mediaAttributes);
                 conference.tell(request, source);
             } else {
                 // Ask the parser for the next action to take.
diff --git a/restcomm/restcomm.mscontrol.api/src/main/java/org/restcomm/connect/mscontrol/api/messages/JoinCall.java b/restcomm/restcomm.mscontrol.api/src/main/java/org/restcomm/connect/mscontrol/api/messages/JoinCall.java
@@ -27,6 +27,7 @@
 
 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)
@@ -38,15 +39,21 @@ public final class JoinCall {
     private final ActorRef call;
     private final ConnectionMode connectionMode;
     private final Sid sid;
+    private final MediaAttributes mediaAttributes;
 
     public JoinCall(final ActorRef call, final ConnectionMode connectionMode) {
         this(call, connectionMode, null);
     }
 
     public JoinCall(final ActorRef call, final ConnectionMode connectionMode, final Sid sid) {
+        this(call, connectionMode, sid, new MediaAttributes());
+    }
+
+    public JoinCall(final ActorRef call, final ConnectionMode connectionMode, final Sid sid, final MediaAttributes mediaAttributes){
         this.call = call;
         this.connectionMode = connectionMode;
         this.sid = sid;
+        this.mediaAttributes = mediaAttributes;
     }
 
     public ActorRef getCall() {
@@ -60,4 +67,8 @@ public ConnectionMode getConnectionMode() {
     public Sid getSid () {
         return sid;
     }
+
+    public MediaAttributes mediaAttributes(){
+        return mediaAttributes;
+    }
 }
diff --git a/restcomm/restcomm.mscontrol.api/src/main/java/org/restcomm/connect/mscontrol/api/messages/JoinConference.java b/restcomm/restcomm.mscontrol.api/src/main/java/org/restcomm/connect/mscontrol/api/messages/JoinConference.java
@@ -25,6 +25,7 @@
 
 import jain.protocol.ip.mgcp.message.parms.ConnectionMode;
 import org.restcomm.connect.commons.dao.Sid;
+import org.restcomm.connect.dao.entities.MediaAttributes;
 
 /**
  * @author Henrique Rosa (henrique.rosa@telesta.com)
@@ -36,11 +37,17 @@ public final class JoinConference {
     private final Object endpoint;
     private final ConnectionMode connectionMode;
     private final Sid sid;
+    private final MediaAttributes mediaAttributes;
 
     public JoinConference(final Object endpoint, final ConnectionMode connectionMode, final Sid sid) {
+        this(endpoint, connectionMode, sid, new MediaAttributes());
+    }
+
+    public JoinConference(final Object endpoint, final ConnectionMode connectionMode, final Sid sid, final MediaAttributes mediaAttributes) {
         this.endpoint = endpoint;
         this.connectionMode = connectionMode;
         this.sid = sid;
+        this.mediaAttributes = mediaAttributes;
     }
 
     public Object getEndpoint() {
@@ -54,4 +61,8 @@ public ConnectionMode getConnectionMode() {
     public Sid getSid () {
         return sid;
     }
+
+    public MediaAttributes mediaAttributes(){
+        return mediaAttributes;
+    }
 }
diff --git a/restcomm/restcomm.mscontrol.jsr309/src/main/java/org/restcomm/connect/mscontrol/jsr309/Jsr309CallController.java b/restcomm/restcomm.mscontrol.jsr309/src/main/java/org/restcomm/connect/mscontrol/jsr309/Jsr309CallController.java
@@ -58,9 +58,11 @@
 import javax.sound.sampled.UnsupportedAudioFileException;
 
 import org.apache.commons.configuration.Configuration;
+import org.apache.commons.lang.StringUtils;
 import org.joda.time.DateTime;
 import org.restcomm.connect.dao.DaoManager;
 import org.restcomm.connect.dao.RecordingsDao;
+import org.restcomm.connect.dao.entities.MediaAttributes;
 import org.restcomm.connect.dao.entities.Recording;
 import org.restcomm.connect.commons.dao.Sid;
 import org.restcomm.connect.commons.fsm.FiniteStateMachine;
@@ -743,6 +745,11 @@ private void onJoinConference(JoinConference message, ActorRef self, ActorRef se
         if (is(active)) {
             try {
                 // join call leg to bridge
+                // overlay configuration
+                MediaAttributes ma = message.mediaAttributes();
+                if (!StringUtils.isEmpty(ma.getVideoOverlay())) {
+                    mediaSession.setAttribute("CAPTION", ma.getVideoOverlay());
+                }
                 this.bridge = sender;
                 this.mediaMixer = (MediaMixer) message.getEndpoint();
                 this.networkConnection.join(Direction.DUPLEX, mediaMixer);
diff --git a/restcomm/restcomm.mscontrol.jsr309/src/main/java/org/restcomm/connect/mscontrol/jsr309/Jsr309ConferenceController.java b/restcomm/restcomm.mscontrol.jsr309/src/main/java/org/restcomm/connect/mscontrol/jsr309/Jsr309ConferenceController.java
@@ -44,7 +44,6 @@
 import javax.media.mscontrol.resource.AllocationEventListener;
 import javax.media.mscontrol.resource.RTC;
 
-import org.apache.commons.lang.StringUtils;
 import org.mobicents.servlet.restcomm.mscontrol.messages.MediaServerConferenceControllerStateChanged;
 import org.restcomm.connect.commons.fsm.FiniteStateMachine;
 import org.restcomm.connect.commons.fsm.State;
@@ -342,7 +341,7 @@ private void onStopMediaGroup(StopMediaGroup message, ActorRef self, ActorRef se
     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());
+            final JoinConference join = new JoinConference(this.mediaMixer, message.getConnectionMode(), message.getSid(), message.mediaAttributes());
             message.getCall().tell(join, sender);
         }
     }
@@ -423,10 +422,6 @@ private void configureVideoMediaSession(final MediaAttributes mediaAttributes) {
             mediaSession.setAttribute("CONFERENCE_VIDEO_SIZE", mediaAttributes.getVideoResolution().toString());
             // layout configuration
             mediaSession.setAttribute("REGION", mediaAttributes.getVideoLayout().toString());
-            // overlay configuration
-            if (!StringUtils.isEmpty(mediaAttributes.getVideoOverlay())) {
-                mediaSession.setAttribute("CAPTION", mediaAttributes.getVideoOverlay());
-            }
         }
 
         private Parameters createMixerParams() {
diff --git a/restcomm/restcomm.telephony.api/src/main/java/org/restcomm/connect/telephony/api/AddParticipant.java b/restcomm/restcomm.telephony.api/src/main/java/org/restcomm/connect/telephony/api/AddParticipant.java
@@ -22,20 +22,31 @@
 import akka.actor.ActorRef;
 
 import org.restcomm.connect.commons.annotations.concurrency.Immutable;
+import org.restcomm.connect.dao.entities.MediaAttributes;
 
 /**
  * @author quintana.thomas@gmail.com (Thomas Quintana)
  */
 @Immutable
 public final class AddParticipant {
     private final ActorRef call;
+    private final MediaAttributes mediaAttributes;
 
     public AddParticipant(final ActorRef call) {
+        this(call, new MediaAttributes());
+    }
+
+    public AddParticipant(final ActorRef call, final MediaAttributes mediaAttributes){
         super();
         this.call = call;
+        this.mediaAttributes = mediaAttributes;
     }
 
     public ActorRef call() {
         return call;
     }
+
+    public MediaAttributes mediaAttributes(){
+        return mediaAttributes;
+    }
 }
diff --git a/restcomm/restcomm.telephony/src/main/java/org/restcomm/connect/telephony/Conference.java b/restcomm/restcomm.telephony/src/main/java/org/restcomm/connect/telephony/Conference.java
@@ -416,7 +416,7 @@ private void onConferenceModeratorPresent(ConferenceModeratorPresent message, Ac
 
     private void onAddParticipant(AddParticipant message, ActorRef self, ActorRef sender) {
         if (isRunning()) {
-            final JoinCall joinCall = new JoinCall(message.call(), ConnectionMode.Confrnce, this.sid);
+            final JoinCall joinCall = new JoinCall(message.call(), ConnectionMode.Confrnce, this.sid, message.mediaAttributes());
             this.mscontroller.tell(joinCall, self);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -416,7 +416,7 @@ private void onConferenceModeratorPresent(ConferenceModeratorPresent message, Ac`
`416`	`416`
`417`	`417`	`private void onAddParticipant(AddParticipant message, ActorRef self, ActorRef sender) {`
`418`	`418`	`if (isRunning()) {`
`419`		`- final JoinCall joinCall = new JoinCall(message.call(), ConnectionMode.Confrnce, this.sid);`
	`419`	`+ final JoinCall joinCall = new JoinCall(message.call(), ConnectionMode.Confrnce, this.sid, message.mediaAttributes());`
`420`	`420`	`this.mscontroller.tell(joinCall, self);`
`421`	`421`	`}`
`422`	`422`	`}`