commit 47d4be732f237eb41f701b29caf8f17c71c862b1
author Evan Shrubsole <eshr@webrtc.org> Mon Jan 09 13:42:15 2023
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Jan 11 11:34:47 2023
tree 9e068559b0ceb29390b7212021c6093b2b3662a0
parent 7b96ebbc561659f5f589386d08305a94f1d58e79

[Unwrap] Migrate TransportFeedbackAdapter to use RtpSequenceNumberUnwrapper

Bug: webrtc:13982
Change-Id: Ie1657a7238129e1fa2f10b5f80949aea2119ea98
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/288966
Commit-Queue: Evan Shrubsole <eshr@webrtc.org>
Reviewed-by: Björn Terelius <terelius@webrtc.org>
Auto-Submit: Evan Shrubsole <eshr@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#39064}

modules/congestion_controller/rtp/BUILD.gn

diff --git a/modules/congestion_controller/rtp/BUILD.gn b/modules/congestion_controller/rtp/BUILD.gn
index 608f8a3..596d1f1 100644
--- a/modules/congestion_controller/rtp/BUILD.gn
+++ b/modules/congestion_controller/rtp/BUILD.gn
@@ -63,6 +63,7 @@
     "../../../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",

modules/congestion_controller/rtp/transport_feedback_adapter.h

diff --git a/modules/congestion_controller/rtp/transport_feedback_adapter.h b/modules/congestion_controller/rtp/transport_feedback_adapter.h
index f9f939d..7b1243b 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 @@
   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<int64_t, PacketFeedback> history_;
 
   // Sequence numbers are never negative, using -1 as it always < a real