diff --git a/audio/channel_send.cc b/audio/channel_send.cc index ed2776de78..212ef706f3 100644 --- a/audio/channel_send.cc +++ b/audio/channel_send.cc @@ -263,7 +263,6 @@ class ChannelSend : public ChannelSendInterface, PacketRouter* packet_router_ RTC_GUARDED_BY(&worker_thread_checker_) = nullptr; const std::unique_ptr feedback_observer_proxy_; - const std::unique_ptr seq_num_allocator_proxy_; const std::unique_ptr rtp_packet_pacer_proxy_; const std::unique_ptr retransmission_rate_limiter_; @@ -341,35 +340,6 @@ class TransportFeedbackProxy : public TransportFeedbackObserver { TransportFeedbackObserver* feedback_observer_ RTC_GUARDED_BY(&crit_); }; -class TransportSequenceNumberProxy : public TransportSequenceNumberAllocator { - public: - TransportSequenceNumberProxy() : seq_num_allocator_(nullptr) { - pacer_thread_.Detach(); - } - - void SetSequenceNumberAllocator( - TransportSequenceNumberAllocator* seq_num_allocator) { - RTC_DCHECK(thread_checker_.IsCurrent()); - rtc::CritScope lock(&crit_); - seq_num_allocator_ = seq_num_allocator; - } - - // Implements TransportSequenceNumberAllocator. - uint16_t AllocateSequenceNumber() override { - RTC_DCHECK(pacer_thread_.IsCurrent()); - rtc::CritScope lock(&crit_); - if (!seq_num_allocator_) - return 0; - return seq_num_allocator_->AllocateSequenceNumber(); - } - - private: - rtc::CriticalSection crit_; - rtc::ThreadChecker thread_checker_; - rtc::ThreadChecker pacer_thread_; - TransportSequenceNumberAllocator* seq_num_allocator_ RTC_GUARDED_BY(&crit_); -}; - class RtpPacketSenderProxy : public RtpPacketSender { public: RtpPacketSenderProxy() : rtp_packet_pacer_(nullptr) {} @@ -639,7 +609,6 @@ ChannelSend::ChannelSend(Clock* clock, _includeAudioLevelIndication(false), rtcp_observer_(new VoERtcpObserver(this)), feedback_observer_proxy_(new TransportFeedbackProxy()), - seq_num_allocator_proxy_(new TransportSequenceNumberProxy()), rtp_packet_pacer_proxy_(new RtpPacketSenderProxy()), retransmission_rate_limiter_( new RateLimiter(clock, kMaxRetransmissionWindowMs)), @@ -676,8 +645,6 @@ ChannelSend::ChannelSend(Clock* clock, configuration.outgoing_transport = rtp_transport; configuration.paced_sender = rtp_packet_pacer_proxy_.get(); - configuration.transport_sequence_number_allocator = - seq_num_allocator_proxy_.get(); configuration.event_log = event_log_; configuration.rtt_stats = rtcp_rtt_stats; @@ -999,7 +966,6 @@ void ChannelSend::RegisterSenderCongestionControlObjects( rtcp_observer_->SetBandwidthObserver(bandwidth_observer); feedback_observer_proxy_->SetTransportFeedbackObserver( transport_feedback_observer); - seq_num_allocator_proxy_->SetSequenceNumberAllocator(packet_router); rtp_packet_pacer_proxy_->SetPacketPacer(rtp_packet_pacer); _rtpRtcpModule->SetStorePacketsStatus(true, 600); constexpr bool remb_candidate = false; @@ -1013,7 +979,6 @@ void ChannelSend::ResetSenderCongestionControlObjects() { _rtpRtcpModule->SetStorePacketsStatus(false, 600); rtcp_observer_->SetBandwidthObserver(nullptr); feedback_observer_proxy_->SetTransportFeedbackObserver(nullptr); - seq_num_allocator_proxy_->SetSequenceNumberAllocator(nullptr); packet_router_->RemoveSendRtpModule(_rtpRtcpModule.get()); packet_router_ = nullptr; rtp_packet_pacer_proxy_->SetPacketPacer(nullptr); diff --git a/call/rtp_video_sender.cc b/call/rtp_video_sender.cc index 7e4a2ad2ec..f5cac2f2a4 100644 --- a/call/rtp_video_sender.cc +++ b/call/rtp_video_sender.cc @@ -93,8 +93,6 @@ std::vector CreateRtpStreamSenders( configuration.rtt_stats = rtt_stats; configuration.rtcp_packet_type_counter_observer = rtcp_type_observer; configuration.paced_sender = transport->packet_sender(); - configuration.transport_sequence_number_allocator = - transport->packet_router(); configuration.send_bitrate_observer = bitrate_observer; configuration.send_side_delay_observer = send_delay_observer; configuration.send_packet_observer = send_packet_observer; diff --git a/modules/pacing/packet_router.h b/modules/pacing/packet_router.h index c50905b58c..07ef4b3a23 100644 --- a/modules/pacing/packet_router.h +++ b/modules/pacing/packet_router.h @@ -39,8 +39,7 @@ class TransportFeedback; // module if possible (sender report), otherwise on receive module // (receiver report). For the latter case, we also keep track of the // receive modules. -class PacketRouter : public TransportSequenceNumberAllocator, - public RemoteBitrateObserver, +class PacketRouter : public RemoteBitrateObserver, public TransportFeedbackSenderInterface { public: PacketRouter(); @@ -60,7 +59,7 @@ class PacketRouter : public TransportSequenceNumberAllocator, size_t target_size_bytes); void SetTransportWideSequenceNumber(uint16_t sequence_number); - uint16_t AllocateSequenceNumber() override; + uint16_t AllocateSequenceNumber(); // Called every time there is a new bitrate estimate for a receive channel // group. This call will trigger a new RTCP REMB packet if the bitrate diff --git a/modules/rtp_rtcp/include/rtp_rtcp.h b/modules/rtp_rtcp/include/rtp_rtcp.h index 8616bb85cc..69ca8f81b3 100644 --- a/modules/rtp_rtcp/include/rtp_rtcp.h +++ b/modules/rtp_rtcp/include/rtp_rtcp.h @@ -95,8 +95,6 @@ class RtpRtcp : public Module, public RtcpFeedbackSenderInterface { // TODO(brandtr): Remove when FlexfecSender is wired up to PacedSender. FlexfecSender* flexfec_sender = nullptr; - TransportSequenceNumberAllocator* transport_sequence_number_allocator = - nullptr; BitrateStatisticsObserver* send_bitrate_observer = nullptr; SendSideDelayObserver* send_side_delay_observer = nullptr; RtcEventLog* event_log = nullptr; diff --git a/modules/rtp_rtcp/include/rtp_rtcp_defines.h b/modules/rtp_rtcp/include/rtp_rtcp_defines.h index 839b13cb16..642bba46ca 100644 --- a/modules/rtp_rtcp/include/rtp_rtcp_defines.h +++ b/modules/rtp_rtcp/include/rtp_rtcp_defines.h @@ -343,14 +343,6 @@ class RtcpRttStats { virtual ~RtcpRttStats() {} }; -class TransportSequenceNumberAllocator { - public: - TransportSequenceNumberAllocator() {} - virtual ~TransportSequenceNumberAllocator() {} - - virtual uint16_t AllocateSequenceNumber() = 0; -}; - struct RtpPacketCounter { RtpPacketCounter() : header_bytes(0), payload_bytes(0), padding_bytes(0), packets(0) {} diff --git a/modules/rtp_rtcp/source/rtp_sender.cc b/modules/rtp_rtcp/source/rtp_sender.cc index b7e1761af8..135564d284 100644 --- a/modules/rtp_rtcp/source/rtp_sender.cc +++ b/modules/rtp_rtcp/source/rtp_sender.cc @@ -129,8 +129,6 @@ RTPSender::RTPSender(const RtpRtcp::Configuration& config) config.paced_sender ? nullptr : new NonPacedPacketSender(this)), paced_sender_(config.paced_sender ? config.paced_sender : non_paced_packet_sender_.get()), - transport_sequence_number_allocator_( - config.transport_sequence_number_allocator), transport_feedback_observer_(config.transport_feedback_callback), transport_(config.outgoing_transport), sending_media_(true), // Default to sending media. @@ -878,24 +876,6 @@ bool RTPSender::AssignSequenceNumber(RtpPacketToSend* packet) { return true; } -bool RTPSender::UpdateTransportSequenceNumber(RtpPacketToSend* packet, - int* packet_id) { - RTC_DCHECK(packet); - RTC_DCHECK(packet_id); - if (!rtp_header_extension_map_.IsRegistered(TransportSequenceNumber::kId)) - return false; - - if (!transport_sequence_number_allocator_) - return false; - - *packet_id = transport_sequence_number_allocator_->AllocateSequenceNumber(); - - if (!packet->SetExtension(*packet_id)) - return false; - - return true; -} - void RTPSender::SetSendingMediaStatus(bool enabled) { rtc::CritScope lock(&send_critsect_); sending_media_ = enabled; diff --git a/modules/rtp_rtcp/source/rtp_sender.h b/modules/rtp_rtcp/source/rtp_sender.h index f7b48bfb3f..f7bdb719cb 100644 --- a/modules/rtp_rtcp/source/rtp_sender.h +++ b/modules/rtp_rtcp/source/rtp_sender.h @@ -211,9 +211,6 @@ class RTPSender { int64_t capture_time_ms, uint32_t ssrc); - bool UpdateTransportSequenceNumber(RtpPacketToSend* packet, int* packet_id) - RTC_EXCLUSIVE_LOCKS_REQUIRED(send_critsect_); - void UpdateRtpStats(const RtpPacketToSend& packet, bool is_rtx, bool is_retransmit); @@ -234,7 +231,6 @@ class RTPSender { const std::unique_ptr non_paced_packet_sender_; RtpPacketSender* const paced_sender_; - TransportSequenceNumberAllocator* const transport_sequence_number_allocator_; TransportFeedbackObserver* const transport_feedback_observer_; rtc::CriticalSection send_critsect_;