feat: Add videoType to sources signaled in jingle. (#2058)

* feat: Add videoType to sources signaled in jingle.

modules/RTC/MockClasses.js

@@ -84,6 +84,13 @@ export class MockPeerConnection {
     usesUnifiedPlan() {
         return this._usesUnifiedPlan;
     }
+
+    /**
+     * {@link TraceablePeerConnection.getLocalVideoTracks}.
+     */
+    getLocalVideoTracks() {
+        return [];
+    }
 }
 
 /**

modules/RTC/TraceablePeerConnection.js

@@ -661,7 +661,7 @@ TraceablePeerConnection.prototype.getLocalTracks = function(mediaType) {
 /**
  * Retrieves the local video tracks.
  *
- * @returns {JitsiLocalTrack|undefined} - local video tracks.
+ * @returns {Array<JitsiLocalTrack>} - local video tracks.
  */
 TraceablePeerConnection.prototype.getLocalVideoTracks = function() {
     return this.getLocalTracks(MediaType.VIDEO);

modules/sdp/LocalSdpMunger.js

@@ -399,14 +399,30 @@ export default class LocalSdpMunger {
                 trackIndex = streamId.split('-')[2];
             }
 
+            const sourceName = getSourceNameForJitsiTrack(this.localEndpointId, mediaType, trackIndex);
+
             if (!nameExists) {
                 // Inject source names as a=ssrc:3124985624 name:endpointA-v0
                 mediaSection.ssrcs.push({
                     id: source,
                     attribute: 'name',
-                    value: getSourceNameForJitsiTrack(this.localEndpointId, mediaType, trackIndex)
+                    value: sourceName
                 });
             }
+
+            if (mediaType === MediaType.VIDEO) {
+                const videoType = this.tpc.getLocalVideoTracks().find(track => track.getSourceName() === sourceName)
+                    ?.getVideoType();
+
+                if (videoType) {
+                    // Inject videoType as a=ssrc:1234 videoType:desktop.
+                    mediaSection.ssrcs.push({
+                        id: source,
+                        attribute: 'videoType',
+                        value: videoType
+                    });
+                }
+            }
         }
     }
 }

modules/sdp/SDP.js

@@ -242,10 +242,12 @@ SDP.prototype.toJingle = function(elem, thecreator) {
 
                 for (const [ availableSsrc, ssrcParameters ] of ssrcMap) {
                     const sourceName = SDPUtil.parseSourceNameLine(ssrcParameters);
+                    const videoType = SDPUtil.parseVideoTypeLine(ssrcParameters);
 
                     elem.c('source', {
                         ssrc: availableSsrc,
                         name: FeatureFlags.isSourceNameSignalingEnabled() ? sourceName : undefined,
+                        videoType,
                         xmlns: 'urn:xmpp:jingle:apps:rtp:ssma:0'
                     });
 

modules/sdp/SDPDiffer.js

@@ -171,10 +171,12 @@ SDPDiffer.prototype.toJingle = function(modify) {
             const mediaSsrc = media.ssrcs[ssrcNum];
             const ssrcLines = mediaSsrc.lines;
             const sourceName = SDPUtil.parseSourceNameLine(ssrcLines);
+            const videoType = SDPUtil.parseVideoTypeLine(ssrcLines);
 
             modify.c('source', { xmlns: 'urn:xmpp:jingle:apps:rtp:ssma:0' });
             modify.attrs({
                 name: FeatureFlags.isSourceNameSignalingEnabled() ? sourceName : undefined,
+                videoType,
                 ssrc: mediaSsrc.ssrc
             });
 

modules/sdp/SDPUtil.js

@@ -295,6 +295,20 @@ const SDPUtil = {
         // Everything past the "name:" part
         return sourceNameLine?.substring(sourceNameLine.indexOf(' name:') + 6);
     },
+
+    /**
+     * Parse the "videoType" attribute encoded in a set of SSRC attributes (e.g.
+     * "a=ssrc:1234 videoType:desktop")
+     *
+     * @param {string[]} ssrcLines
+     * @returns {string | undefined}
+     */
+    parseVideoTypeLine(ssrcLines) {
+        const s = ' videoType:';
+        const videoTypeLine = ssrcLines.find(ssrcSdpLine => ssrcSdpLine.indexOf(s) > 0);
+
+        return videoTypeLine?.substring(videoTypeLine.indexOf(s) + s.length);
+    },
     parseRTCPFB(line) {
         const parts = line.substr(10).split(' ');
         const data = {};

types/auto/modules/RTC/MockClasses.d.ts

@@ -53,6 +53,10 @@ export class MockPeerConnection {
      * {@link TraceablePeerConnection.usesUnifiedPlan}.
      */
     usesUnifiedPlan(): boolean;
+    /**
+     * {@link TraceablePeerConnection.getLocalVideoTracks}.
+     */
+    getLocalVideoTracks(): any[];
 }
 /**
  * Mock {@link RTC} - add things as needed, but only things useful for all tests.

types/auto/modules/RTC/TraceablePeerConnection.d.ts

@@ -331,9 +331,9 @@ export default class TraceablePeerConnection {
     /**
      * Retrieves the local video tracks.
      *
-     * @returns {JitsiLocalTrack|undefined} - local video tracks.
+     * @returns {Array<JitsiLocalTrack>} - local video tracks.
      */
-    getLocalVideoTracks(): any | undefined;
+    getLocalVideoTracks(): Array<any>;
     /**
      * Checks whether or not this {@link TraceablePeerConnection} instance contains any local tracks for given
      * <tt>mediaType</tt>.

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

@@ -152,6 +152,22 @@ declare namespace SDPUtil {
      * @returns {string | undefined}
      */
     function parseSourceNameLine(ssrcLines: string[]): string;
+    /**
+     * Parse the "videoType" attribute encoded in a set of SSRC attributes (e.g.
+     * "a=ssrc:1234 videoType:desktop")
+     *
+     * @param {string[]} ssrcLines
+     * @returns {string | undefined}
+     */
+    function parseVideoTypeLine(ssrcLines: string[]): string;
+    /**
+     * Parse the "videoType" attribute encoded in a set of SSRC attributes (e.g.
+     * "a=ssrc:1234 videoType:desktop")
+     *
+     * @param {string[]} ssrcLines
+     * @returns {string | undefined}
+     */
+    function parseVideoTypeLine(ssrcLines: string[]): string;
     function parseRTCPFB(line: any): {
         pt: any;
         type: any;