[RTC-32] Fetch actual bitrate of a variant

src/membraneWebRTC.ts

@@ -636,6 +636,8 @@ export class MembraneWebRTC {
     simulcastConfig: SimulcastConfig = { enabled: false, active_encodings: [] },
     maxBandwidth: TrackBandwidthLimit = 0 // unlimited bandwidth
   ): string {
+    if (!simulcastConfig.enabled && !(typeof maxBandwidth === "number"))
+      throw "Invalid type of `maxBandwidth` argument for a non-simulcast track, expected: number";
     if (this.getPeerId() === "")
       throw "Cannot add tracks before being accepted by the server";
     const trackId = this.getTrackId(uuidv4());
@@ -882,6 +884,7 @@ export class MembraneWebRTC {
     trackId: string,
     bandwidth: BandwidthLimit
   ): Promise<boolean> {
+    // FIXME: maxBandwidth in TrackContext is not updated
     const trackContext = this.localTrackIdToTrack.get(trackId);
 
     if (!trackContext) {
@@ -894,6 +897,7 @@ export class MembraneWebRTC {
     if (parameters.encodings.length === 0) {
       parameters.encodings = [{}];
     } else {
+      // TODO: sent MediaEvent with updated variant bitrates
       this.applyBandwidthLimitation(parameters.encodings, bandwidth);
     }
 
@@ -934,6 +938,14 @@ export class MembraneWebRTC {
       delete encoding.maxBitrate;
     } else {
       encoding.maxBitrate = bandwidth * 1024;
+      let mediaEvent = generateCustomEvent({
+        type: "setTrackVariantBitrates",
+        data: {
+          trackId: trackId,
+          variantBitrates: { [rid]: bandwidth },
+        },
+      });
+      this.sendMediaEvent(mediaEvent);
     }
 
     return sender
@@ -1150,23 +1162,6 @@ export class MembraneWebRTC {
     this.sendMediaEvent(mediaEvent);
   };
 
-  private getMidToTrackId = () => {
-    const localTrackMidToTrackId = {} as any;
-
-    if (!this.connection) return null;
-    this.connection.getTransceivers().forEach((transceiver) => {
-      const localTrackId = transceiver.sender.track?.id;
-      const mid = transceiver.mid;
-      if (localTrackId && mid) {
-        const trackContext = Array.from(this.localTrackIdToTrack.values()).find(
-          (trackContext) => trackContext!.track!!.id === localTrackId
-        )!;
-        localTrackMidToTrackId[mid] = trackContext.trackId;
-      }
-    });
-    return localTrackMidToTrackId;
-  };
-
   /**
    * Leaves the room. This function should be called when user leaves the room
    * in a clean way e.g. by clicking a dedicated, custom button `disconnect`.
@@ -1252,8 +1247,7 @@ export class MembraneWebRTC {
         type: "sdpOffer",
         data: {
           sdpOffer: offer,
-          trackIdToTrackMetadata: this.getTrackIdToMetadata(),
-          midToTrackId: this.getMidToTrackId(),
+          trackIdToTrackInfo: this.getTrackIdToTrackInfo(),
         },
       });
       this.sendMediaEvent(mediaEvent);
@@ -1262,14 +1256,42 @@ export class MembraneWebRTC {
     }
   }
 
-  private getTrackIdToMetadata = () => {
-    const trackIdToMetadata = {} as any;
+  private getTrackIdToTrackInfo = () => {
+    const trackIdToMid = this.getTrackIdToMid();
+
+    const tracksInfo = {} as any;
     Array.from(this.localPeer.trackIdToMetadata.entries()).forEach(
       ([trackId, metadata]) => {
-        trackIdToMetadata[trackId] = metadata;
+        const maxBandwidth =
+          this.localTrackIdToTrack.get(trackId)!.maxBandwidth;
+        tracksInfo[trackId] = {
+          trackMetadata: metadata,
+          maxBandwidth:
+            maxBandwidth instanceof Map
+              ? Object.fromEntries(maxBandwidth)
+              : maxBandwidth,
+          mid: trackIdToMid ? trackIdToMid.get(trackId!) : null,
+        };
       }
     );
-    return trackIdToMetadata;
+    return tracksInfo;
+  };
+
+  private getTrackIdToMid = () => {
+    const localTrackMidToTrackId = new Map<string, string>();
+
+    if (!this.connection) return null;
+    this.connection.getTransceivers().forEach((transceiver) => {
+      const localTrackId = transceiver.sender.track?.id;
+      const mid = transceiver.mid;
+      if (localTrackId && mid) {
+        const trackContext = Array.from(this.localTrackIdToTrack.values()).find(
+          (trackContext) => trackContext!.track!!.id === localTrackId
+        )!;
+        localTrackMidToTrackId.set(trackContext.trackId, mid);
+      }
+    });
+    return localTrackMidToTrackId;
   };
 
   private checkIfTrackBelongToPeer = (trackId: string, peer: Peer) =>

tsconfig.json

@@ -9,7 +9,8 @@
     "moduleResolution": "node",
     "outDir": "dist/",
     "strict": true,
-    "target": "es2018"
+    "target": "es2018",
+    "lib": ["dom", "es6", "es2019"]
   },
   "include": ["src/**/*"]
 }