Index: webrtc/modules/congestion_controller/delay_based_bwe_unittest.cc |
diff --git a/webrtc/modules/congestion_controller/delay_based_bwe_unittest.cc b/webrtc/modules/congestion_controller/delay_based_bwe_unittest.cc |
index e751013a5db8e2cc76b6df8683eae876fffe0759..287746980a9979c72920be0149cbedb007bfb156 100644 |
--- a/webrtc/modules/congestion_controller/delay_based_bwe_unittest.cc |
+++ b/webrtc/modules/congestion_controller/delay_based_bwe_unittest.cc |
@@ -14,6 +14,7 @@ |
#include "webrtc/modules/congestion_controller/delay_based_bwe.h" |
#include "webrtc/modules/congestion_controller/delay_based_bwe_unittest_helper.h" |
#include "webrtc/system_wrappers/include/clock.h" |
+#include "webrtc/test/field_trial.h" |
namespace webrtc { |
@@ -143,26 +144,6 @@ TEST_F(DelayBasedBweTest, CapacityDropOneStreamWrap) { |
CapacityDropTestHelper(1, true, 633, 0); |
} |
-TEST_F(DelayBasedBweTest, CapacityDropTwoStreamsWrap) { |
- CapacityDropTestHelper(2, true, 767, 0); |
-} |
- |
-TEST_F(DelayBasedBweTest, CapacityDropThreeStreamsWrap) { |
- CapacityDropTestHelper(3, true, 633, 0); |
-} |
- |
-TEST_F(DelayBasedBweTest, CapacityDropThirteenStreamsWrap) { |
- CapacityDropTestHelper(13, true, 733, 0); |
-} |
- |
-TEST_F(DelayBasedBweTest, CapacityDropNineteenStreamsWrap) { |
- CapacityDropTestHelper(19, true, 667, 0); |
-} |
- |
-TEST_F(DelayBasedBweTest, CapacityDropThirtyStreamsWrap) { |
- CapacityDropTestHelper(30, true, 667, 0); |
-} |
- |
TEST_F(DelayBasedBweTest, TestTimestampGrouping) { |
TestTimestampGroupingTestHelper(); |
} |
@@ -181,4 +162,37 @@ TEST_F(DelayBasedBweTest, TestLongTimeoutAndWrap) { |
// properly timed out. |
TestWrappingHelper(10 * 64); |
} |
+ |
+class DelayBasedBweExperimentTest : public DelayBasedBweTest { |
+ public: |
+ DelayBasedBweExperimentTest() |
+ : override_field_trials_("WebRTC-ImprovedBitrateEstimate/Enabled/") {} |
+ |
+ protected: |
+ void SetUp() override { |
+ bitrate_estimator_.reset(new DelayBasedBwe(&clock_)); |
+ } |
+ |
+ test::ScopedFieldTrials override_field_trials_; |
+}; |
+ |
+TEST_F(DelayBasedBweExperimentTest, RateIncreaseRtpTimestamps) { |
+ RateIncreaseRtpTimestampsTestHelper(1288); |
+} |
+ |
+TEST_F(DelayBasedBweExperimentTest, CapacityDropOneStream) { |
+ CapacityDropTestHelper(1, false, 333, 0); |
+} |
+ |
+TEST_F(DelayBasedBweExperimentTest, CapacityDropPosOffsetChange) { |
+ CapacityDropTestHelper(1, false, 300, 30000); |
+} |
+ |
+TEST_F(DelayBasedBweExperimentTest, CapacityDropNegOffsetChange) { |
+ CapacityDropTestHelper(1, false, 300, -30000); |
+} |
+ |
+TEST_F(DelayBasedBweExperimentTest, CapacityDropOneStreamWrap) { |
+ CapacityDropTestHelper(1, true, 333, 0); |
+} |
} // namespace webrtc |