From 8c347eb5ea2e98a00422b45e3335237ceb21a210 Mon Sep 17 00:00:00 2001 From: Evan Shrubsole Date: Mon, 9 Jan 2023 13:42:24 +0000 Subject: [PATCH] [Unwrap] Migrate TransportFeedbackDemuxer to use RtpSequenceNumberUnwrapper MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:13982 Change-Id: I248f4f438a10830c9519361c01215b38dd3c2fc3 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/288967 Reviewed-by: Björn Terelius Commit-Queue: Evan Shrubsole Auto-Submit: Evan Shrubsole Cr-Commit-Position: refs/heads/main@{#39071} --- .../congestion_controller/rtp/transport_feedback_demuxer.cc | 3 +-- .../congestion_controller/rtp/transport_feedback_demuxer.h | 4 +++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/congestion_controller/rtp/transport_feedback_demuxer.cc b/modules/congestion_controller/rtp/transport_feedback_demuxer.cc index 50987b2302..b284a74f1a 100644 --- a/modules/congestion_controller/rtp/transport_feedback_demuxer.cc +++ b/modules/congestion_controller/rtp/transport_feedback_demuxer.cc @@ -66,8 +66,7 @@ void TransportFeedbackDemuxer::OnTransportFeedback( std::vector stream_feedbacks; for (const auto& packet : feedback.GetAllPackets()) { - int64_t seq_num = - seq_num_unwrapper_.UnwrapWithoutUpdate(packet.sequence_number()); + int64_t seq_num = seq_num_unwrapper_.PeekUnwrap(packet.sequence_number()); auto it = history_.find(seq_num); if (it != history_.end()) { auto packet_info = it->second; diff --git a/modules/congestion_controller/rtp/transport_feedback_demuxer.h b/modules/congestion_controller/rtp/transport_feedback_demuxer.h index 7f4f5750d2..278c144b61 100644 --- a/modules/congestion_controller/rtp/transport_feedback_demuxer.h +++ b/modules/congestion_controller/rtp/transport_feedback_demuxer.h @@ -17,6 +17,7 @@ #include "api/sequence_checker.h" #include "modules/include/module_common_types_public.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "rtc_base/numerics/sequence_number_unwrapper.h" #include "rtc_base/system/no_unique_address.h" namespace webrtc { @@ -45,7 +46,8 @@ class TransportFeedbackDemuxer final : public StreamFeedbackProvider { private: RTC_NO_UNIQUE_ADDRESS SequenceChecker observer_checker_; - SequenceNumberUnwrapper seq_num_unwrapper_ RTC_GUARDED_BY(&observer_checker_); + RtpSequenceNumberUnwrapper seq_num_unwrapper_ + RTC_GUARDED_BY(&observer_checker_); std::map history_ RTC_GUARDED_BY(&observer_checker_);