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

openvidu-server: forcedVideoCodec to NONE if mediasoup

pull/630/head
pabloFuente 2021-06-03 13:30:43 +02:00
parent 1f3bef9e01
commit 7c4b1c94ef
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -67,6 +67,7 @@ import io.openvidu.server.core.EndReason;
import io.openvidu.server.core.FinalUser; import io.openvidu.server.core.FinalUser;
import io.openvidu.server.core.IdentifierPrefixes; import io.openvidu.server.core.IdentifierPrefixes;
import io.openvidu.server.core.MediaOptions; import io.openvidu.server.core.MediaOptions;
import io.openvidu.server.core.MediaServer;
import io.openvidu.server.core.Participant; import io.openvidu.server.core.Participant;
import io.openvidu.server.core.Session; import io.openvidu.server.core.Session;
import io.openvidu.server.core.SessionManager; import io.openvidu.server.core.SessionManager;
@ -113,9 +114,13 @@ public class KurentoSessionManager extends SessionManager {
if (sessionNotActive == null && this.isInsecureParticipant(participant.getParticipantPrivateId())) { if (sessionNotActive == null && this.isInsecureParticipant(participant.getParticipantPrivateId())) {
// Insecure user directly call joinRoom RPC method, without REST API use // Insecure user directly call joinRoom RPC method, without REST API use
sessionNotActive = new Session(sessionId, new SessionProperties.Builder() SessionProperties.Builder builder = new SessionProperties.Builder().mediaMode(MediaMode.ROUTED)
.mediaMode(MediaMode.ROUTED).recordingMode(RecordingMode.ALWAYS).build(), openviduConfig, .recordingMode(RecordingMode.ALWAYS);
recordingManager); // forcedVideoCodec to NONE if mediasoup
if (MediaServer.mediasoup.equals(openviduConfig.getMediaServer())) {
builder.forcedVideoCodec(VideoCodec.NONE);
}
sessionNotActive = new Session(sessionId, builder.build(), openviduConfig, recordingManager);
} }
try { try {

6
openvidu-server/src/main/java/io/openvidu/server/rest/SessionRestController.java
View File

@ -65,6 +65,7 @@ import io.openvidu.java.client.VideoCodec;
import io.openvidu.server.config.OpenviduConfig; import io.openvidu.server.config.OpenviduConfig;
import io.openvidu.server.core.EndReason; import io.openvidu.server.core.EndReason;
import io.openvidu.server.core.IdentifierPrefixes; import io.openvidu.server.core.IdentifierPrefixes;
import io.openvidu.server.core.MediaServer;
import io.openvidu.server.core.Participant; import io.openvidu.server.core.Participant;
import io.openvidu.server.core.Session; import io.openvidu.server.core.Session;
import io.openvidu.server.core.SessionManager; import io.openvidu.server.core.SessionManager;
@ -756,11 +757,16 @@ public class SessionRestController {
} }
builder = builder.customSessionId(customSessionId); builder = builder.customSessionId(customSessionId);
} }
// forcedVideoCodec to NONE if mediasoup
if (MediaServer.mediasoup.equals(openviduConfig.getMediaServer())) {
builder = builder.forcedVideoCodec(VideoCodec.NONE);
} else {
if (forcedVideoCodec != null) { if (forcedVideoCodec != null) {
builder = builder.forcedVideoCodec(VideoCodec.valueOf(forcedVideoCodec)); builder = builder.forcedVideoCodec(VideoCodec.valueOf(forcedVideoCodec));
} else { } else {
builder = builder.forcedVideoCodec(openviduConfig.getOpenviduForcedCodec()); builder = builder.forcedVideoCodec(openviduConfig.getOpenviduForcedCodec());
} }
}
if (allowTranscoding != null) { if (allowTranscoding != null) {
builder = builder.allowTranscoding(allowTranscoding); builder = builder.allowTranscoding(allowTranscoding);
} else { } else {