Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(236)

Side by Side Diff: webrtc/modules/pacing/paced_sender_unittest.cc

Issue 1524763002: Don't account for audio in the pacer budget. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Fixed tests. Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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 453 matching lines...) Expand 10 before | Expand all | Expand 10 after
464 send_bucket_->Process(); 464 send_bucket_->Process();
465 465
466 // Expect normal and low priority to be queued and high to pass through. 466 // Expect normal and low priority to be queued and high to pass through.
467 send_bucket_->InsertPacket(PacedSender::kLowPriority, ssrc_low_priority, 467 send_bucket_->InsertPacket(PacedSender::kLowPriority, ssrc_low_priority,
468 sequence_number++, capture_time_ms_low_priority, 468 sequence_number++, capture_time_ms_low_priority,
469 250, false); 469 250, false);
470 send_bucket_->InsertPacket(PacedSender::kNormalPriority, ssrc, 470 send_bucket_->InsertPacket(PacedSender::kNormalPriority, ssrc,
471 sequence_number++, capture_time_ms, 250, false); 471 sequence_number++, capture_time_ms, 250, false);
472 send_bucket_->InsertPacket(PacedSender::kNormalPriority, ssrc, 472 send_bucket_->InsertPacket(PacedSender::kNormalPriority, ssrc,
473 sequence_number++, capture_time_ms, 250, false); 473 sequence_number++, capture_time_ms, 250, false);
474 send_bucket_->InsertPacket(PacedSender::kNormalPriority, ssrc,
475 sequence_number++, capture_time_ms, 250, false);
474 send_bucket_->InsertPacket(PacedSender::kHighPriority, ssrc, 476 send_bucket_->InsertPacket(PacedSender::kHighPriority, ssrc,
475 sequence_number++, capture_time_ms, 250, false); 477 sequence_number++, capture_time_ms, 250, false);
476 478
477 // Expect all high and normal priority to be sent out first. 479 // Expect all high and normal priority to be sent out first.
478 EXPECT_CALL(callback_, TimeToSendPadding(_)).Times(0); 480 EXPECT_CALL(callback_, TimeToSendPadding(_)).Times(0);
479 EXPECT_CALL(callback_, TimeToSendPacket(ssrc, _, capture_time_ms, false)) 481 EXPECT_CALL(callback_, TimeToSendPacket(ssrc, _, capture_time_ms, false))
480 .Times(3) 482 .Times(4)
481 .WillRepeatedly(Return(true)); 483 .WillRepeatedly(Return(true));
482 484
483 EXPECT_EQ(5, send_bucket_->TimeUntilNextProcess()); 485 EXPECT_EQ(5, send_bucket_->TimeUntilNextProcess());
484 clock_.AdvanceTimeMilliseconds(5); 486 clock_.AdvanceTimeMilliseconds(5);
485 EXPECT_EQ(0, send_bucket_->TimeUntilNextProcess()); 487 EXPECT_EQ(0, send_bucket_->TimeUntilNextProcess());
486 EXPECT_EQ(0, send_bucket_->Process()); 488 EXPECT_EQ(0, send_bucket_->Process());
487 489
488 EXPECT_CALL(callback_, 490 EXPECT_CALL(callback_,
489 TimeToSendPacket( 491 TimeToSendPacket(
490 ssrc_low_priority, _, capture_time_ms_low_priority, false)) 492 ssrc_low_priority, _, capture_time_ms_low_priority, false))
(...skipping 339 matching lines...) Expand 10 before | Expand all | Expand 10 after
830 uint16_t sequence_number = 1234; 832 uint16_t sequence_number = 1234;
831 const size_t kPacketSize = 1200; 833 const size_t kPacketSize = 1200;
832 const int kBitrateBps = 10 * kPacketSize * 8; // 10 packets per second. 834 const int kBitrateBps = 10 * kPacketSize * 8; // 10 packets per second.
833 const int kBitrateKbps = (kBitrateBps + 500) / 1000; 835 const int kBitrateKbps = (kBitrateBps + 500) / 1000;
834 836
835 send_bucket_->UpdateBitrate(kBitrateKbps, kBitrateKbps, kBitrateKbps); 837 send_bucket_->UpdateBitrate(kBitrateKbps, kBitrateKbps, kBitrateKbps);
836 838
837 EXPECT_EQ(0, send_bucket_->AverageQueueTimeMs()); 839 EXPECT_EQ(0, send_bucket_->AverageQueueTimeMs());
838 840
839 int64_t first_capture_time = clock_.TimeInMilliseconds(); 841 int64_t first_capture_time = clock_.TimeInMilliseconds();
840 send_bucket_->InsertPacket(PacedSender::kHighPriority, ssrc, sequence_number, 842 send_bucket_->InsertPacket(PacedSender::kNormalPriority, ssrc,
841 first_capture_time, kPacketSize, false); 843 sequence_number, first_capture_time, kPacketSize,
844 false);
842 clock_.AdvanceTimeMilliseconds(10); 845 clock_.AdvanceTimeMilliseconds(10);
843 send_bucket_->InsertPacket(PacedSender::kHighPriority, ssrc, 846 send_bucket_->InsertPacket(PacedSender::kNormalPriority, ssrc,
844 sequence_number + 1, clock_.TimeInMilliseconds(), 847 sequence_number + 1, clock_.TimeInMilliseconds(),
845 kPacketSize, false); 848 kPacketSize, false);
846 clock_.AdvanceTimeMilliseconds(10); 849 clock_.AdvanceTimeMilliseconds(10);
847 850
848 EXPECT_EQ((20 + 10) / 2, send_bucket_->AverageQueueTimeMs()); 851 EXPECT_EQ((20 + 10) / 2, send_bucket_->AverageQueueTimeMs());
849 852
850 // Only first packet (queued for 20ms) should be removed, leave the second 853 // Only first packet (queued for 20ms) should be removed, leave the second
851 // packet (queued for 10ms) alone in the queue. 854 // packet (queued for 10ms) alone in the queue.
852 EXPECT_CALL(callback_, TimeToSendPacket(ssrc, sequence_number, 855 EXPECT_CALL(callback_, TimeToSendPacket(ssrc, sequence_number,
853 first_capture_time, false)) 856 first_capture_time, false))
(...skipping 11 matching lines...) Expand all
865 for (int i = 0; i < 3; ++i) { 868 for (int i = 0; i < 3; ++i) {
866 clock_.AdvanceTimeMilliseconds(30); // Max delta. 869 clock_.AdvanceTimeMilliseconds(30); // Max delta.
867 send_bucket_->Process(); 870 send_bucket_->Process();
868 } 871 }
869 872
870 EXPECT_EQ(0, send_bucket_->AverageQueueTimeMs()); 873 EXPECT_EQ(0, send_bucket_->AverageQueueTimeMs());
871 } 874 }
872 875
873 } // namespace test 876 } // namespace test
874 } // namespace webrtc 877 } // namespace webrtc
OLDNEW
« webrtc/modules/pacing/paced_sender.cc ('K') | « webrtc/modules/pacing/paced_sender.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698