Index: webrtc/modules/pacing/paced_sender.cc |
diff --git a/webrtc/modules/pacing/paced_sender.cc b/webrtc/modules/pacing/paced_sender.cc |
index 699865097985dbe896ab77739fc9a1ded12a565a..c32d365668d484a0df6445fc7f2e277c576944e0 100644 |
--- a/webrtc/modules/pacing/paced_sender.cc |
+++ b/webrtc/modules/pacing/paced_sender.cc |
@@ -373,7 +373,7 @@ |
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 @@ |
} |
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 @@ |
// 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 @@ |
if (padding_needed > 0) |
SendPadding(static_cast<size_t>(padding_needed)); |
+ return 0; |
} |
bool PacedSender::SendPacket(const paced_sender::Packet& packet) { |