Scream, ensure feedback contains at least one received packet Bug: webrtc:447037083 Change-Id: I62b414c2b4331d81b243584c9a7d367d771e550e Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/461080 Commit-Queue: Per Kjellander <perkj@webrtc.org> Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> Cr-Commit-Position: refs/heads/main@{#47296}
diff --git a/modules/congestion_controller/scream/scream_network_controller_unittest.cc b/modules/congestion_controller/scream/scream_network_controller_unittest.cc index 6331b8d..c5046b3 100644 --- a/modules/congestion_controller/scream/scream_network_controller_unittest.cc +++ b/modules/congestion_controller/scream/scream_network_controller_unittest.cc
@@ -14,6 +14,7 @@ #include "api/transport/network_control.h" #include "api/transport/network_types.h" #include "api/units/data_rate.h" +#include "api/units/data_size.h" #include "api/units/time_delta.h" #include "api/units/timestamp.h" #include "modules/congestion_controller/scream/test/cc_feedback_generator.h" @@ -573,5 +574,29 @@ EXPECT_LT(update.target_rate->target_rate, DataRate::KilobitsPerSec(3300)); } +TEST(ScreamControllerTest, IgnoreFeedbackWithoutReceivedPackets) { + SimulatedClock clock(Timestamp::Seconds(1'234)); + Environment env = CreateTestEnvironment({.time = &clock}); + NetworkControllerConfig config(env); + config.constraints.starting_rate = DataRate::KilobitsPerSec(300); + ScreamNetworkController scream_controller(config); + + TransportPacketsFeedback msg; + msg.feedback_time = clock.CurrentTime(); + PacketResult result; + result.sent_packet.send_time = clock.CurrentTime(); + result.sent_packet.sequence_number = 1; + result.sent_packet.size = DataSize::Bytes(1000); + ASSERT_FALSE(result.IsReceived()); + msg.packet_feedbacks.push_back(result); + + NetworkControlUpdate update = + scream_controller.OnTransportPacketsFeedback(msg); + // Scream should not change the target rate if there are no received packets. + // Since this is the first feedback, the target rate should be the starting + // rate. + EXPECT_EQ(update.target_rate->target_rate, DataRate::KilobitsPerSec(300)); +} + } // namespace } // namespace webrtc
diff --git a/modules/congestion_controller/scream/scream_v2.cc b/modules/congestion_controller/scream/scream_v2.cc index ea45876..786ee7e 100644 --- a/modules/congestion_controller/scream/scream_v2.cc +++ b/modules/congestion_controller/scream/scream_v2.cc
@@ -87,6 +87,10 @@ } void ScreamV2::OnTransportPacketsFeedback(const TransportPacketsFeedback& msg) { + if (msg.ReceivedWithSendInfo().empty()) { + RTC_LOG(LS_INFO) << "No received packets in feedback, ignoring."; + return; + } max_data_in_flight_this_rtt_ = std::max(max_data_in_flight_this_rtt_, msg.data_in_flight);