From 2e51482c7c59696f3cad6e4a31366628f87803db Mon Sep 17 00:00:00 2001
From: prlanzarin <prlanzarin@tutanota.de>
Date: Fri, 12 Mar 2021 03:04:55 +0000
Subject: [PATCH 1/2] audio: make sdpSemantics configurable

Plan B is going to be phased out of Chrome soon and we should be testing it with unified plan
---
 bigbluebutton-html5/imports/api/audio/client/bridge/sip.js | 3 ++-
 bigbluebutton-html5/private/config/settings.yml            | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/bigbluebutton-html5/imports/api/audio/client/bridge/sip.js b/bigbluebutton-html5/imports/api/audio/client/bridge/sip.js
index 1a3ddfe99b..920f926c72 100755
--- a/bigbluebutton-html5/imports/api/audio/client/bridge/sip.js
+++ b/bigbluebutton-html5/imports/api/audio/client/bridge/sip.js
@@ -39,6 +39,7 @@ const WEBSOCKET_KEEP_ALIVE_DEBOUNCE = MEDIA.websocketKeepAliveDebounce || 10;
 const TRACE_SIP = MEDIA.traceSip || false;
 const AUDIO_MICROPHONE_CONSTRAINTS = Meteor.settings.public.app.defaultSettings
   .application.microphoneConstraints;
+const SDP_SEMANTICS = MEDIA.sdpSemantics;
 
 const getAudioSessionNumber = () => {
   let currItem = parseInt(sessionStorage.getItem(AUDIO_SESSION_NUM_KEY), 10);
@@ -381,7 +382,7 @@ class SIPSession {
         sessionDescriptionHandlerFactoryOptions: {
           peerConnectionConfiguration: {
             iceServers,
-            sdpSemantics: 'plan-b',
+            sdpSemantics: SDP_SEMANTICS,
           },
         },
         displayName: callerIdName,
diff --git a/bigbluebutton-html5/private/config/settings.yml b/bigbluebutton-html5/private/config/settings.yml
index dfdf8999ed..60ed54ebbb 100755
--- a/bigbluebutton-html5/private/config/settings.yml
+++ b/bigbluebutton-html5/private/config/settings.yml
@@ -321,6 +321,8 @@ public:
     websocketKeepAliveDebounce: 10
     #Trace sip/audio messages in browser. If not set, default value is false.
     traceSip: false
+    # SDP semantics: plan-b|unified-plan
+    sdpSemantics: 'plan-b'
   presentation:
     defaultPresentationFile: default.pdf
     panZoomThrottle: 32

From d6d52326a6b425f5386e1ab2a9691326eeb83c4b Mon Sep 17 00:00:00 2001
From: Paulo Lanzarin <4529051+prlanzarin@users.noreply.github.com>
Date: Wed, 24 Mar 2021 12:16:13 -0300
Subject: [PATCH 2/2] audio: change default SDP format to Unified Plan

Making the default transition a bit earlier so that we can field trial it just to be sure enough it's safe.
---
 bigbluebutton-html5/private/config/settings.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bigbluebutton-html5/private/config/settings.yml b/bigbluebutton-html5/private/config/settings.yml
index 60ed54ebbb..0d3d515592 100755
--- a/bigbluebutton-html5/private/config/settings.yml
+++ b/bigbluebutton-html5/private/config/settings.yml
@@ -322,7 +322,7 @@ public:
     #Trace sip/audio messages in browser. If not set, default value is false.
     traceSip: false
     # SDP semantics: plan-b|unified-plan
-    sdpSemantics: 'plan-b'
+    sdpSemantics: 'unified-plan'
   presentation:
     defaultPresentationFile: default.pdf
     panZoomThrottle: 32