Simplify pacer queue

This CL simplifies the pacer queue by removing the now unnecessary
beginpop/cancelpop/finalizepop methods. Instead there's a const top()
and a pop() much like an stl queue.
Old methods using the deprecated pacing code path are cleaned away.

Bug: webrtc:10633
Change-Id: Ib6da4d46a571bf56415172b790cc9e3f63206a38
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/150522
Commit-Queue: Erik Språng <sprang@webrtc.org>
Reviewed-by: Philip Eliasson <philipel@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28997}
This commit is contained in:
Erik Språng
2019-08-29 09:24:13 +02:00
committed by Commit Bot
parent 228900f8b1
commit 7db900e2e7
5 changed files with 198 additions and 239 deletions

View File

@ -145,10 +145,10 @@ class PacingController {
DataSize PaddingToAdd(absl::optional<DataSize> recommended_probe_size,
DataSize data_sent);
RoundRobinPacketQueue::QueuedPacket* GetPendingPacket(
const PacedPacketInfo& pacing_info);
void OnPacketSent(RoundRobinPacketQueue::QueuedPacket* packet);
void OnPaddingSent(DataSize padding_sent);
DataSize PacketSize(const RtpPacketToSend& packet) const;
bool ShouldSendPacket(const RtpPacketToSend& packet,
PacedPacketInfo pacing_info) const;
Timestamp CurrentTime() const;
@ -160,6 +160,7 @@ class PacingController {
const bool drain_large_queues_;
const bool send_padding_if_silent_;
const bool pace_audio_;
const bool send_side_bwe_with_overhead_;
TimeDelta min_packet_limit_;
// TODO(webrtc:9716): Remove this when we are certain clocks are monotonic.