fix(SDP) Remove redundant types. (#2917)

Author: jallamsetty1

modules/RTC/SourceInfo.ts

@@ -1,6 +1,6 @@
 import { getLogger } from '@jitsi/logger';
 import { cloneDeep } from 'lodash-es';
-import transform from 'sdp-transform';
+import transform, { type SessionDescription } from 'sdp-transform';
 
 import { CodecMimeType } from '../../service/RTC/CodecMimeType';
 import { MediaDirection } from '../../service/RTC/MediaDirection';
@@ -179,11 +179,11 @@ export class TPCUtils {
     /**
      * Returns the codecs in the current order of preference in the SDP provided.
      *
-     * @param {transform.SessionDescription} parsedSdp the parsed SDP object.
+     * @param {SessionDescription} parsedSdp the parsed SDP object.
      * @returns {Array<CodecMimeType>}
      * @private
      */
-    private _getConfiguredVideoCodecsImpl(parsedSdp: transform.SessionDescription): CodecMimeType[] {
+    private _getConfiguredVideoCodecsImpl(parsedSdp: SessionDescription): CodecMimeType[] {
         const mLine = parsedSdp.media.find(m => m.type === MediaType.VIDEO);
         const codecs = new Set(mLine.rtp
             .filter(pt => pt.codec.toLowerCase() !== 'rtx')
@@ -775,11 +775,11 @@ export class TPCUtils {
     /**
      * Munges the session description to ensure that the codec order is as per the preferred codec settings.
      *
-     * @param {transform.SessionDescription} parsedSdp that needs to be munged
-     * @returns {transform.SessionDescription} the munged SDP.
+     * @param {SessionDescription} parsedSdp that needs to be munged
+     * @returns {SessionDescription} the munged SDP.
      * @internal
      */
-    mungeCodecOrder(parsedSdp: transform.SessionDescription): transform.SessionDescription {
+    mungeCodecOrder(parsedSdp: SessionDescription): SessionDescription {
         const codecSettings = this.pc.codecSettings;
 
         if (!codecSettings) {
@@ -827,11 +827,11 @@ export class TPCUtils {
      * Munges the stereo flag as well as the opusMaxAverageBitrate in the SDP, based on values set through config.js,
      * if present.
      *
-     * @param {transform.SessionDescription} parsedSdp that needs to be munged.
-     * @returns {transform.SessionDescription} the munged SDP.
+     * @param {SessionDescription} parsedSdp that needs to be munged.
+     * @returns {SessionDescription} the munged SDP.
      * @internal
      */
-    mungeOpus(parsedSdp: transform.SessionDescription): transform.SessionDescription {
+    mungeOpus(parsedSdp: SessionDescription): SessionDescription {
         const { audioQuality } = this.options;
 
         if (!audioQuality?.enableOpusDtx && !audioQuality?.stereo && !audioQuality?.opusMaxAverageBitrate) {
@@ -897,12 +897,12 @@ export class TPCUtils {
     /**
      * Munges the session SDP by setting the max bitrates on the video m-lines when VP9 K-SVC codec is in use.
      *
-     * @param {transform.SessionDescription} parsedSdp that needs to be munged.
+     * @param {SessionDescription} parsedSdp that needs to be munged.
      * @param {boolean} isLocalSdp - Whether the max bitrate (via b=AS line in SDP) is set on local SDP.
-     * @returns {transform.SessionDescription} The munged SDP.
+     * @returns {SessionDescription} The munged SDP.
      * @internal
      */
-    setMaxBitrates(parsedSdp: transform.SessionDescription, isLocalSdp = false): transform.SessionDescription {
+    setMaxBitrates(parsedSdp: SessionDescription, isLocalSdp = false): SessionDescription {
         const pcCodecSettings = this.pc.codecSettings;
 
         if (!pcCodecSettings) {

modules/RTC/TPCUtils.ts

@@ -30,10 +30,8 @@ import JitsiRemoteTrack from './JitsiRemoteTrack';
 import RTC from './RTC';
 import RTCUtils from './RTCUtils';
 import { SS_DEFAULT_FRAME_RATE } from './ScreenObtainer';
-import { ITPCSourceInfo } from './SourceInfo';
 import { ICodecConfig, TPCUtils } from './TPCUtils';
 
-
 const logger = getLogger('modules/RTC/TraceablePeerConnection');
 const DEGRADATION_PREFERENCE_CAMERA = 'maintain-framerate';
 const DEGRADATION_PREFERENCE_DESKTOP = 'maintain-resolution';
@@ -84,6 +82,13 @@ export interface ITPCOptions {
     videoQuality: IVideoQuality;
 }
 
+interface ITPCSourceInfo {
+    groups: ISsrcGroupInfo;
+    mediaType?: MediaType;
+    msid: string;
+    ssrcList?: Array<string>;
+    videoType?: VideoType;
+}
 export interface IAudioQuality {
     enableOpusDtx?: boolean;
     opusMaxAverageBitrate?: number;
@@ -1313,7 +1318,7 @@ export default class TraceablePeerConnection {
         const ssrcGroup = this.isSpatialScalabilityOn() ? SSRC_GROUP_SEMANTICS.SIM : SSRC_GROUP_SEMANTICS.FID;
 
         return this.localSSRCs.get(localTrack.rtcId)
-        ?.groups?.find(group => group.semantics === ssrcGroup)?.ssrcs || ssrcs;
+            ?.groups?.find(group => group.semantics === ssrcGroup)?.ssrcs || ssrcs;
     }
 
     /**
@@ -1777,7 +1782,7 @@ export default class TraceablePeerConnection {
 
                 if (ssrcGroups?.length) {
                     for (const group of ssrcGroups) {
-                        const parsedGroup: ISsrcGroupInfo = {
+                        const parsedGroup = {
                             semantics: group.semantics,
                             ssrcs: group.ssrcs.split(' ').map(ssrcStr => parseInt(ssrcStr, 10))
                         };

modules/RTC/TraceablePeerConnection.ts

@@ -1,8 +1,7 @@
-/* eslint-disable max-len*/
 import * as transform from 'sdp-transform';
 
 import RtxModifier from './RtxModifier.js';
-import SDPUtil from './SDPUtil.js';
+import SDPUtil from './SDPUtil';
 import { default as SampleSdpStrings } from './SampleSdpStrings';
 
 /**

modules/sdp/RtxModifier.spec.ts

@@ -1,14 +1,15 @@
 import { getLogger } from '@jitsi/logger';
-const logger = getLogger('modules/sdp/SDPUtil');
+import type { MediaDescription } from 'sdp-transform';
 
 import { CodecMimeType } from '../../service/RTC/CodecMimeType';
 import { MediaDirection } from '../../service/RTC/MediaDirection';
 import { SSRC_GROUP_SEMANTICS } from '../../service/RTC/StandardVideoQualitySettings';
 import browser from '../browser';
 import RandomUtil from '../util/RandomUtil';
 
-import { ICryptoData, IExtmapData, IFingerprintData, IFmtpParameter, IICECandidate, IICEParams, IMLine, IMediaDescription, IMediaLine, IRTCPFBData, IRTPMapData, ISDPObject, ISSRCGroupData, ISsrcGroups } from './constants';
+import { ICryptoData, IExtmapData, IFingerprintData, IFmtpParameter, IICECandidate, IICEParams, IMediaLine, IRTCPFBData, IRTPMapData, ISSRCGroupData } from './constants';
 
+const logger = getLogger('modules/sdp/SDPUtil');
 
 const SDPUtil = {
     /**
@@ -326,26 +327,15 @@ const SDPUtil = {
         return RandomUtil.randomInt(1, 0xffffffff);
     },
 
-    /**
-     * Gets the media description for a specific media type from the SDP.
-     *
-     * @param {ISDPObject} sdp - The SDP object.
-     * @param {string} type - The media type to search for (e.g., "audio", "video").
-     * @returns {Nullable<IMediaDescription>} - The media description object or null if not found.
-     */
-    getMedia(sdp: ISDPObject, type: string): Nullable<IMediaDescription> {
-        return sdp.media.find(m => m.type === type);
-    },
-
     /**
      * Gets the SSRC attribute value from the media line.
      *
-     * @param {IMLine} mLine - The media line object.
+     * @param {MediaDescription} mLine - The media line object.
      * @param {number} ssrc - The SSRC value to search for.
      * @param {string} attributeName - The attribute name to search for.
      * @returns {string|null} - The attribute value or null if not found.
      */
-    getSsrcAttribute(mLine: IMLine, ssrc: number, attributeName: string): Nullable<string> {
+    getSsrcAttribute(mLine: MediaDescription, ssrc: number, attributeName: string): Nullable<string> {
         for (let i = 0; i < mLine.ssrcs.length; ++i) {
             const ssrcLine = mLine.ssrcs[i];
 
@@ -493,10 +483,10 @@ const SDPUtil = {
     /**
      * Parses the SSRCs from a group description.
      *
-     * @param {ISsrcGroups} ssrcGroup - The SSRC group object.
+     * @param {MediaDescription['ssrcGroups'][number]} ssrcGroup - The SSRC group object.
      * @returns {number[]} - The list of SSRCs in the group.
      */
-    parseGroupSsrcs(ssrcGroup: ISsrcGroups): number[] {
+    parseGroupSsrcs(ssrcGroup: MediaDescription['ssrcGroups'][number]): number[] {
         return ssrcGroup
             .ssrcs
             .split(' ')
@@ -623,10 +613,10 @@ const SDPUtil = {
 
     /**
      * Parse the 'most' primary video ssrc from the given m line
-     * @param {IMLine} videoMLine object as parsed from transform.parse
+     * @param {MediaDescription} videoMLine object as parsed from transform.parse
      * @return {Optional<number>} the primary video ssrc from the given m line
      */
-    parsePrimaryVideoSsrc(videoMLine: IMLine): Optional<number> {
+    parsePrimaryVideoSsrc(videoMLine: MediaDescription): Optional<number> {
         const numSsrcs = (videoMLine.ssrcs)
             .map(ssrcInfo => ssrcInfo.id)
             .filter((ssrc, index, array) => array.indexOf(ssrc) === index)
@@ -804,11 +794,11 @@ const SDPUtil = {
      * Sets the given codecName as the preferred codec by moving it to the beginning
      * of the payload types list (modifies the given mline in place). All instances
      * of the codec are moved up.
-     * @param {IMLine} mLine the mline object from an sdp as parsed by transform.parse.
+     * @param {MediaDescription} mLine the mline object from an sdp as parsed by transform.parse.
      * @param {string} codecName the name of the preferred codec.
      * @param {boolean} sortPayloadTypes whether the payloadtypes need to be sorted for a given codec.
      */
-    preferCodec(mline: IMLine, codecName: string, sortPayloadTypes: boolean = false): void {
+    preferCodec(mline: MediaDescription, codecName: string, sortPayloadTypes: boolean = false): void {
         if (!mline || !codecName) {
             return;
         }
@@ -865,12 +855,12 @@ const SDPUtil = {
      * types are also stripped. If the resulting mline would have no codecs,
      * it's disabled.
      *
-     * @param {IMLine} mLine the mline object from an sdp as parsed by transform.parse.
+     * @param {MediaDescription} mLine the mline object from an sdp as parsed by transform.parse.
      * @param {string} codecName the name of the codec which will be stripped.
      * @param {boolean} highProfile determines if only the high profile codec needs to be stripped from the sdp for a
      * given codec type.
      */
-    stripCodec(mLine: IMLine, codecName: string, highProfile: boolean = false): void {
+    stripCodec(mLine: MediaDescription, codecName: string, highProfile: boolean = false): void {
         if (!mLine || !codecName) {
             return;
         }
@@ -937,7 +927,7 @@ const SDPUtil = {
                 item => keepPts.indexOf(item.payload) !== -1);
             if (mLine.rtcpFb) {
                 mLine.rtcpFb = mLine.rtcpFb.filter(
-                    item => keepPts.indexOf(item.payload) !== -1);
+                    item => keepPts.indexOf(Number(item.payload)) !== -1);
             }
         }
     }