zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete unused method PacedSender::AverageQueueTimeMs

Browse Source 
It was used only in tests.

Bug: webrtc:8422
Change-Id: I67b58663c171202240d1c5a7c230d6cd4cd6149b
Reviewed-on: https://webrtc-review.googlesource.com/13102
Commit-Queue: Niels Moller <nisse@webrtc.org>
Reviewed-by: Philip Eliasson <philipel@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20382}
This commit is contained in:
Niels Möller
2017-10-23 09:08:22 +02:00
committed by Commit Bot
parent b7e1788466
commit d6314d9fc1
3 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/pacing/paced_sender.cc
View File

@ -193,12 +193,6 @@ int64_t PacedSender::QueueInMs() const {
return clock_->TimeInMilliseconds() - oldest_packet;
}
int64_t PacedSender::AverageQueueTimeMs() {
rtc::CritScope cs(&critsect_);
packets_->UpdateQueueTime(clock_->TimeInMilliseconds());
return packets_->AverageQueueTimeMs();
}
int64_t PacedSender::TimeUntilNextProcess() {
rtc::CritScope cs(&critsect_);
int64_t elapsed_time_us = clock_->TimeInMicroseconds() - time_last_update_us_;

5
modules/pacing/paced_sender.h
View File

@ -134,11 +134,6 @@ class PacedSender : public Pacer {
// traffic to meet the current channel capacity.
virtual rtc::Optional<int64_t> GetApplicationLimitedRegionStartTime() const;
// Returns the average time since being enqueued, in milliseconds, for all
// packets currently in the pacer queue, excluding any time the pacer has been
// paused. Returns 0 if queue is empty.
virtual int64_t AverageQueueTimeMs();
// Returns the number of milliseconds until the module want a worker thread
// to call Process.
int64_t TimeUntilNextProcess() override;

6
modules/pacing/paced_sender_unittest.cc
View File

@ -942,6 +942,8 @@ TEST_F(PacedSenderTest, PaddingOveruse) {
send_bucket_->Process();
}
// TODO(philipel): Move to PacketQueue2 unittests.
#if 0
TEST_F(PacedSenderTest, AverageQueueTime) {
uint32_t ssrc = 12346;
uint16_t sequence_number = 1234;
@ -986,6 +988,7 @@ TEST_F(PacedSenderTest, AverageQueueTime) {
EXPECT_EQ(0, send_bucket_->AverageQueueTimeMs());
}
#endif
TEST_F(PacedSenderTest, ProbeClusterId) {
uint32_t ssrc = 12346;
@ -1060,6 +1063,8 @@ TEST_F(PacedSenderTest, AvoidBusyLoopOnSendFailure) {
EXPECT_EQ(5, send_bucket_->TimeUntilNextProcess());
}
// TODO(philipel): Move to PacketQueue2 unittests.
#if 0
TEST_F(PacedSenderTest, QueueTimeWithPause) {
const size_t kPacketSize = 1200;
const uint32_t kSsrc = 12346;
@ -1119,6 +1124,7 @@ TEST_F(PacedSenderTest, QueueTimePausedDuringPush) {
clock_.AdvanceTimeMilliseconds(100);
EXPECT_EQ(150, send_bucket_->AverageQueueTimeMs());
}
#endif
// TODO(sprang): Extract PacketQueue from PacedSender so that we can test
// removing elements while paused. (This is possible, but only because of semi-