Merge pull request #20 from mcottontensor/master

Adding offer to receive support.
EpicGames · Jul 26, 2022 · 616f07a · 616f07a
2 parents 7155765 + bf76d7d
commit 616f07a
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 4 deletions.
diff --git a/SignallingWebServer/Public/player.html b/SignallingWebServer/Public/player.html
@@ -105,6 +105,13 @@
 								<div class="tgl-slider"></div>
 							</label>
 						</div>
+						<div id="offerToReceive" class="setting">
+							<div class="settings-text">Offer To Receive</div>
+							<label class="tgl-switch">
+								<input type="checkbox" id="offer-receive-tgl" class="tgl tgl-flat">
+								<div class="tgl-slider"></div>
+							</label>
+						</div>
 						<div id="preferSFU" class="setting">
 							<div class="settings-text">Prefer SFU</div>
 							<label class="tgl-switch">

diff --git a/SignallingWebServer/cirrus.js b/SignallingWebServer/cirrus.js
@@ -567,7 +567,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
@@ -10,7 +10,6 @@ let rAF = window.mozRequestAnimationFrame ||
 let kbEvent = document.createEvent("KeyboardEvent");
 let initMethod = typeof kbEvent.initKeyboardEvent !== 'undefined' ? "initKeyboardEvent" : "initKeyEvent";
 
-
 let webRtcPlayerObj = null;
 let print_stats = false;
 let print_inputs = false;
@@ -411,6 +410,7 @@ function setupHtmlEvents() {
     setupToggleWithUrlParams("force-mono-tgl", "ForceMonoAudio");
     setupToggleWithUrlParams("control-tgl", "hoveringMouse");
     setupToggleWithUrlParams("cursor-tgl", "hideBrowserCursor");
+    setupToggleWithUrlParams("offer-receive-tgl", "offerToReceive");
 
 
     var streamSelector = document.getElementById('stream-select');
@@ -460,6 +460,10 @@ function setupToggleWithUrlParams(toggleId, urlParameterKey){
     }
 }
 
+function UrlParamsCheck(urlParameterKey) {
+    return new URLSearchParams(window.location.search).has(urlParameterKey);
+}
+
 var streamTrackSource = null;
 
 function updateStreamList() {
@@ -1037,7 +1041,9 @@ function setupWebRtcPlayer(htmlElement, config) {
         createOnScreenKeyboardHelpers(htmlElement);
     }
 
-    //createWebRtcOffer();
+    if (UrlParamsCheck('offerToReceive')) {
+       createWebRtcOffer();
+    }
 
     return webRtcPlayerObj.video;
 }
@@ -2307,7 +2313,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 (!UrlParamsCheck('offerToReceive')) {
+                onWebRtcOffer(msg);
+            }
         } else if (msg.type === 'answer') {
             console.log("%c[Inbound SS (answer)]", "background: lightblue; color: black", msg);
             onWebRtcAnswer(msg);