From 73eda14d0c277fc7a82856334950e189fe977e5e Mon Sep 17 00:00:00 2001 From: Matthew Cotton Date: Tue, 26 Jul 2022 11:41:17 +1000 Subject: [PATCH 1/3] Adding offer to receive flag --- SignallingWebServer/cirrus.js | 5 ++++- SignallingWebServer/scripts/app.js | 9 +++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/SignallingWebServer/cirrus.js b/SignallingWebServer/cirrus.js index f121c1be..f533e759 100644 --- a/SignallingWebServer/cirrus.js +++ b/SignallingWebServer/cirrus.js @@ -554,7 +554,10 @@ playerServer.on('connection', function (ws, req) { logIncoming(`player ${playerId}`, msg.type, msgRaw); - if (msg.type == 'answer') { + if (msg.type == 'offer') { + msg.playerId = playerId; + sendMessageToController(msg, skipSFU); + } else if (msg.type == 'answer') { msg.playerId = playerId; sendMessageToController(msg, skipSFU, skipStreamer); } else if (msg.type == 'iceCandidate') { diff --git a/SignallingWebServer/scripts/app.js b/SignallingWebServer/scripts/app.js index 29a18738..39be49aa 100644 --- a/SignallingWebServer/scripts/app.js +++ b/SignallingWebServer/scripts/app.js @@ -10,6 +10,7 @@ let rAF = window.mozRequestAnimationFrame || let kbEvent = document.createEvent("KeyboardEvent"); let initMethod = typeof kbEvent.initKeyboardEvent !== 'undefined' ? "initKeyboardEvent" : "initKeyEvent"; +let offerToReceive = true; let webRtcPlayerObj = null; let print_stats = false; @@ -1034,7 +1035,9 @@ function setupWebRtcPlayer(htmlElement, config) { createOnScreenKeyboardHelpers(htmlElement); } - //createWebRtcOffer(); + if (offerToReceive) { + createWebRtcOffer(); + } return webRtcPlayerObj.video; } @@ -2285,7 +2288,9 @@ function connect() { console.log("%c[Inbound SS (playerCount)]", "background: lightblue; color: black", msg); } else if (msg.type === 'offer') { console.log("%c[Inbound SS (offer)]", "background: lightblue; color: black", msg); - onWebRtcOffer(msg); + if (!offerToReceive) { + onWebRtcOffer(msg); + } } else if (msg.type === 'answer') { console.log("%c[Inbound SS (answer)]", "background: lightblue; color: black", msg); onWebRtcAnswer(msg); From 10b519bb107f7ae09cc4237b312686f4670278ed Mon Sep 17 00:00:00 2001 From: Matthew Cotton Date: Tue, 26 Jul 2022 11:59:56 +1000 Subject: [PATCH 2/3] Setting default offer to receive to false. --- SignallingWebServer/scripts/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SignallingWebServer/scripts/app.js b/SignallingWebServer/scripts/app.js index 5503e4b6..bfb279c2 100644 --- a/SignallingWebServer/scripts/app.js +++ b/SignallingWebServer/scripts/app.js @@ -10,7 +10,7 @@ let rAF = window.mozRequestAnimationFrame || let kbEvent = document.createEvent("KeyboardEvent"); let initMethod = typeof kbEvent.initKeyboardEvent !== 'undefined' ? "initKeyboardEvent" : "initKeyEvent"; -let offerToReceive = true; +let offerToReceive = false; let webRtcPlayerObj = null; let print_stats = false; From bf76d7d6f1022dd6ee3bcf8f5cd8a8a75ab10088 Mon Sep 17 00:00:00 2001 From: Matthew Cotton Date: Tue, 26 Jul 2022 12:57:08 +1000 Subject: [PATCH 3/3] Moving the offer to receive toggle to the front end. --- SignallingWebServer/Public/player.html | 7 +++++++ SignallingWebServer/scripts/app.js | 11 +++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/SignallingWebServer/Public/player.html b/SignallingWebServer/Public/player.html index c19f5c38..ec22e1d1 100644 --- a/SignallingWebServer/Public/player.html +++ b/SignallingWebServer/Public/player.html @@ -105,6 +105,13 @@
+
+
Offer To Receive
+ +
Prefer SFU