Fix update bandwidth estimation configuration and available bitrate w…

…hen updating max outgoing bitrate (#779)
versatica · Mar 1, 2022 · 7417beb · 7417beb
1 parent 9a19b3f
commit 7417beb
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/worker/include/RTC/TransportCongestionControlClient.hpp b/worker/include/RTC/TransportCongestionControlClient.hpp
@@ -83,6 +83,7 @@ namespace RTC
 	private:
 		void MayEmitAvailableBitrateEvent(uint32_t previousAvailableBitrate);
 		void UpdatePacketLoss(double packetLoss);
+		void ApplyBitrateUpdates();
 
 		void InitializeController();
 		void DestroyController();

diff --git a/worker/src/RTC/TransportCongestionControlClient.cpp b/worker/src/RTC/TransportCongestionControlClient.cpp
@@ -269,6 +269,14 @@ namespace RTC
 			MS_THROW_ERROR("maxOutgoingBitrate must be >= 30000bps");
 
 		this->maxOutgoingBitrate = maxBitrate;
+
+		ApplyBitrateUpdates();
+
+		if (this->maxOutgoingBitrate > 0u)
+		{
+			this->bitrates.availableBitrate =
+			  std::min<uint32_t>(this->maxOutgoingBitrate, this->bitrates.availableBitrate);
+		}
 	}
 
 	void TransportCongestionControlClient::SetDesiredBitrate(uint32_t desiredBitrate, bool force)
@@ -290,6 +298,11 @@ namespace RTC
 		// more stable values.
 		this->bitrates.startBitrate = std::max<uint32_t>(MinBitrate, this->bitrates.availableBitrate);
 
+		ApplyBitrateUpdates();
+	}
+
+	void TransportCongestionControlClient::ApplyBitrateUpdates()
+	{
 		auto currentMaxBitrate = this->bitrates.maxBitrate;
 		uint32_t newMaxBitrate = 0;