ref(Sdp) Modify SDPTransformUtil.selectMedia() to return all m-lines for a given media type.

modules/RTC/TraceablePeerConnection.js

@@ -1346,7 +1346,7 @@ const enforceSendRecv = function(localDescription, options) {
     }
 
     const transformer = new SdpTransformWrap(localDescription.sdp);
-    const audioMedia = transformer.selectMedia(MediaType.AUDIO);
+    const audioMedia = transformer.selectMedia(MediaType.AUDIO)?.[0];
     let changed = false;
 
     if (audioMedia && audioMedia.direction !== MediaDirection.SENDRECV) {
@@ -1359,7 +1359,7 @@ const enforceSendRecv = function(localDescription, options) {
         changed = true;
     }
 
-    const videoMedia = transformer.selectMedia(MediaType.VIDEO);
+    const videoMedia = transformer.selectMedia(MediaType.VIDEO)?.[0];
 
     if (videoMedia && videoMedia.direction !== MediaDirection.SENDRECV) {
         videoMedia.direction = MediaDirection.SENDRECV;
@@ -2079,7 +2079,7 @@ TraceablePeerConnection.prototype._ensureSimulcastGroupIsLast = function(localSd
 TraceablePeerConnection.prototype._adjustLocalMediaDirection = function(localDescription) {
     const transformer = new SdpTransformWrap(localDescription.sdp);
     let modifiedDirection = false;
-    const audioMedia = transformer.selectMedia(MediaType.AUDIO);
+    const audioMedia = transformer.selectMedia(MediaType.AUDIO)?.[0];
 
     if (audioMedia) {
         const desiredAudioDirection = this.getDesiredMediaDirection(MediaType.AUDIO);
@@ -2093,7 +2093,7 @@ TraceablePeerConnection.prototype._adjustLocalMediaDirection = function(localDes
         logger.warn(`${this} No "audio" media found in the local description`);
     }
 
-    const videoMedia = transformer.selectMedia(MediaType.VIDEO);
+    const videoMedia = transformer.selectMedia(MediaType.VIDEO)?.[0];
 
     if (videoMedia) {
         const desiredVideoDirection = this.getDesiredMediaDirection(MediaType.VIDEO);
@@ -2129,7 +2129,7 @@ TraceablePeerConnection.prototype._adjustRemoteMediaDirection = function(remoteD
     const transformer = new SdpTransformWrap(remoteDescription.sdp);
 
     [ MediaType.AUDIO, MediaType.VIDEO ].forEach(mediaType => {
-        const media = transformer.selectMedia(mediaType);
+        const media = transformer.selectMedia(mediaType)?.[0];
         const hasLocalSource = this.hasAnyTracksOfType(mediaType);
         const hasRemoteSource = this.getRemoteTracks(null, mediaType).length > 0;
 

modules/sdp/LocalSdpMunger.js

@@ -58,7 +58,7 @@ export default class LocalSdpMunger {
                     + 'Strange things may happen !', localVideos);
         }
 
-        const videoMLine = transformer.selectMedia('video');
+        const videoMLine = transformer.selectMedia(MediaType.VIDEO)?.[0];
 
         if (!videoMLine) {
             logger.debug(
@@ -305,14 +305,14 @@ export default class LocalSdpMunger {
         }
 
         const transformer = new SdpTransformWrap(sessionDesc.sdp);
-        const audioMLine = transformer.selectMedia('audio');
+        const audioMLine = transformer.selectMedia(MediaType.AUDIO)?.[0];
 
         if (audioMLine) {
             this._transformMediaIdentifiers(audioMLine);
             this._injectSourceNames(audioMLine);
         }
 
-        const videoMLine = transformer.selectMedia('video');
+        const videoMLine = transformer.selectMedia(MediaType.VIDEO)?.[0];
 
         if (videoMLine) {
             this._transformMediaIdentifiers(videoMLine);

modules/sdp/RtxModifier.js

@@ -1,5 +1,7 @@
 import { getLogger } from '@jitsi/logger';
 
+import * as MediaType from '../../service/RTC/MediaType';
+
 import SDPUtil from './SDPUtil';
 import { parseSecondarySSRC, SdpTransformWrap } from './SdpTransformUtil';
 
@@ -99,7 +101,7 @@ export default class RtxModifier {
      */
     modifyRtxSsrcs(sdpStr) {
         const sdpTransformer = new SdpTransformWrap(sdpStr);
-        const videoMLine = sdpTransformer.selectMedia('video');
+        const videoMLine = sdpTransformer.selectMedia(MediaType.VIDEO)?.[0];
 
         if (!videoMLine) {
             logger.debug(`No 'video' media found in the sdp: ${sdpStr}`);
@@ -168,7 +170,7 @@ export default class RtxModifier {
      */
     stripRtx(sdpStr) {
         const sdpTransformer = new SdpTransformWrap(sdpStr);
-        const videoMLine = sdpTransformer.selectMedia('video');
+        const videoMLine = sdpTransformer.selectMedia(MediaType.VIDEO)?.[0];
 
         if (!videoMLine) {
             logger.debug(`No 'video' media found in the sdp: ${sdpStr}`);

modules/sdp/SdpConsistency.js

@@ -1,5 +1,7 @@
 import { getLogger } from '@jitsi/logger';
 
+import * as MediaType from '../../service/RTC/MediaType';
+
 import {
     parsePrimarySSRC,
     parseSecondarySSRC,
@@ -72,7 +74,7 @@ export default class SdpConsistency {
      */
     makeVideoPrimarySsrcsConsistent(sdpStr) {
         const sdpTransformer = new SdpTransformWrap(sdpStr);
-        const videoMLine = sdpTransformer.selectMedia('video');
+        const videoMLine = sdpTransformer.selectMedia(MediaType.VIDEO)?.[0];
 
         if (!videoMLine) {
             logger.debug(`${this.logPrefix} no 'video' media found in the sdp: ${sdpStr}`);

modules/sdp/SdpTransformUtil.js

@@ -408,19 +408,19 @@ export class SdpTransformWrap {
     }
 
     /**
-     * Selects the first media SDP of given name.
-     * @param {string} mediaType the name of the media e.g. 'audio', 'video',
-     * 'data'.
-     * @return {MLineWrap|null} return {@link MLineWrap} instance for the media
-     * line or <tt>null</tt> if not found. The object returned references
-     * the underlying SDP state held by this <tt>SdpTransformWrap</tt> instance
-     * (it's not a copy).
+     * Selects all the m-lines from the SDP for a given media type.
+     *
+     * @param {string} mediaType the name of the media e.g. 'audio', 'video', 'data'.
+     * @return {MLineWrap|null} return {@link MLineWrap} instance for the media line or <tt>null</tt> if not found. The
+     * object returned references the underlying SDP state held by this <tt>SdpTransformWrap</tt> instance (it's not a
+     * copy).
      */
     selectMedia(mediaType) {
-        const selectedMLine
-            = this.parsedSDP.media.find(mLine => mLine.type === mediaType);
+        const selectedMLines = this.parsedSDP.media
+            .filter(mLine => mLine.type === mediaType)
+            .map(mLine => new MLineWrap(mLine));
 
-        return selectedMLine ? new MLineWrap(selectedMLine) : null;
+        return selectedMLines ?? null;
     }
 
     /**

types/auto/modules/sdp/SdpConsistency.d.ts

@@ -20,7 +20,7 @@ export default class SdpConsistency {
      *  makeVideoPrimarySsrcsConsistent
      */
     clearVideoSsrcCache(): void;
-    cachedPrimarySsrc: number;
+    cachedPrimarySsrc: any;
     injectRecvOnly: boolean;
     /**
      * Explicitly set the primary ssrc to be used in

types/auto/modules/sdp/SdpTransformUtil.d.ts

@@ -35,13 +35,12 @@ export class SdpTransformWrap {
     constructor(rawSDP: string);
     parsedSDP: any;
     /**
-     * Selects the first media SDP of given name.
-     * @param {string} mediaType the name of the media e.g. 'audio', 'video',
-     * 'data'.
-     * @return {MLineWrap|null} return {@link MLineWrap} instance for the media
-     * line or <tt>null</tt> if not found. The object returned references
-     * the underlying SDP state held by this <tt>SdpTransformWrap</tt> instance
-     * (it's not a copy).
+     * Selects all the m-lines from the SDP for a given media type.
+     *
+     * @param {string} mediaType the name of the media e.g. 'audio', 'video', 'data'.
+     * @return {MLineWrap|null} return {@link MLineWrap} instance for the media line or <tt>null</tt> if not found. The
+     * object returned references the underlying SDP state held by this <tt>SdpTransformWrap</tt> instance (it's not a
+     * copy).
      */
     selectMedia(mediaType: string): MLineWrap | null;
     /**