diff options
| author | Sebastian Jansson <srte@webrtc.org> | 2020-01-14 12:30:13 +0100 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-01-14 12:04:56 +0000 |
| commit | 3e66a498c390a73e01f18888f41c2434c038e1ae (patch) | |
| tree | 832f0d44a36aa1ce892e8e5a8a11abfc3d656186 /modules/congestion_controller | |
| parent | 2a92d2b4617323987cbb0344ae6748889c057f49 (diff) | |
| download | webrtc-3e66a498c390a73e01f18888f41c2434c038e1ae.tar.gz | |
Use RTX SSRCs in scenario test framework.
Using RTX SSRCs and payload type for retransmission of video. This
corresponds to the behavior when using the peer connection API.
Bug: webrtc:9883
Change-Id: Ic0e3964d097f42219ca225513a4bc771d70ccaa4
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/164460
Commit-Queue: Sebastian Jansson <srte@webrtc.org>
Reviewed-by: Erik Språng <sprang@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#30248}
Diffstat (limited to 'modules/congestion_controller')
| -rw-r--r-- | modules/congestion_controller/goog_cc/goog_cc_network_control_unittest.cc | 9 | ||||
| -rw-r--r-- | modules/congestion_controller/pcc/pcc_network_controller_unittest.cc | 4 |
2 files changed, 9 insertions, 4 deletions
diff --git a/modules/congestion_controller/goog_cc/goog_cc_network_control_unittest.cc b/modules/congestion_controller/goog_cc/goog_cc_network_control_unittest.cc index c6537aa5f8..0227027954 100644 --- a/modules/congestion_controller/goog_cc/goog_cc_network_control_unittest.cc +++ b/modules/congestion_controller/goog_cc/goog_cc_network_control_unittest.cc @@ -412,7 +412,7 @@ TEST_F(GoogCcNetworkControllerTest, LimitsToFloorIfRttIsHighInTrial) { // Wait to allow the high RTT to be detected and acted upon. s.RunFor(TimeDelta::seconds(4)); // By now the target rate should have dropped to the minimum configured rate. - EXPECT_NEAR(client->target_rate().kbps(), kBandwidthFloor.kbps(), 1); + EXPECT_NEAR(client->target_rate().kbps(), kBandwidthFloor.kbps(), 5); } TEST_F(GoogCcNetworkControllerTest, UpdatesTargetRateBasedOnLinkCapacity) { @@ -502,7 +502,10 @@ DataRate AverageBitrateAfterCrossInducedLoss(std::string name) { auto* client = s.CreateClient("send", CallClientConfig()); auto* route = s.CreateRoutes( client, send_net, s.CreateClient("return", CallClientConfig()), ret_net); - auto* video = s.CreateVideoStream(route->forward(), VideoStreamConfig()); + // TODO(srte): Make this work with RTX enabled or remove it. + auto* video = s.CreateVideoStream(route->forward(), [](VideoStreamConfig* c) { + c->stream.use_rtx = false; + }); s.RunFor(TimeDelta::seconds(10)); for (int i = 0; i < 4; ++i) { // Sends TCP cross traffic inducing loss. @@ -521,7 +524,7 @@ DataRate AverageBitrateAfterCrossInducedLoss(std::string name) { TEST_F(GoogCcNetworkControllerTest, NoLossBasedRecoversSlowerAfterCrossInducedLoss) { - // This test acts as a reference for the test below, showing that wihtout the + // This test acts as a reference for the test below, showing that without the // trial, we have worse behavior. DataRate average_bitrate = AverageBitrateAfterCrossInducedLoss("googcc_unit/no_cross_loss_based"); diff --git a/modules/congestion_controller/pcc/pcc_network_controller_unittest.cc b/modules/congestion_controller/pcc/pcc_network_controller_unittest.cc index 54c98302c0..2383378ccc 100644 --- a/modules/congestion_controller/pcc/pcc_network_controller_unittest.cc +++ b/modules/congestion_controller/pcc/pcc_network_controller_unittest.cc @@ -91,7 +91,9 @@ TEST(PccNetworkControllerTest, UpdatesTargetSendRate) { auto* route = s.CreateRoutes(client, {send_net->node()}, s.CreateClient("return", CallClientConfig()), {ret_net->node()}); - s.CreateVideoStream(route->forward(), VideoStreamConfig()); + VideoStreamConfig video; + video.stream.use_rtx = false; + s.CreateVideoStream(route->forward(), video); s.RunFor(TimeDelta::seconds(30)); EXPECT_NEAR(client->target_rate().kbps(), 450, 100); send_net->UpdateConfig([](NetworkSimulationConfig* c) { |