Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1937)

Unified Diff: webrtc/modules/congestion_controller/congestion_controller_unittest.cc

Issue 2753283002: Fix crash on multiple feedback messages are received on old transport. (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/modules/congestion_controller/congestion_controller_unittest.cc
diff --git a/webrtc/modules/congestion_controller/congestion_controller_unittest.cc b/webrtc/modules/congestion_controller/congestion_controller_unittest.cc
index 17d00c86e9c84ef49d238b799faeef0aa026201a..1a794f8b92e748b000ddbcd70d1f7bd7877e5891 100644
--- a/webrtc/modules/congestion_controller/congestion_controller_unittest.cc
+++ b/webrtc/modules/congestion_controller/congestion_controller_unittest.cc
@@ -235,6 +235,49 @@ TEST_F(CongestionControllerTest, OnNetworkRouteChanged) {
controller_->OnNetworkRouteChanged(route, -1, -1, -1);
}
+TEST_F(CongestionControllerTest, OldFeedback) {
+ int new_bitrate = 200000;
+ testing::Mock::VerifyAndClearExpectations(pacer_);
+ EXPECT_CALL(observer_, OnNetworkChanged(new_bitrate, _, _, _));
+ EXPECT_CALL(*pacer_, SetEstimatedBitrate(new_bitrate));
+
+ // Send a few packets on the first network route.
+ std::vector<PacketFeedback> packets;
+ packets.push_back(PacketFeedback(0, 0, 0, 1500, kPacingInfo0));
+ packets.push_back(PacketFeedback(10, 10, 1, 1500, kPacingInfo0));
+ packets.push_back(PacketFeedback(20, 20, 2, 1500, kPacingInfo0));
+ packets.push_back(PacketFeedback(30, 30, 3, 1500, kPacingInfo1));
+ packets.push_back(PacketFeedback(40, 40, 4, 1500, kPacingInfo1));
+
+ for (const PacketFeedback& packet : packets)
+ OnSentPacket(packet);
+
+ // Change route and then insert a number of feedback packets.
+ rtc::NetworkRoute route;
+ route.local_network_id = 1;
+ controller_->OnNetworkRouteChanged(route, new_bitrate, -1, -1);
+
+ for (const PacketFeedback& packet : packets) {
+ rtcp::TransportFeedback feedback;
+ feedback.SetBase(packet.sequence_number, packet.arrival_time_ms * 1000);
+
+ EXPECT_TRUE(feedback.AddReceivedPacket(packet.sequence_number,
+ packet.arrival_time_ms * 1000));
+ feedback.Build();
+ controller_->OnTransportFeedback(feedback);
+ }
+
+ // If the bitrate is reset to -1, the new starting bitrate will be
+ // the minimum default bitrate kMinBitrateBps.
+ EXPECT_CALL(
+ observer_,
+ OnNetworkChanged(congestion_controller::GetMinBitrateBps(), _, _, _));
+ EXPECT_CALL(*pacer_,
+ SetEstimatedBitrate(congestion_controller::GetMinBitrateBps()));
+ route.local_network_id = 2;
+ controller_->OnNetworkRouteChanged(route, -1, -1, -1);
+}
+
TEST_F(CongestionControllerTest,
SignalNetworkStateAndQueueIsFullAndEstimateChange) {
// Send queue is full
« no previous file with comments | « webrtc/modules/congestion_controller/congestion_controller.cc ('k') | webrtc/modules/congestion_controller/delay_based_bwe.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698