OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
9 */ | 9 */ |
10 | 10 |
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
167 // 64 seconds later. This will cause a zero difference in abs send times due | 167 // 64 seconds later. This will cause a zero difference in abs send times due |
168 // to the wrap, but a big difference in arrival time, if streams aren't | 168 // to the wrap, but a big difference in arrival time, if streams aren't |
169 // properly timed out. | 169 // properly timed out. |
170 TestWrappingHelper(10 * 64); | 170 TestWrappingHelper(10 * 64); |
171 } | 171 } |
172 | 172 |
173 class DelayBasedBweExperimentTest : public DelayBasedBweTest { | 173 class DelayBasedBweExperimentTest : public DelayBasedBweTest { |
174 public: | 174 public: |
175 DelayBasedBweExperimentTest() | 175 DelayBasedBweExperimentTest() |
176 : override_field_trials_("WebRTC-ImprovedBitrateEstimate/Enabled/") { | 176 : override_field_trials_("WebRTC-ImprovedBitrateEstimate/Enabled/") { |
177 bitrate_estimator_.reset(new DelayBasedBwe(&clock_)); | 177 bitrate_estimator_.reset(new DelayBasedBwe(nullptr, &clock_)); |
178 } | 178 } |
179 | 179 |
180 private: | 180 private: |
181 test::ScopedFieldTrials override_field_trials_; | 181 test::ScopedFieldTrials override_field_trials_; |
182 }; | 182 }; |
183 | 183 |
184 TEST_F(DelayBasedBweExperimentTest, RateIncreaseRtpTimestamps) { | 184 TEST_F(DelayBasedBweExperimentTest, RateIncreaseRtpTimestamps) { |
185 RateIncreaseRtpTimestampsTestHelper(1288); | 185 RateIncreaseRtpTimestampsTestHelper(1288); |
186 } | 186 } |
187 | 187 |
(...skipping 10 matching lines...) Expand all Loading... |
198 } | 198 } |
199 | 199 |
200 TEST_F(DelayBasedBweExperimentTest, CapacityDropOneStreamWrap) { | 200 TEST_F(DelayBasedBweExperimentTest, CapacityDropOneStreamWrap) { |
201 CapacityDropTestHelper(1, true, 333, 0); | 201 CapacityDropTestHelper(1, true, 333, 0); |
202 } | 202 } |
203 | 203 |
204 class DelayBasedBweTrendlineExperimentTest : public DelayBasedBweTest { | 204 class DelayBasedBweTrendlineExperimentTest : public DelayBasedBweTest { |
205 public: | 205 public: |
206 DelayBasedBweTrendlineExperimentTest() | 206 DelayBasedBweTrendlineExperimentTest() |
207 : override_field_trials_("WebRTC-BweTrendlineFilter/Enabled-15,0.9,4/") { | 207 : override_field_trials_("WebRTC-BweTrendlineFilter/Enabled-15,0.9,4/") { |
208 bitrate_estimator_.reset(new DelayBasedBwe(&clock_)); | 208 bitrate_estimator_.reset(new DelayBasedBwe(nullptr, &clock_)); |
209 } | 209 } |
210 | 210 |
211 private: | 211 private: |
212 test::ScopedFieldTrials override_field_trials_; | 212 test::ScopedFieldTrials override_field_trials_; |
213 }; | 213 }; |
214 | 214 |
215 TEST_F(DelayBasedBweTrendlineExperimentTest, RateIncreaseRtpTimestamps) { | 215 TEST_F(DelayBasedBweTrendlineExperimentTest, RateIncreaseRtpTimestamps) { |
216 RateIncreaseRtpTimestampsTestHelper(1240); | 216 RateIncreaseRtpTimestampsTestHelper(1240); |
217 } | 217 } |
218 | 218 |
(...skipping 10 matching lines...) Expand all Loading... |
229 } | 229 } |
230 | 230 |
231 TEST_F(DelayBasedBweTrendlineExperimentTest, CapacityDropOneStreamWrap) { | 231 TEST_F(DelayBasedBweTrendlineExperimentTest, CapacityDropOneStreamWrap) { |
232 CapacityDropTestHelper(1, true, 600, 0); | 232 CapacityDropTestHelper(1, true, 600, 0); |
233 } | 233 } |
234 | 234 |
235 class DelayBasedBweMedianSlopeExperimentTest : public DelayBasedBweTest { | 235 class DelayBasedBweMedianSlopeExperimentTest : public DelayBasedBweTest { |
236 public: | 236 public: |
237 DelayBasedBweMedianSlopeExperimentTest() | 237 DelayBasedBweMedianSlopeExperimentTest() |
238 : override_field_trials_("WebRTC-BweMedianSlopeFilter/Enabled-20,4/") { | 238 : override_field_trials_("WebRTC-BweMedianSlopeFilter/Enabled-20,4/") { |
239 bitrate_estimator_.reset(new DelayBasedBwe(&clock_)); | 239 bitrate_estimator_.reset(new DelayBasedBwe(nullptr, &clock_)); |
240 } | 240 } |
241 | 241 |
242 private: | 242 private: |
243 test::ScopedFieldTrials override_field_trials_; | 243 test::ScopedFieldTrials override_field_trials_; |
244 }; | 244 }; |
245 | 245 |
246 TEST_F(DelayBasedBweMedianSlopeExperimentTest, RateIncreaseRtpTimestamps) { | 246 TEST_F(DelayBasedBweMedianSlopeExperimentTest, RateIncreaseRtpTimestamps) { |
247 RateIncreaseRtpTimestampsTestHelper(1240); | 247 RateIncreaseRtpTimestampsTestHelper(1240); |
248 } | 248 } |
249 | 249 |
250 TEST_F(DelayBasedBweMedianSlopeExperimentTest, CapacityDropOneStream) { | 250 TEST_F(DelayBasedBweMedianSlopeExperimentTest, CapacityDropOneStream) { |
251 CapacityDropTestHelper(1, false, 600, 0); | 251 CapacityDropTestHelper(1, false, 600, 0); |
252 } | 252 } |
253 | 253 |
254 TEST_F(DelayBasedBweMedianSlopeExperimentTest, CapacityDropPosOffsetChange) { | 254 TEST_F(DelayBasedBweMedianSlopeExperimentTest, CapacityDropPosOffsetChange) { |
255 CapacityDropTestHelper(1, false, 600, 30000); | 255 CapacityDropTestHelper(1, false, 600, 30000); |
256 } | 256 } |
257 | 257 |
258 TEST_F(DelayBasedBweMedianSlopeExperimentTest, CapacityDropNegOffsetChange) { | 258 TEST_F(DelayBasedBweMedianSlopeExperimentTest, CapacityDropNegOffsetChange) { |
259 CapacityDropTestHelper(1, false, 1267, -30000); | 259 CapacityDropTestHelper(1, false, 1267, -30000); |
260 } | 260 } |
261 | 261 |
262 TEST_F(DelayBasedBweMedianSlopeExperimentTest, CapacityDropOneStreamWrap) { | 262 TEST_F(DelayBasedBweMedianSlopeExperimentTest, CapacityDropOneStreamWrap) { |
263 CapacityDropTestHelper(1, true, 600, 0); | 263 CapacityDropTestHelper(1, true, 600, 0); |
264 } | 264 } |
265 | 265 |
266 } // namespace webrtc | 266 } // namespace webrtc |
OLD | NEW |