From 7ddde2fbc43db74ee7e677a7b086ba7dc3c01878 Mon Sep 17 00:00:00 2001 From: cruizba Date: Thu, 19 Nov 2020 17:14:04 +0100 Subject: [PATCH] openvidu-server: Better format for force codec debug logs --- .../io/openvidu/server/utils/SDPMunging.java | 30 +++++++++++++------ 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/openvidu-server/src/main/java/io/openvidu/server/utils/SDPMunging.java b/openvidu-server/src/main/java/io/openvidu/server/utils/SDPMunging.java index 0995278b..6544f764 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/utils/SDPMunging.java +++ b/openvidu-server/src/main/java/io/openvidu/server/utils/SDPMunging.java @@ -151,33 +151,45 @@ public class SDPMunging { * Return a SDP modified to force a specific codec */ public String forceCodec(Participant participant, String sdp, boolean isOffer, Session session, boolean isPublisher, - boolean isReconnecting, boolean isTranscodingAllowed, VideoCodec forcedVideoCodec) throws OpenViduException { + boolean isReconnecting, boolean isTranscodingAllowed, VideoCodec forcedVideoCodec) throws OpenViduException { try { if (supportedVideoCodecs.contains(forcedVideoCodec)) { String mungedSdpOffer; - log.debug("PARTICIPANT '{}' in Session '{}'. Is Publisher: '{}'. Is Subscriber: '{}'. Is Offer SDP: '{}'. " + - "Is Answer SDP: '{}'. Is Reconnecting '{}'. SDP before munging: \n {}", participant.getParticipantPublicId(), + + log.debug("PARTICIPANT '{}' in Session '{}'. Is Publisher: '{}'. Is Subscriber: '{}'." + + " Is Offer SDP: '{}'. Is Answer SDP: '{}'. Is Reconnecting '{}'." + + " SDP before munging: \n {}", participant.getParticipantPublicId(), session.getSessionId(), isPublisher, !isPublisher, isOffer, !isOffer, isReconnecting, sdp); + mungedSdpOffer = this.setCodecPreference(forcedVideoCodec, sdp); - log.debug("PARTICIPANT '{}' in Session '{}'. Is Publisher: '{}'. Is Subscriber: '{}'. Is Offer SDP: '{}'. " + - "Is Answer SDP: '{}'. Is Reconnecting '{}'. SDP after munging: \n {}", participant.getParticipantPublicId(), + + log.debug("PARTICIPANT '{}' in Session '{}'. Is Publisher: '{}'. Is Subscriber: '{}'." + + " Is Offer SDP: '{}'. Is Answer SDP: '{}'. Is Reconnecting '{}'." + + " SDP after munging: \n {}", participant.getParticipantPublicId(), session.getSessionId(), isPublisher, !isPublisher, isOffer, !isOffer, isReconnecting, mungedSdpOffer); + return mungedSdpOffer; } else { throw new OpenViduException(Code.FORCED_CODEC_NOT_FOUND_IN_SDPOFFER, "Codec not supported by Media Server"); } } catch (OpenViduException e) { - String errorMessage = "Error forcing codec: '" + forcedVideoCodec + "', for PARTICIPANT: '" + participant.getParticipantPublicId() - + "' in Session: '" + session.getSessionId() + "'. Is publishing: '" + isPublisher + "'. Is Subscriber: '" + !isPublisher + + String errorMessage = "Error forcing codec: '" + forcedVideoCodec + "', for PARTICIPANT: '" + + participant.getParticipantPublicId() + "' in Session: '" + session.getSessionId() + + "'. Is publishing: '" + isPublisher + "'. Is Subscriber: '" + !isPublisher + "'. Is Offer: '" + isOffer + "'. Is Answer: '" + !isOffer + "'. Is Reconnecting: '" + isReconnecting + "'.\nException: " + e.getMessage() + "\nSDP:\n" + sdp; + if(!isTranscodingAllowed) { throw new OpenViduException(Code.FORCED_CODEC_NOT_FOUND_IN_SDPOFFER, errorMessage); } - log.info("Codec: '{}' is not supported for PARTICIPANT: '{}' in Session: '{}'. Is publishing: '{}'. Is Subscriber: '{}' " - + "Is Offer SDP: '{}'. Is Answer SDP: '{}'. Is Reconnecting: '{}'. Transcoding will be allowed", forcedVideoCodec, participant.getParticipantPublicId(), + + log.info("Codec: '{}' is not supported for PARTICIPANT: '{}' in Session: '{}'. Is publishing: '{}'. " + + "Is Subscriber: '{}' Is Offer SDP: '{}'. Is Answer SDP: '{}'. Is Reconnecting: '{}'." + + " Transcoding will be allowed", forcedVideoCodec, participant.getParticipantPublicId(), session.getSessionId(), isPublisher, !isPublisher, isOffer, !isOffer, isReconnecting); + return sdp; } }