| 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 322 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 333 | 333 |
| 334 RampUpDownUpTester::~RampUpDownUpTester() {} | 334 RampUpDownUpTester::~RampUpDownUpTester() {} |
| 335 | 335 |
| 336 bool RampUpDownUpTester::PollStats() { | 336 bool RampUpDownUpTester::PollStats() { |
| 337 if (send_stream_) { | 337 if (send_stream_) { |
| 338 webrtc::VideoSendStream::Stats stats = send_stream_->GetStats(); | 338 webrtc::VideoSendStream::Stats stats = send_stream_->GetStats(); |
| 339 int transmit_bitrate_bps = 0; | 339 int transmit_bitrate_bps = 0; |
| 340 for (auto it : stats.substreams) { | 340 for (auto it : stats.substreams) { |
| 341 transmit_bitrate_bps += it.second.total_bitrate_bps; | 341 transmit_bitrate_bps += it.second.total_bitrate_bps; |
| 342 } | 342 } |
| 343 | |
| 344 EvolveTestState(transmit_bitrate_bps, stats.suspended); | 343 EvolveTestState(transmit_bitrate_bps, stats.suspended); |
| 345 } | 344 } |
| 346 | 345 |
| 347 return !event_.Wait(kPollIntervalMs); | 346 return !event_.Wait(kPollIntervalMs); |
| 348 } | 347 } |
| 349 | 348 |
| 350 Call::Config RampUpDownUpTester::GetReceiverCallConfig() { | 349 Call::Config RampUpDownUpTester::GetReceiverCallConfig() { |
| 351 Call::Config config; | 350 Call::Config config; |
| 352 config.bitrate_config.min_bitrate_bps = 10000; | 351 config.bitrate_config.min_bitrate_bps = 10000; |
| 353 return config; | 352 return config; |
| (...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 457 RampUpTester test(3, 0, 0, RtpExtension::kTimestampOffsetUri, true, true); | 456 RampUpTester test(3, 0, 0, RtpExtension::kTimestampOffsetUri, true, true); |
| 458 RunBaseTest(&test); | 457 RunBaseTest(&test); |
| 459 } | 458 } |
| 460 | 459 |
| 461 TEST_F(RampUpTest, SingleStreamWithHighStartBitrate) { | 460 TEST_F(RampUpTest, SingleStreamWithHighStartBitrate) { |
| 462 RampUpTester test(1, 0, 0.9 * kSingleStreamTargetBps, | 461 RampUpTester test(1, 0, 0.9 * kSingleStreamTargetBps, |
| 463 RtpExtension::kTimestampOffsetUri, false, false); | 462 RtpExtension::kTimestampOffsetUri, false, false); |
| 464 RunBaseTest(&test); | 463 RunBaseTest(&test); |
| 465 } | 464 } |
| 466 | 465 |
| 467 // Disabled on Mac due to flakiness, see | |
| 468 // https://bugs.chromium.org/p/webrtc/issues/detail?id=5407 | |
| 469 #ifndef WEBRTC_MAC | |
| 470 | |
| 471 static const uint32_t kStartBitrateBps = 60000; | 466 static const uint32_t kStartBitrateBps = 60000; |
| 472 | 467 |
| 473 // Disabled: https://bugs.chromium.org/p/webrtc/issues/detail?id=5576 | 468 // Disabled: https://bugs.chromium.org/p/webrtc/issues/detail?id=5576 |
| 474 TEST_F(RampUpTest, DISABLED_UpDownUpOneStream) { | 469 TEST_F(RampUpTest, DISABLED_UpDownUpOneStream) { |
| 475 RampUpDownUpTester test(1, 0, kStartBitrateBps, RtpExtension::kAbsSendTimeUri, | 470 RampUpDownUpTester test(1, 0, kStartBitrateBps, RtpExtension::kAbsSendTimeUri, |
| 476 false, false); | 471 false, false); |
| 477 RunBaseTest(&test); | 472 RunBaseTest(&test); |
| 478 } | 473 } |
| 479 | 474 |
| 480 TEST_F(RampUpTest, UpDownUpThreeStreams) { | 475 TEST_F(RampUpTest, UpDownUpThreeStreams) { |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 518 | 513 |
| 519 // TODO(holmer): Enable when audio bitrates are included in the bitrate | 514 // TODO(holmer): Enable when audio bitrates are included in the bitrate |
| 520 // allocation. | 515 // allocation. |
| 521 TEST_F(RampUpTest, DISABLED_SendSideAudioVideoUpDownUpRtx) { | 516 TEST_F(RampUpTest, DISABLED_SendSideAudioVideoUpDownUpRtx) { |
| 522 RampUpDownUpTester test(3, 1, kStartBitrateBps, | 517 RampUpDownUpTester test(3, 1, kStartBitrateBps, |
| 523 RtpExtension::kTransportSequenceNumberUri, true, | 518 RtpExtension::kTransportSequenceNumberUri, true, |
| 524 false); | 519 false); |
| 525 RunBaseTest(&test); | 520 RunBaseTest(&test); |
| 526 } | 521 } |
| 527 | 522 |
| 528 #endif | |
| 529 | |
| 530 TEST_F(RampUpTest, AbsSendTimeSingleStream) { | 523 TEST_F(RampUpTest, AbsSendTimeSingleStream) { |
| 531 RampUpTester test(1, 0, 0, RtpExtension::kAbsSendTimeUri, false, false); | 524 RampUpTester test(1, 0, 0, RtpExtension::kAbsSendTimeUri, false, false); |
| 532 RunBaseTest(&test); | 525 RunBaseTest(&test); |
| 533 } | 526 } |
| 534 | 527 |
| 535 TEST_F(RampUpTest, AbsSendTimeSimulcast) { | 528 TEST_F(RampUpTest, AbsSendTimeSimulcast) { |
| 536 RampUpTester test(3, 0, 0, RtpExtension::kAbsSendTimeUri, false, false); | 529 RampUpTester test(3, 0, 0, RtpExtension::kAbsSendTimeUri, false, false); |
| 537 RunBaseTest(&test); | 530 RunBaseTest(&test); |
| 538 } | 531 } |
| 539 | 532 |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 582 true); | 575 true); |
| 583 RunBaseTest(&test); | 576 RunBaseTest(&test); |
| 584 } | 577 } |
| 585 | 578 |
| 586 TEST_F(RampUpTest, TransportSequenceNumberSingleStreamWithHighStartBitrate) { | 579 TEST_F(RampUpTest, TransportSequenceNumberSingleStreamWithHighStartBitrate) { |
| 587 RampUpTester test(1, 0, 0.9 * kSingleStreamTargetBps, | 580 RampUpTester test(1, 0, 0.9 * kSingleStreamTargetBps, |
| 588 RtpExtension::kTransportSequenceNumberUri, false, false); | 581 RtpExtension::kTransportSequenceNumberUri, false, false); |
| 589 RunBaseTest(&test); | 582 RunBaseTest(&test); |
| 590 } | 583 } |
| 591 } // namespace webrtc | 584 } // namespace webrtc |
| OLD | NEW |