don't count existing streamID in bandwidth calculation

PADL · Feb 25, 2036 · 912116a · 912116a
1 parent 2137537
commit 912116a
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/Sources/MRP/Applications/MSRP/MSRPApplication.swift b/Sources/MRP/Applications/MSRP/MSRPApplication.swift
@@ -585,6 +585,7 @@ extension MSRPApplication {
   private func _checkAvailableBandwidth(
     participant: Participant<MSRPApplication>,
     portState: MSRPPortState<P>,
+    streamID: MSRPStreamID,
     dataFrameParameters: MSRPDataFrameParameters,
     tSpec: MSRPTSpec,
     priorityAndRank: MSRPPriorityAndRank
@@ -593,7 +594,7 @@ extension MSRPApplication {
 
     let port = participant.port
     let provisionalTalker = MSRPTalkerAdvertiseValue(
-      streamID: 0, // don't care about this
+      streamID: streamID,
       dataFrameParameters: dataFrameParameters,
       tSpec: tSpec,
       priorityAndRank: priorityAndRank,
@@ -603,7 +604,9 @@ extension MSRPApplication {
     let talkers = await participant.findAttributes(
       attributeType: MSRPAttributeType.talkerAdvertise.rawValue,
       matching: .matchAny
-    )
+    ).filter {
+      ($0.1 as! MSRPTalkerAdvertiseValue).streamID != streamID
+    }
     for talker in [provisionalTalker] + talkers.map({ $0.1 as! MSRPTalkerAdvertiseValue }) {
       guard let srClassID = portState
         .reverseMapSrClassPriority(priority: talker.priorityAndRank.dataFramePriority)
@@ -690,6 +693,7 @@ extension MSRPApplication {
       guard try await _checkAvailableBandwidth(
         participant: participant,
         portState: portState,
+        streamID: streamID,
         dataFrameParameters: dataFrameParameters,
         tSpec: tSpec,
         priorityAndRank: priorityAndRank