diff --git a/labs/bbb-webrtc-sfu/lib/media-handler.js b/labs/bbb-webrtc-sfu/lib/media-handler.js index 67b78b09afb2ee2aa782b40a05bc883db0223b09..5c611ec395d7a994c162f5e1b0e11088f5e6b233 100644 --- a/labs/bbb-webrtc-sfu/lib/media-handler.js +++ b/labs/bbb-webrtc-sfu/lib/media-handler.js @@ -40,7 +40,7 @@ module.exports.generateStreamUrl = function (address, meeting, path) { return "rtmp://" + address + "/video-broadcast/" + meeting + "/" + path; } -module.exports.generateTranscoderParams = function (localIp, destIp, sendPort, recvPort, input, streamType, transcoderType, codec, callername) { +module.exports.generateTranscoderParams = function (localIp, destIp, sendPort, recvPort, input, streamType, transcoderType, codec, callername, voiceConf) { var rtpParams = {}; rtpParams[Constants.LOCAL_IP_ADDRESS] = localIp; rtpParams[Constants.LOCAL_VIDEO_PORT] = sendPort; @@ -51,6 +51,7 @@ module.exports.generateTranscoderParams = function (localIp, destIp, sendPort, r rtpParams[Constants.TRANSCODER_TYPE] = transcoderType; rtpParams[Constants.TRANSCODER_CODEC] = codec; rtpParams[Constants.CALLERNAME] = callername; + rtpParams[Constants.VOICE_CONF] = voiceConf; return rtpParams; } diff --git a/labs/bbb-webrtc-sfu/lib/screenshare/screenshare.js b/labs/bbb-webrtc-sfu/lib/screenshare/screenshare.js index c1538c979d21c2cc5666cfbc4d6101c7adf35dba..4caed7179407bda1e9732c9979ea17768764c8a1 100644 --- a/labs/bbb-webrtc-sfu/lib/screenshare/screenshare.js +++ b/labs/bbb-webrtc-sfu/lib/screenshare/screenshare.js @@ -28,7 +28,7 @@ if (config.get('acceptSelfSignedCertificate')) { } module.exports = class Screenshare { - constructor(ws, id, bbbgw, voiceBridge, caller, vh, vw, meetingId) { + constructor(ws, id, bbbgw, voiceBridge, caller = 'caller', vh, vw, meetingId) { this.mcs = new MCSApi(); this._ws = ws; this._id = id; @@ -129,7 +129,7 @@ module.exports = class Screenshare { let _callback = callback; // Force H264 on Firefox and Chrome - //sdpOffer = h264_sdp.transform(sdpOffer); + sdpOffer = h264_sdp.transform(sdpOffer); console.log(" [screenshare] Starting presenter " + id + " at voiceBridge " + this._voiceBridge); try { @@ -172,7 +172,7 @@ module.exports = class Screenshare { let recvVideoPort = retRtp.answer.match(/m=video\s(\d*)/)[1]; this._rtpParams = MediaHandler.generateTranscoderParams(kurentoIp, localIpAddress, - sendVideoPort, recvVideoPort, this._meetingId, "stream_type_video", C.RTP_TO_RTMP, "copy", "caller"); + sendVideoPort, recvVideoPort, this._meetingId, "stream_type_video", C.RTP_TO_RTMP, "copy", this._caller, this._voiceBridge); this.mcs.on('MediaEvent' + this._ffmpegEndpoint, this.mediaStateRtp.bind(this)); @@ -209,7 +209,7 @@ module.exports = class Screenshare { let sdpAnswer, sdpOffer; console.log("startviewer callerName = " + callerName); - //sdpOffer = h264_sdp.transform(sdp); + sdpOffer = h264_sdp.transform(sdp); sdpOffer = sdp; this._viewersCandidatesQueue[callerName] = [];