From 35836936384db7330f1d45500b7e26777c3eb1f4 Mon Sep 17 00:00:00 2001 From: Rasmus Brandt Date: Tue, 23 Oct 2018 09:17:24 +0200 Subject: [PATCH] 3 TLs: add full stack test for short pattern + base heavy alloc. A previous CL split an existing field trial in two. This CL ensures that we have perf coverage for the two interesting cases: short pattern and short pattern + base heavy TL alloc. Tested: autoninja -C out/Release; and out/Release/webrtc_perf_tests --gtest_filter="*3TL*" Bug: chromium:893500 Change-Id: I0585d67860d8a10122793fa1336440c13ebd0c57 Reviewed-on: https://webrtc-review.googlesource.com/c/107561 Reviewed-by: Ilya Nikolaevskiy Commit-Queue: Rasmus Brandt Cr-Commit-Position: refs/heads/master@{#25304} --- video/full_stack_tests.cc | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/video/full_stack_tests.cc b/video/full_stack_tests.cc index 6562173e87..347fbd1412 100644 --- a/video/full_stack_tests.cc +++ b/video/full_stack_tests.cc @@ -598,12 +598,35 @@ TEST(FullStackTest, ConferenceMotionHd3TLModerateLimitsAltTLPattern) { AppendFieldTrials("WebRTC-UseShortVP8TL3Pattern/Enabled/")); ParamsWithLogging conf_motion_hd; conf_motion_hd.call.send_side_bwe = true; + conf_motion_hd.video[0] = { + true, 1280, 720, 50, + 30000, 3000000, 3000000, false, + "VP8", 3, -1, 0, + false, false, false, "ConferenceMotion_1280_720_50"}; + conf_motion_hd.analyzer = {"conference_motion_hd_3tl_alt_moderate_limits", + 0.0, 0.0, kFullStackTestDurationSecs}; + conf_motion_hd.config->queue_length_packets = 50; + conf_motion_hd.config->loss_percent = 3; + conf_motion_hd.config->queue_delay_ms = 100; + conf_motion_hd.config->link_capacity_kbps = 2000; + fixture->RunWithAnalyzer(conf_motion_hd); +} + +TEST(FullStackTest, + ConferenceMotionHd3TLModerateLimitsAltTLPatternAndBaseHeavyTLAllocation) { + auto fixture = CreateVideoQualityTestFixture(); + test::ScopedFieldTrials field_trial( + AppendFieldTrials("WebRTC-UseShortVP8TL3Pattern/Enabled/" + "WebRTC-UseBaseHeavyVP8TL3RateAllocation/Enabled/")); + ParamsWithLogging conf_motion_hd; + conf_motion_hd.call.send_side_bwe = true; conf_motion_hd.video[0] = { true, 1280, 720, 50, 30000, 3000000, 3000000, false, "VP8", 3, -1, 0, false, false, false, "ConferenceMotion_1280_720_50"}; - conf_motion_hd.analyzer = {"conference_motion_hd_3tl_alt_moderate_limits", - 0.0, 0.0, kFullStackTestDurationSecs}; + conf_motion_hd.analyzer = { + "conference_motion_hd_3tl_alt_heavy_moderate_limits", 0.0, 0.0, + kFullStackTestDurationSecs}; conf_motion_hd.config->queue_length_packets = 50; conf_motion_hd.config->loss_percent = 3; conf_motion_hd.config->queue_delay_ms = 100;