From 34fd6b0aadec94f26d0c32f05b5b85d87fdc2ff9 Mon Sep 17 00:00:00 2001
From: Mario Gasparoni <mariogasparoni@gmail.com>
Date: Mon, 25 Jul 2016 12:06:35 -0300
Subject: [PATCH] Using DESTINATION_IP_ADDRESS instead of SIP_HOST in
akka-transcode
Conflicts:
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/VoiceApp.scala
---
.../bigbluebutton/transcode/core/VideoTranscoder.java | 10 +++++-----
.../org/bigbluebutton/common/messages/Constants.java | 1 +
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/akka-bbb-transcode/src/main/java/org/bigbluebutton/transcode/core/VideoTranscoder.java b/akka-bbb-transcode/src/main/java/org/bigbluebutton/transcode/core/VideoTranscoder.java
index 49c3d7975b..2ddfc55df4 100644
--- a/akka-bbb-transcode/src/main/java/org/bigbluebutton/transcode/core/VideoTranscoder.java
+++ b/akka-bbb-transcode/src/main/java/org/bigbluebutton/transcode/core/VideoTranscoder.java
@@ -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);
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java b/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java
index 54c7708321..1df27e9d88 100755
--- a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java
+++ b/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java
@@ -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";
--
GitLab