From 47d4be732f237eb41f701b29caf8f17c71c862b1 Mon Sep 17 00:00:00 2001 From: Evan Shrubsole Date: Mon, 9 Jan 2023 13:42:15 +0000 Subject: [PATCH] [Unwrap] Migrate TransportFeedbackAdapter to use RtpSequenceNumberUnwrapper MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:13982 Change-Id: Ie1657a7238129e1fa2f10b5f80949aea2119ea98 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/288966 Commit-Queue: Evan Shrubsole Reviewed-by: Björn Terelius Auto-Submit: Evan Shrubsole Cr-Commit-Position: refs/heads/main@{#39064} --- modules/congestion_controller/rtp/BUILD.gn | 1 + .../congestion_controller/rtp/transport_feedback_adapter.h | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/congestion_controller/rtp/BUILD.gn b/modules/congestion_controller/rtp/BUILD.gn index 608f8a336e..596d1f19b4 100644 --- a/modules/congestion_controller/rtp/BUILD.gn +++ b/modules/congestion_controller/rtp/BUILD.gn @@ -63,6 +63,7 @@ rtc_library("transport_feedback") { "../../../rtc_base:logging", "../../../rtc_base:macromagic", "../../../rtc_base:network_route", + "../../../rtc_base:rtc_numerics", "../../../rtc_base/network:sent_packet", "../../../rtc_base/synchronization:mutex", "../../../rtc_base/system:no_unique_address", diff --git a/modules/congestion_controller/rtp/transport_feedback_adapter.h b/modules/congestion_controller/rtp/transport_feedback_adapter.h index f9f939db9c..7b1243b64b 100644 --- a/modules/congestion_controller/rtp/transport_feedback_adapter.h +++ b/modules/congestion_controller/rtp/transport_feedback_adapter.h @@ -19,10 +19,10 @@ #include "api/sequence_checker.h" #include "api/transport/network_types.h" #include "api/units/timestamp.h" -#include "modules/include/module_common_types_public.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "rtc_base/network/sent_packet.h" #include "rtc_base/network_route.h" +#include "rtc_base/numerics/sequence_number_unwrapper.h" #include "rtc_base/thread_annotations.h" namespace webrtc { @@ -83,7 +83,7 @@ class TransportFeedbackAdapter { DataSize pending_untracked_size_ = DataSize::Zero(); Timestamp last_send_time_ = Timestamp::MinusInfinity(); Timestamp last_untracked_send_time_ = Timestamp::MinusInfinity(); - SequenceNumberUnwrapper seq_num_unwrapper_; + RtpSequenceNumberUnwrapper seq_num_unwrapper_; std::map history_; // Sequence numbers are never negative, using -1 as it always < a real