admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove old workaround in PacingController

Browse Source 
Bug: None
Change-Id: I23f3548f21b464fe5e211c9895927ee0d978e1f8
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/208543
Reviewed-by: Philip Eliasson <philipel@webrtc.org>
Commit-Queue: Erik Språng <sprang@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#33331}
This commit is contained in:
Erik Språng 2021-02-23 17:34:01 +01:00 committed by Commit Bot
parent 0093a38f7c
commit eaedde7e16
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/pacing/paced_sender.cc
View File

@ -124,6 +124,7 @@ void PacedSender::EnqueuePackets(
packet->SequenceNumber(), "rtp_timestamp", packet->SequenceNumber(), "rtp_timestamp",
packet->Timestamp()); packet->Timestamp());
RTC_DCHECK_GE(packet->capture_time_ms(), 0);
pacing_controller_.EnqueuePacket(std::move(packet)); pacing_controller_.EnqueuePacket(std::move(packet));
} }
} }

4
modules/pacing/pacing_controller.cc
View File

@ -295,11 +295,7 @@ void PacingController::EnqueuePacketInternal(
int priority) { int priority) {
prober_.OnIncomingPacket(DataSize::Bytes(packet->payload_size())); prober_.OnIncomingPacket(DataSize::Bytes(packet->payload_size()));
// TODO(sprang): Make sure tests respect this, replace with DCHECK.
Timestamp now = CurrentTime(); Timestamp now = CurrentTime();
if (packet->capture_time_ms() < 0) {
packet->set_capture_time_ms(now.ms());
}
if (mode_ == ProcessMode::kDynamic && packet_queue_.Empty() && if (mode_ == ProcessMode::kDynamic && packet_queue_.Empty() &&
NextSendTime() <= now) { NextSendTime() <= now) {

1
modules/pacing/task_queue_paced_sender.cc
View File

@ -136,6 +136,7 @@ void TaskQueuePacedSender::EnqueuePackets(
task_queue_.PostTask([this, packets_ = std::move(packets)]() mutable { task_queue_.PostTask([this, packets_ = std::move(packets)]() mutable {
RTC_DCHECK_RUN_ON(&task_queue_); RTC_DCHECK_RUN_ON(&task_queue_);
for (auto& packet : packets_) { for (auto& packet : packets_) {
RTC_DCHECK_GE(packet->capture_time_ms(), 0);
pacing_controller_.EnqueuePacket(std::move(packet)); pacing_controller_.EnqueuePacket(std::move(packet));
} }
MaybeProcessPackets(Timestamp::MinusInfinity()); MaybeProcessPackets(Timestamp::MinusInfinity());