Implement review changes 4

modules/RTC/RTCUtils.js

@@ -759,8 +759,8 @@ class RTCUtils extends Listenable {
             disableHPF = options.disableHPF;
             logger.info(`Disable HPF: ${disableHPF}`);
         }
-        if (typeof options.stereo === 'boolean') {
-            stereo = options.stereo;
+        if (typeof options.audioQuality?.stereo === 'boolean') {
+            stereo = options.audioQuality.stereo;
             logger.info(`Stereo: ${stereo}`);
         }
 

modules/RTC/ScreenObtainer.js

@@ -163,8 +163,8 @@ const ScreenObtainer = {
             getDisplayMedia = navigator.mediaDevices.getDisplayMedia.bind(navigator.mediaDevices);
         }
 
-        const { stereo } = this.options;
-        const audio = stereo ? {
+        const { audioQuality } = this.options;
+        const audio = audioQuality?.stereo ? {
             autoGainControl: false,
             channelCount: 2,
             echoCancellation: false,

modules/RTC/TraceablePeerConnection.js

@@ -2157,9 +2157,9 @@ TraceablePeerConnection.prototype._adjustLocalMediaDirection = function(
  * @returns {RTCSessionDescription} the munged description.
  */
 TraceablePeerConnection.prototype._mungeOpus = function(description) {
-    const { opusMaxAverageBitrate, stereo } = this.options;
+    const { audioQuality } = this.options;
 
-    if (!opusMaxAverageBitrate || !stereo) {
+    if (!audioQuality?.stereo && !audioQuality?.opusMaxAverageBitrate) {
         return description;
     }
 
@@ -2171,7 +2171,8 @@ TraceablePeerConnection.prototype._mungeOpus = function(description) {
             const { payload } = mLine.rtp.find(protocol => protocol.codec === CodecMimeType.OPUS);
 
             if (!payload) {
-                break;
+                // eslint-disable-next-line no-continue
+                continue;
             }
 
             let fmtpOpus = mLine.fmtp.find(protocol => protocol.payload === payload);
@@ -2186,18 +2187,19 @@ TraceablePeerConnection.prototype._mungeOpus = function(description) {
             const fmtpConfig = transform.parseParams(fmtpOpus.config);
             let sdpChanged = false;
 
-            if (stereo) {
+            if (audioQuality?.stereo) {
                 fmtpConfig.stereo = 1;
                 sdpChanged = true;
             }
 
-            if (opusMaxAverageBitrate) {
-                fmtpConfig.opusMaxAverageBitrate = opusMaxAverageBitrate;
+            if (audioQuality?.opusMaxAverageBitrate) {
+                fmtpConfig.opusMaxAverageBitrate = audioQuality.opusMaxAverageBitrate;
                 sdpChanged = true;
             }
 
             if (!sdpChanged) {
-                break;
+                // eslint-disable-next-line no-continue
+                continue;
             }
 
             let mungedConfig = '';

modules/xmpp/JingleSessionPC.js

@@ -329,8 +329,7 @@ export default class JingleSessionPC extends JingleSession {
         pcOptions.enableInsertableStreams = options.enableInsertableStreams;
         pcOptions.videoQuality = options.videoQuality;
         pcOptions.forceTurnRelay = options.forceTurnRelay;
-        pcOptions.stereo = options.stereo;
-        pcOptions.opusMaxAverageBitrate = options.opusMaxAverageBitrate;
+        pcOptions.audioQuality = options.audioQuality;
 
         if (this.isP2P) {
             // simulcast needs to be disabled for P2P (121) calls