commit eaedde7e168c9c1ba38c5ca361541ceaab867d4c
author Erik Språng <sprang@webrtc.org> Tue Feb 23 17:34:01 2021 +0100
committer Commit Bot <commit-bot@chromium.org> Wed Feb 24 10:44:42 2021 +0000
tree daaca47143f2cee7875470147323fdcfbe14de25
parent 0093a38f7c4d0e5be726732e7e0bf029595e2f27

Remove old workaround in PacingController

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}

modules/pacing/paced_sender.cc

diff --git a/modules/pacing/paced_sender.cc b/modules/pacing/paced_sender.cc
index 57dbc4f..51d3edc 100644
--- a/modules/pacing/paced_sender.cc
+++ b/modules/pacing/paced_sender.cc
@@ -124,6 +124,7 @@
                    packet->SequenceNumber(), "rtp_timestamp",
                    packet->Timestamp());
 
+      RTC_DCHECK_GE(packet->capture_time_ms(), 0);
       pacing_controller_.EnqueuePacket(std::move(packet));
     }
   }

modules/pacing/pacing_controller.cc

diff --git a/modules/pacing/pacing_controller.cc b/modules/pacing/pacing_controller.cc
index 3ac7afa..e0ace4e 100644
--- a/modules/pacing/pacing_controller.cc
+++ b/modules/pacing/pacing_controller.cc
@@ -295,11 +295,7 @@
     int priority) {
   prober_.OnIncomingPacket(DataSize::Bytes(packet->payload_size()));
 
-  // TODO(sprang): Make sure tests respect this, replace with DCHECK.
   Timestamp now = CurrentTime();
-  if (packet->capture_time_ms() < 0) {
-    packet->set_capture_time_ms(now.ms());
-  }
 
   if (mode_ == ProcessMode::kDynamic && packet_queue_.Empty() &&
       NextSendTime() <= now) {

modules/pacing/task_queue_paced_sender.cc

diff --git a/modules/pacing/task_queue_paced_sender.cc b/modules/pacing/task_queue_paced_sender.cc
index 69ec545..8ba4977 100644
--- a/modules/pacing/task_queue_paced_sender.cc
+++ b/modules/pacing/task_queue_paced_sender.cc
@@ -136,6 +136,7 @@
   task_queue_.PostTask([this, packets_ = std::move(packets)]() mutable {
     RTC_DCHECK_RUN_ON(&task_queue_);
     for (auto& packet : packets_) {
+      RTC_DCHECK_GE(packet->capture_time_ms(), 0);
       pacing_controller_.EnqueuePacket(std::move(packet));
     }
     MaybeProcessPackets(Timestamp::MinusInfinity());