From 9337ac8650f95e4ac7a66c4ac5ade84e05276bf6 Mon Sep 17 00:00:00 2001 From: Evan Shrubsole Date: Mon, 9 Jan 2023 13:40:58 +0000 Subject: [PATCH] [Unwrap] Migrate RtcEventLog parser to use RtpSequenceNumberUnwrapper MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:13982 Change-Id: I974aafd810ee3b266689a76fc3ed3b7a62440df5 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/288963 Reviewed-by: Björn Terelius Auto-Submit: Evan Shrubsole Commit-Queue: Björn Terelius Cr-Commit-Position: refs/heads/main@{#39080} --- logging/rtc_event_log/rtc_event_log_parser.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/logging/rtc_event_log/rtc_event_log_parser.cc b/logging/rtc_event_log/rtc_event_log_parser.cc index b37d29d7e3..76d2d77726 100644 --- a/logging/rtc_event_log/rtc_event_log_parser.cc +++ b/logging/rtc_event_log/rtc_event_log_parser.cc @@ -32,7 +32,6 @@ #include "logging/rtc_event_log/events/logged_rtp_rtcp.h" #include "logging/rtc_event_log/rtc_event_processor.h" #include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h" -#include "modules/include/module_common_types_public.h" #include "modules/rtp_rtcp/include/rtp_cvo.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "modules/rtp_rtcp/source/byte_io.h" @@ -2289,7 +2288,7 @@ std::vector ParsedRtcEventLog::GetPacketInfos( std::map indices; uint16_t current_overhead = kDefaultOverhead; Timestamp last_log_time = Timestamp::Zero(); - SequenceNumberUnwrapper seq_num_unwrapper; + RtpSequenceNumberUnwrapper seq_num_unwrapper; auto advance_time = [&](Timestamp new_log_time) { if (overhead_iter != overheads.end() && @@ -2301,7 +2300,7 @@ std::vector ParsedRtcEventLog::GetPacketInfos( // therefore we don't want to match up sequence numbers as we might have had // a wraparound. if (new_log_time - last_log_time > TimeDelta::Seconds(30)) { - seq_num_unwrapper = SequenceNumberUnwrapper(); + seq_num_unwrapper.Reset(); indices.clear(); } RTC_DCHECK_GE(new_log_time, last_log_time);