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

Revert of Remove ignored return code from modules. (patchset #3 id:40001 of https://codereview.webrtc.org/1703833002/ )

Browse Source 
Reason for revert:
Breaks Chromium.

Original issue's description:
> Remove ignored return code from modules.
>
> ModuleProcessImpl doesn't act on return codes and having them around is
> confusing (it's unclear what an error return code here would do even).
>
> BUG=
> R=tommi@webrtc.org
>
> Committed: f14c47a58c

TBR=tommi@webrtc.org,pbos@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=

Review URL: https://codereview.webrtc.org/1736663004

Cr-Commit-Position: refs/heads/master@{#11761}
This commit is contained in:
torbjorng
2016-02-25 04:34:03 -08:00
committed by Commit bot
parent 91c5b5650c
commit da33a8a2a2
66 changed files with 192 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
webrtc/modules/pacing/paced_sender.cc
View File

@ -373,7 +373,7 @@ int64_t PacedSender::TimeUntilNextProcess() {
return std::max<int64_t>(kMinPacketLimitMs - elapsed_time_ms, 0);
}
void PacedSender::Process() {
int32_t PacedSender::Process() {
int64_t now_us = clock_->TimeInMicroseconds();
CriticalSectionScoped cs(critsect_.get());
int64_t elapsed_time_ms = (now_us - time_last_update_us_ + 500) / 1000;
@ -402,7 +402,7 @@ void PacedSender::Process() {
}
while (!packets_->Empty()) {
if (media_budget_->bytes_remaining() == 0 && !prober_->IsProbing())
return;
return 0;
// Since we need to release the lock in order to send, we first pop the
// element from the priority queue but keep it in storage, so that we can
@ -413,17 +413,17 @@ void PacedSender::Process() {
// Send succeeded, remove it from the queue.
packets_->FinalizePop(packet);
if (prober_->IsProbing())
return;
return 0;
} else {
// Send failed, put it back into the queue.
packets_->CancelPop(packet);
return;
return 0;
}
}
// TODO(holmer): Remove the paused_ check when issue 5307 has been fixed.
if (paused_ || !packets_->Empty())
return;
return 0;
size_t padding_needed;
if (prober_->IsProbing()) {
@ -434,6 +434,7 @@ void PacedSender::Process() {
if (padding_needed > 0)
SendPadding(static_cast<size_t>(padding_needed));
return 0;
}
bool PacedSender::SendPacket(const paced_sender::Packet& packet) {

2
webrtc/modules/pacing/paced_sender.h
View File

@ -122,7 +122,7 @@ class PacedSender : public Module, public RtpPacketSender {
int64_t TimeUntilNextProcess() override;
// Process any pending packets in the queue(s).
void Process() override;
int32_t Process() override;
private:
// Updates the number of bytes that can be sent for the next time interval.

20
webrtc/modules/pacing/paced_sender_unittest.cc
View File

@ -222,12 +222,12 @@ TEST_F(PacedSenderTest, PaceQueuedPackets) {
.Times(3)
.WillRepeatedly(Return(true));
EXPECT_EQ(0, send_bucket_->TimeUntilNextProcess());
send_bucket_->Process();
EXPECT_EQ(0, send_bucket_->Process());
}
EXPECT_EQ(5, send_bucket_->TimeUntilNextProcess());
clock_.AdvanceTimeMilliseconds(5);
EXPECT_EQ(0, send_bucket_->TimeUntilNextProcess());
send_bucket_->Process();
EXPECT_EQ(0, send_bucket_->Process());
SendAndExpectPacket(PacedSender::kNormalPriority,
ssrc,
sequence_number++,
@ -290,12 +290,12 @@ TEST_F(PacedSenderTest, PaceQueuedPacketsWithDuplicates) {
.WillRepeatedly(Return(true));
}
EXPECT_EQ(0, send_bucket_->TimeUntilNextProcess());
send_bucket_->Process();
EXPECT_EQ(0, send_bucket_->Process());
}
EXPECT_EQ(5, send_bucket_->TimeUntilNextProcess());
clock_.AdvanceTimeMilliseconds(5);
EXPECT_EQ(0, send_bucket_->TimeUntilNextProcess());
send_bucket_->Process();
EXPECT_EQ(0, send_bucket_->Process());
SendAndExpectPacket(PacedSender::kNormalPriority,
ssrc,
sequence_number++,
@ -373,7 +373,7 @@ TEST_F(PacedSenderTest, Padding) {
EXPECT_EQ(5, send_bucket_->TimeUntilNextProcess());
clock_.AdvanceTimeMilliseconds(5);
EXPECT_EQ(0, send_bucket_->TimeUntilNextProcess());
send_bucket_->Process();
EXPECT_EQ(0, send_bucket_->Process());
// 5 milliseconds later we have enough budget to send some padding.
EXPECT_CALL(callback_, TimeToSendPadding(250)).Times(1).
@ -381,7 +381,7 @@ TEST_F(PacedSenderTest, Padding) {
EXPECT_EQ(5, send_bucket_->TimeUntilNextProcess());
clock_.AdvanceTimeMilliseconds(5);
EXPECT_EQ(0, send_bucket_->TimeUntilNextProcess());
send_bucket_->Process();
EXPECT_EQ(0, send_bucket_->Process());
}
TEST_F(PacedSenderTest, VerifyPaddingUpToBitrate) {
@ -486,7 +486,7 @@ TEST_F(PacedSenderTest, Priority) {
EXPECT_EQ(5, send_bucket_->TimeUntilNextProcess());
clock_.AdvanceTimeMilliseconds(5);
EXPECT_EQ(0, send_bucket_->TimeUntilNextProcess());
send_bucket_->Process();
EXPECT_EQ(0, send_bucket_->Process());
EXPECT_CALL(callback_,
TimeToSendPacket(
@ -497,7 +497,7 @@ TEST_F(PacedSenderTest, Priority) {
EXPECT_EQ(5, send_bucket_->TimeUntilNextProcess());
clock_.AdvanceTimeMilliseconds(5);
EXPECT_EQ(0, send_bucket_->TimeUntilNextProcess());
send_bucket_->Process();
EXPECT_EQ(0, send_bucket_->Process());
}
TEST_F(PacedSenderTest, HighPrioDoesntAffectBudget) {
@ -587,7 +587,7 @@ TEST_F(PacedSenderTest, Pause) {
for (int i = 0; i < 10; ++i) {
clock_.AdvanceTimeMilliseconds(5);
EXPECT_EQ(0, send_bucket_->TimeUntilNextProcess());
send_bucket_->Process();
EXPECT_EQ(0, send_bucket_->Process());
}
// Expect high prio packets to come out first followed by all packets in the
// way they were added.
@ -602,7 +602,7 @@ TEST_F(PacedSenderTest, Pause) {
EXPECT_EQ(5, send_bucket_->TimeUntilNextProcess());
clock_.AdvanceTimeMilliseconds(5);
EXPECT_EQ(0, send_bucket_->TimeUntilNextProcess());
send_bucket_->Process();
EXPECT_EQ(0, send_bucket_->Process());
EXPECT_EQ(0, send_bucket_->QueueInMs());
}