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

openvidu-server: fix receiveVideoFrom IPCAM

pull/391/head
pabloFuente 2020-01-29 19:11:06 +01:00
parent 78deea7f3b
commit 2f397c42c0
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -104,7 +104,7 @@ public class KurentoParticipant extends Participant {
String type = mediaOptions.hasVideo() ? mediaOptions.getTypeOfVideo() : "MICRO"; String type = mediaOptions.hasVideo() ? mediaOptions.getTypeOfVideo() : "MICRO";
final String publisherStreamId = IdentifierPrefixes.STREAM_ID + type.substring(0, Math.min(type.length(), 3)) final String publisherStreamId = IdentifierPrefixes.STREAM_ID + type.substring(0, Math.min(type.length(), 3))
+ "_" + RandomStringUtils.randomAlphabetic(1).toUpperCase() + RandomStringUtils.randomAlphanumeric(3) + "_" + RandomStringUtils.randomAlphabetic(1).toUpperCase() + RandomStringUtils.randomAlphanumeric(3)
+ "_" + this.getParticipantPublicId().substring(4, this.getParticipantPublicId().length()); + "_" + this.getParticipantPublicId();
publisher.setStreamId(publisherStreamId); publisher.setStreamId(publisherStreamId);
publisher.setEndpointName(publisherStreamId); publisher.setEndpointName(publisherStreamId);
publisher.setMediaOptions(mediaOptions); publisher.setMediaOptions(mediaOptions);

14
openvidu-server/src/main/java/io/openvidu/server/rpc/RpcHandler.java
View File

@ -326,9 +326,19 @@ public class RpcHandler extends DefaultJsonRpcHandler<JsonObject> {
} }
String senderPublicId = getStringParam(request, ProtocolElements.RECEIVEVIDEO_SENDER_PARAM); String senderPublicId = getStringParam(request, ProtocolElements.RECEIVEVIDEO_SENDER_PARAM);
// Parse sender public id from stream id // Parse sender public id from stream id
senderPublicId = IdentifierPrefixes.PARTICIPANT_PUBLIC_ID if (senderPublicId.startsWith(IdentifierPrefixes.STREAM_ID + "IPC_")
+ senderPublicId.substring(senderPublicId.lastIndexOf("_") + 1, senderPublicId.length()); && senderPublicId.contains(IdentifierPrefixes.IPCAM_ID)) {
// If IPCAM
senderPublicId = senderPublicId.substring(senderPublicId.indexOf("_" + IdentifierPrefixes.IPCAM_ID) + 1,
senderPublicId.length());
} else {
// Not IPCAM
senderPublicId = senderPublicId.substring(
senderPublicId.lastIndexOf(IdentifierPrefixes.PARTICIPANT_PUBLIC_ID), senderPublicId.length());
}
String sdpOffer = getStringParam(request, ProtocolElements.RECEIVEVIDEO_SDPOFFER_PARAM); String sdpOffer = getStringParam(request, ProtocolElements.RECEIVEVIDEO_SDPOFFER_PARAM);
sessionManager.subscribe(participant, senderPublicId, sdpOffer, request.getId()); sessionManager.subscribe(participant, senderPublicId, sdpOffer, request.getId());