BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Using DESTINATION_IP_ADDRESS instead of SIP_HOST in akka-transcode

Browse Source 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/VoiceApp.scala
This commit is contained in:
Mario Gasparoni 2016-07-25 12:06:35 -03:00 committed by Pedro Beschorner Marin
parent 16698f7489
commit 34fd6b0aad
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
akka-bbb-transcode/src/main/java/org/bigbluebutton/transcode/core/VideoTranscoder.java
View File

@ -128,7 +128,7 @@ public class VideoTranscoder extends UntypedActor implements ProcessMonitorObser
this.sourceIp = params.get(Constants.LOCAL_IP_ADDRESS);
this.localVideoPort = params.get(Constants.LOCAL_VIDEO_PORT);
this.remoteVideoPort = params.get(Constants.REMOTE_VIDEO_PORT);
this.destinationIp = params.get(Constants.SIP_HOST);
this.destinationIp = params.get(Constants.DESTINATION_IP_ADDRESS);
this.voiceBridge = params.get(Constants.VOICE_CONF);
this.callername = params.get(Constants.CALLERNAME);
break;
@ -138,7 +138,7 @@ public class VideoTranscoder extends UntypedActor implements ProcessMonitorObser
this.sourceIp = params.get(Constants.LOCAL_IP_ADDRESS);
this.localVideoPort = params.get(Constants.LOCAL_VIDEO_PORT);
this.remoteVideoPort = params.get(Constants.REMOTE_VIDEO_PORT);
this.destinationIp = params.get(Constants.SIP_HOST);
this.destinationIp = params.get(Constants.DESTINATION_IP_ADDRESS);
this.voiceBridge = params.get(Constants.VOICE_CONF);
this.callername = params.get(Constants.CALLERNAME);
this.videoStreamName = params.get(Constants.INPUT);
@ -149,7 +149,7 @@ public class VideoTranscoder extends UntypedActor implements ProcessMonitorObser
this.sourceIp = params.get(Constants.LOCAL_IP_ADDRESS);
this.localVideoPort = params.get(Constants.LOCAL_VIDEO_PORT);
this.remoteVideoPort = params.get(Constants.REMOTE_VIDEO_PORT);
this.destinationIp = params.get(Constants.SIP_HOST);
this.destinationIp = params.get(Constants.DESTINATION_IP_ADDRESS);
this.voiceBridge = params.get(Constants.VOICE_CONF);
this.callername = params.get(Constants.CALLERNAME);
break;
@ -159,7 +159,7 @@ public class VideoTranscoder extends UntypedActor implements ProcessMonitorObser
this.sourceIp = params.get(Constants.LOCAL_IP_ADDRESS);
this.localVideoPort = params.get(Constants.LOCAL_VIDEO_PORT);
this.remoteVideoPort = params.get(Constants.REMOTE_VIDEO_PORT);
this.destinationIp = params.get(Constants.SIP_HOST);
this.destinationIp = params.get(Constants.DESTINATION_IP_ADDRESS);
this.voiceBridge = params.get(Constants.VOICE_CONF);
this.callername = params.get(Constants.CALLERNAME);
break;
@ -399,7 +399,7 @@ public class VideoTranscoder extends UntypedActor implements ProcessMonitorObser
String sourceIp = params.get(Constants.LOCAL_IP_ADDRESS);
String localVideoPort = params.get(Constants.LOCAL_VIDEO_PORT);
String remoteVideoPort = params.get(Constants.REMOTE_VIDEO_PORT);
String destinationIp = params.get(Constants.SIP_HOST);
String destinationIp = params.get(Constants.DESTINATION_IP_ADDRESS);
setType(transcoderType);
setVideoStreamName(input);

1
bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java
View File

@ -144,6 +144,7 @@ public class Constants {
public static final String LOCAL_IP_ADDRESS = "local_ip_address";
public static final String LOCAL_VIDEO_PORT = "local_video_port";
public static final String REMOTE_VIDEO_PORT = "remote_video_port";
public static final String DESTINATION_IP_ADDRESS = "destination_ip_address";
public static final String SIP_HOST = "sip_host";
public static final String TRANSCODER_TYPE = "transcoder_type";
public static final String INPUT = "input";