From 13a8e162476b6df15e283cea2aeb9650078d7fa9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Spr=C3=A5ng?= Date: Mon, 21 Oct 2019 19:39:57 +0200 Subject: [PATCH] Cleanup use of deprecated PacketRouter methods MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:11036 Change-Id: I5131fc9d5d048c691fdb501e0885310664fb9419 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/157884 Commit-Queue: Erik Språng Reviewed-by: Danil Chapovalov Reviewed-by: Sebastian Jansson Cr-Commit-Position: refs/heads/master@{#29571} --- modules/pacing/packet_router.cc | 15 ++------------- modules/pacing/packet_router.h | 7 +------ 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/modules/pacing/packet_router.cc b/modules/pacing/packet_router.cc index 8edfd1fe28..c280299950 100644 --- a/modules/pacing/packet_router.cc +++ b/modules/pacing/packet_router.cc @@ -133,7 +133,7 @@ void PacketRouter::SendPacket(std::unique_ptr packet, // With the new pacer code path, transport sequence numbers are only set here, // on the pacer thread. Therefore we don't need atomics/synchronization. if (packet->IsExtensionReserved()) { - packet->SetExtension(AllocateSequenceNumber()); + packet->SetExtension((++transport_seq_) & 0xFFFF); } uint32_t ssrc = packet->Ssrc(); @@ -190,20 +190,9 @@ std::vector> PacketRouter::GeneratePadding( return padding_packets; } -void PacketRouter::SetTransportWideSequenceNumber(uint16_t sequence_number) { - rtc::CritScope lock(&modules_crit_); - transport_seq_ = sequence_number; -} - -uint16_t PacketRouter::AllocateSequenceNumber() { - rtc::CritScope lock(&modules_crit_); - transport_seq_ = (transport_seq_ + 1) & 0xFFFF; - return transport_seq_; -} - uint16_t PacketRouter::CurrentTransportSequenceNumber() const { rtc::CritScope lock(&modules_crit_); - return transport_seq_; + return transport_seq_ & 0xFFFF; } void PacketRouter::OnReceiveBitrateChanged(const std::vector& ssrcs, diff --git a/modules/pacing/packet_router.h b/modules/pacing/packet_router.h index 1359e04332..117d681f6c 100644 --- a/modules/pacing/packet_router.h +++ b/modules/pacing/packet_router.h @@ -58,11 +58,6 @@ class PacketRouter : public RemoteBitrateObserver, virtual std::vector> GeneratePadding( size_t target_size_bytes); - // TODO(bugs.webrtc.org/11036): Remove when downstream usage is gone. - void SetTransportWideSequenceNumber(uint16_t sequence_number); - // TODO(bugs.webrtc.org/11036): Make private when downstream usage is gone. - uint16_t AllocateSequenceNumber(); - uint16_t CurrentTransportSequenceNumber() const; // Called every time there is a new bitrate estimate for a receive channel @@ -129,7 +124,7 @@ class PacketRouter : public RemoteBitrateObserver, RtcpFeedbackSenderInterface* active_remb_module_ RTC_GUARDED_BY(modules_crit_); - int transport_seq_ RTC_GUARDED_BY(modules_crit_); + uint64_t transport_seq_ RTC_GUARDED_BY(modules_crit_); RTC_DISALLOW_COPY_AND_ASSIGN(PacketRouter); };