feat: SourceVideoTypeMessage message

Sends the source name to video type mapping to the jvb
in a new bridge channel message.

JitsiConference.js

@@ -55,6 +55,7 @@ import {
 import BridgeVideoType from './service/RTC/BridgeVideoType';
 import CodecMimeType from './service/RTC/CodecMimeType';
 import * as MediaType from './service/RTC/MediaType';
+import RTCEvents from './service/RTC/RTCEvents';
 import { getSourceNameForJitsiTrack } from './service/RTC/SignalingLayer';
 import VideoType from './service/RTC/VideoType';
 import {
@@ -400,6 +401,9 @@ JitsiConference.prototype._init = function(options = {}) {
     if (!this.rtc) {
         this.rtc = new RTC(this, options);
         this.eventManager.setupRTCListeners();
+        if (FeatureFlags.isSourceNameSignalingEnabled()) {
+            this._registerRtcListeners(this.rtc);
+        }
     }
 
     this.receiveVideoController = new ReceiveVideoController(this, this.rtc);
@@ -718,6 +722,20 @@ JitsiConference.prototype._getMediaSessions = function() {
     return sessions;
 };
 
+/**
+ * Registers event listeners on the RTC instance.
+ * @param {RTC} rtc - the RTC module instance used by this conference.
+ * @private
+ * @returns {void}
+ */
+JitsiConference.prototype._registerRtcListeners = function(rtc) {
+    rtc.addListener(RTCEvents.DATA_CHANNEL_OPEN, () => {
+        for (const localTrack of this.rtc.localTracks) {
+            localTrack.isVideoTrack() && this._sendBridgeVideoTypeMessage(localTrack);
+        }
+    });
+};
+
 /**
  * Sends the 'VideoTypeMessage' to the bridge on the bridge channel so that the bridge can make bitrate allocation
  * decisions based on the video type of the local source.
@@ -733,7 +751,14 @@ JitsiConference.prototype._sendBridgeVideoTypeMessage = function(localtrack) {
         videoType = BridgeVideoType.DESKTOP_HIGH_FPS;
     }
 
-    this.rtc.setVideoType(videoType);
+    if (FeatureFlags.isSourceNameSignalingEnabled()) {
+        this.rtc.sendSourceVideoType(
+            getSourceNameForJitsiTrack(this.myUserId(), MediaType.VIDEO, 0),
+            videoType
+        );
+    } else {
+        this.rtc.setVideoType(videoType);
+    }
 };
 
 /**

modules/RTC/BridgeChannel.js

@@ -263,6 +263,7 @@ export default class BridgeChannel {
      * Sends a 'VideoTypeMessage' message via the bridge channel.
      *
      * @param {string} videoType 'camera', 'desktop' or 'none'.
+     * @deprecated to be replaced with sendSourceVideoTypeMessage
      */
     sendVideoTypeMessage(videoType) {
         logger.debug(`Sending VideoTypeMessage with video type as ${videoType}`);
@@ -272,6 +273,22 @@ export default class BridgeChannel {
         });
     }
 
+    /**
+     * Sends a 'VideoTypeMessage' message via the bridge channel.
+     *
+     * @param {BridgeVideoType} videoType - the video type.
+     * @param {SourceName} sourceName - the source name of the video track.
+     * @returns {void}
+     */
+    sendSourceVideoTypeMessage(sourceName, videoType) {
+        logger.info(`Sending SourceVideoTypeMessage with video type ${sourceName}: ${videoType}`);
+        this._send({
+            colibriClass: 'SourceVideoTypeMessage',
+            sourceName,
+            videoType
+        });
+    }
+
     /**
      * Set events on the given RTCDataChannel or WebSocket instance.
      */

modules/RTC/RTC.js

@@ -5,6 +5,7 @@ import BridgeVideoType from '../../service/RTC/BridgeVideoType';
 import * as MediaType from '../../service/RTC/MediaType';
 import RTCEvents from '../../service/RTC/RTCEvents';
 import browser from '../browser';
+import FeatureFlags from '../flags/FeatureFlags';
 import Statistics from '../statistics/statistics';
 import GlobalOnErrorHandler from '../util/GlobalOnErrorHandler';
 import Listenable from '../util/Listenable';
@@ -149,7 +150,12 @@ export default class RTC extends Listenable {
         this._updateAudioOutputForAudioTracks
             = this._updateAudioOutputForAudioTracks.bind(this);
 
-        // The default video type assumed by the bridge.
+        /**
+         * The default video type assumed by the bridge.
+         * @deprecated this will go away with multiple streams support
+         * @type {BridgeVideoType}
+         * @private
+         */
         this._videoType = BridgeVideoType.NONE;
 
         // Switch audio output device on all remote audio tracks. Local audio
@@ -256,10 +262,12 @@ export default class RTC extends Listenable {
                     logError(error, 'LastNChangedEvent', this._lastN);
                 }
             }
-            try {
-                this._channel.sendVideoTypeMessage(this._videoType);
-            } catch (error) {
-                logError(error, 'VideoTypeMessage', this._videoType);
+            if (!FeatureFlags.isSourceNameSignalingEnabled()) {
+                try {
+                    this._channel.sendVideoTypeMessage(this._videoType);
+                } catch (error) {
+                    logError(error, 'VideoTypeMessage', this._videoType);
+                }
             }
 
             this.removeListener(RTCEvents.DATA_CHANNEL_OPEN, this._channelOpenListener);
@@ -384,6 +392,17 @@ export default class RTC extends Listenable {
         }
     }
 
+    /**
+     * Sends the track's  video type to the JVB.
+     * @param {SourceName} sourceName - the track's source name.
+     * @param {BridgeVideoType} videoType - the track's video type.
+     */
+    sendSourceVideoType(sourceName, videoType) {
+        if (this._channel && this._channel.isOpen()) {
+            this._channel.sendSourceVideoTypeMessage(sourceName, videoType);
+        }
+    }
+
     /**
      * Elects the participants with the given ids to be the selected
      * participants in order to always receive video for this participant (even