zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup use of deprecated PacketRouter methods

Browse Source 
Bug: webrtc:11036
Change-Id: I5131fc9d5d048c691fdb501e0885310664fb9419
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/157884
Commit-Queue: Erik Språng <sprang@webrtc.org>
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Reviewed-by: Sebastian Jansson <srte@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#29571}
This commit is contained in:
Erik Språng
2019-10-21 19:39:57 +02:00
committed by Commit Bot
parent 1272dade56
commit 13a8e16247
2 changed files with 3 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
modules/pacing/packet_router.cc
View File

@ -133,7 +133,7 @@ void PacketRouter::SendPacket(std::unique_ptr<RtpPacketToSend> 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<TransportSequenceNumber>()) {
packet->SetExtension<TransportSequenceNumber>(AllocateSequenceNumber());
packet->SetExtension<TransportSequenceNumber>((++transport_seq_) & 0xFFFF);
}
uint32_t ssrc = packet->Ssrc();
@ -190,20 +190,9 @@ std::vector<std::unique_ptr<RtpPacketToSend>> 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<uint32_t>& ssrcs,

7
modules/pacing/packet_router.h
View File

@ -58,11 +58,6 @@ class PacketRouter : public RemoteBitrateObserver,
virtual std::vector<std::unique_ptr<RtpPacketToSend>> 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);
};