ambiser
/
openvidu
mirror of https://github.com/OpenVidu/openvidu.git
8
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

openvidu-server: IPCAM participants id format changed

pull/391/head
pabloFuente 2020-01-29 18:01:53 +01:00
parent 8084acefcd
commit 1f139b8211
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openvidu-server/src/main/java/io/openvidu/server/core/Participant.java
View File

@ -146,7 +146,7 @@ public class Participant {
} }
public boolean isIpcam() { public boolean isIpcam() {
return this.platform.equals("IPCAM") && this.participantPrivatetId.startsWith("IPCAM-"); return this.platform.equals("IPCAM") && this.participantPrivatetId.startsWith("ipc_");
} }
public String getPublisherStreamId() { public String getPublisherStreamId() {

8
openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoSessionManager.java
View File

@ -899,9 +899,11 @@ public class KurentoSessionManager extends SessionManager {
location = null; location = null;
} }
final String rtspConnectionId = "ipc_" + kMediaOptions.getTypeOfVideo() + "-" + protocol + "-" String rtspConnectionId = kMediaOptions.getTypeOfVideo() + "_" + protocol + "_"
+ RandomStringUtils.randomAlphanumeric(4).toLowerCase() + "-" + url.getAuthority() + RandomStringUtils.randomAlphanumeric(4).toUpperCase() + "_" + url.getAuthority()
+ url.getPath().replaceAll("/", "-").replaceAll("_", "-"); + url.getPath();
rtspConnectionId = rtspConnectionId.replace("/", "_").replace("-", "").replace(".", "_");
rtspConnectionId = "ipc_" + rtspConnectionId;
// Store a "fake" participant for the IpCam connection // Store a "fake" participant for the IpCam connection
this.newInsecureParticipant(rtspConnectionId); this.newInsecureParticipant(rtspConnectionId);

2
openvidu-server/src/main/java/io/openvidu/server/rpc/RpcNotificationService.java
View File

@ -151,7 +151,7 @@ public class RpcNotificationService {
} }
private boolean isIpcamParticipant(String participantPrivateId) { private boolean isIpcamParticipant(String participantPrivateId) {
return participantPrivateId.startsWith("IPCAM-"); return participantPrivateId.startsWith("ipc_");
} }
} }