refactor(core): propagate opts and mediaTypes to processAnswer

bigbluebutton · Sep 10, 2021 · aa99b7a · aa99b7a
1 parent 8a5bbcd
commit aa99b7a
Showing 1 changed file with 21 additions and 3 deletions.
diff --git a/lib/mcs-core/lib/model/sdp-session.js b/lib/mcs-core/lib/model/sdp-session.js
@@ -299,6 +299,7 @@ module.exports = class SDPSession extends MediaSession {
       });
   }
 
+  // FIXME Man... this SUCKS
   renegotiateStreams () {
     return new Promise(async (resolve, reject) => {
       try {
@@ -324,7 +325,13 @@ module.exports = class SDPSession extends MediaSession {
               mediaId: videoMedia.id,
               descriptor: this.remoteDescriptor.mainVideoSdp,
             });
-            await videoAdapter.processAnswer(videoMedia.adapterElementId, this.remoteDescriptor.mainVideoSdp);
+
+            await videoAdapter.processAnswer(
+              videoMedia.adapterElementId,
+              this.remoteDescriptor.mainVideoSdp,
+              { mediaTypes: videoMedia.mediaTypes, ...this._options }
+            );
+
             videoMedia.remoteDescriptor = this.remoteDescriptor.mainVideoSdp;
           } catch (e) {
             this._handleError(e);
@@ -341,7 +348,12 @@ module.exports = class SDPSession extends MediaSession {
             });
             const adescBody = SdpWrapper.removeSessionDescription(this.remoteDescriptor.audioSdp);
             const mainWithInvalidVideo = this.remoteDescriptor.sessionDescriptionHeader + adescBody;
-            await audioAdapter.processAnswer(audioMedia.adapterElementId, mainWithInvalidVideo);
+            await audioAdapter.processAnswer(
+              audioMedia.adapterElementId,
+              mainWithInvalidVideo,
+              { mediaTypes: audioMedia.mediaTypes, ...this._options }
+            );
+
             audioMedia.remoteDescriptor = this.remoteDescriptor.audioSdp;
           }
           catch (e) {
@@ -369,7 +381,13 @@ module.exports = class SDPSession extends MediaSession {
               mediaId: contentMedia.id,
               descriptor: this.remoteDescriptor.contentVideoSdp,
             });
-            await contentAdapter.processAnswer(contentMedia.adapterElementId, this.remoteDescriptor.contentVideoSdp);
+
+            await contentAdapter.processAnswer(
+              contentMedia.adapterElementId,
+              this.remoteDescriptor.contentVideoSdp,
+              { mediaTypes: contentMedia.mediaTypes, ...this._options }
+            );
+
             contentMedia.remoteDescriptor = this.remoteDescriptor.contentVideoSdp;
           } else if (!this.localDescriptor || !this.localDescriptor.contentVideoSdp) {
             // This is a renegotiation for a new content media for us as ANSWERERS