OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2013 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 330 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
341 filter.set_max_delay_ms(500); | 341 filter.set_max_delay_ms(500); |
342 RateCounterFilter counter2(&uplink_, 0, "receiver_input"); | 342 RateCounterFilter counter2(&uplink_, 0, "receiver_input"); |
343 PacketReceiver receiver(&uplink_, 0, GetParam(), false, false); | 343 PacketReceiver receiver(&uplink_, 0, GetParam(), false, false); |
344 ASSERT_TRUE(filter.Init(test::ResourcePath("google-wifi-3mbps", "rx"))); | 344 ASSERT_TRUE(filter.Init(test::ResourcePath("google-wifi-3mbps", "rx"))); |
345 RunFor(300 * 1000); | 345 RunFor(300 * 1000); |
346 PrintResults(filter.GetBitrateStats().GetMean(), counter2.GetBitrateStats(), | 346 PrintResults(filter.GetBitrateStats().GetMean(), counter2.GetBitrateStats(), |
347 0, receiver.GetDelayStats(), counter2.GetBitrateStats()); | 347 0, receiver.GetDelayStats(), counter2.GetBitrateStats()); |
348 } | 348 } |
349 | 349 |
350 TEST_P(BweFeedbackTest, PacedSelfFairness50msTest) { | 350 TEST_P(BweFeedbackTest, PacedSelfFairness50msTest) { |
351 RunFairnessTest(GetParam(), 4, 0, 300, 3000, 50); | 351 int64_t kRttMs = 100; |
352 int64_t kMaxJitterMs = 15; | |
353 const int64_t kOffsetMs[] = {0, 5000, 10000, 15000}; | |
stefan-webrtc
2015/07/21 12:12:32
Previously I think we had random offsets here. I s
magalhaesc
2015/07/21 14:46:53
Right, done.
| |
354 RunFairnessTest(GetParam(), 4, 0, 300, 3000, 50, kRttMs, kMaxJitterMs, | |
355 kOffsetMs); | |
352 } | 356 } |
353 | 357 |
354 TEST_P(BweFeedbackTest, PacedSelfFairness500msTest) { | 358 TEST_P(BweFeedbackTest, PacedSelfFairness500msTest) { |
355 RunFairnessTest(GetParam(), 4, 0, 300, 3000, 500); | 359 int64_t kRttMs = 100; |
360 int64_t kMaxJitterMs = 15; | |
361 const int64_t kOffsetMs[] = {0, 5000, 10000, 15000}; | |
362 RunFairnessTest(GetParam(), 4, 0, 300, 3000, 500, kRttMs, kMaxJitterMs, | |
363 kOffsetMs); | |
356 } | 364 } |
357 | 365 |
358 TEST_P(BweFeedbackTest, PacedSelfFairness1000msTest) { | 366 TEST_P(BweFeedbackTest, PacedSelfFairness1000msTest) { |
359 RunFairnessTest(GetParam(), 4, 0, 300, 3000, 1000); | 367 int64_t kRttMs = 100; |
368 int64_t kMaxJitterMs = 15; | |
369 const int64_t kOffsetMs[] = {0, 5000, 10000, 15000}; | |
370 RunFairnessTest(GetParam(), 4, 0, 300, 3000, 1000, kRttMs, kMaxJitterMs, | |
371 kOffsetMs); | |
360 } | 372 } |
361 | 373 |
362 TEST_P(BweFeedbackTest, TcpFairness50msTest) { | 374 TEST_P(BweFeedbackTest, TcpFairness50msTest) { |
363 RunFairnessTest(GetParam(), 1, 1, 300, 2000, 50); | 375 int64_t kRttMs = 100; |
376 int64_t kMaxJitterMs = 15; | |
377 const int64_t kOffsetMs[] = {0, 10000}; | |
378 RunFairnessTest(GetParam(), 1, 1, 300, 2000, 50, kRttMs, kMaxJitterMs, | |
379 kOffsetMs); | |
364 } | 380 } |
365 | 381 |
366 TEST_P(BweFeedbackTest, TcpFairness500msTest) { | 382 TEST_P(BweFeedbackTest, TcpFairness500msTest) { |
367 RunFairnessTest(GetParam(), 1, 1, 300, 2000, 500); | 383 int64_t kRttMs = 100; |
384 int64_t kMaxJitterMs = 15; | |
385 const int64_t kOffsetMs[] = {0, 10000}; | |
386 RunFairnessTest(GetParam(), 1, 1, 300, 2000, 500, kRttMs, kMaxJitterMs, | |
387 kOffsetMs); | |
368 } | 388 } |
369 | 389 |
370 TEST_P(BweFeedbackTest, TcpFairness1000msTest) { | 390 TEST_P(BweFeedbackTest, TcpFairness1000msTest) { |
371 RunFairnessTest(GetParam(), 1, 1, 300, 2000, 1000); | 391 int64_t kRttMs = 100; |
392 int64_t kMaxJitterMs = 15; | |
393 const int64_t kOffsetMs[] = {0, 10000}; | |
394 RunFairnessTest(GetParam(), 1, 1, 300, 2000, 1000, kRttMs, kMaxJitterMs, | |
395 kOffsetMs); | |
372 } | 396 } |
373 } // namespace bwe | 397 } // namespace bwe |
374 } // namespace testing | 398 } // namespace testing |
375 } // namespace webrtc | 399 } // namespace webrtc |
OLD | NEW |