diff --git a/logging/rtc_event_log/logged_events.h b/logging/rtc_event_log/logged_events.h index 3a82d626aa..bea399e52f 100644 --- a/logging/rtc_event_log/logged_events.h +++ b/logging/rtc_event_log/logged_events.h @@ -492,7 +492,7 @@ struct LoggedVideoSendConfig { rtclog::StreamConfig config; }; -struct LoggedRouteChangeEvent { +struct InferredRouteChangeEvent { int64_t log_time_ms() const { return log_time.ms(); } int64_t log_time_us() const { return log_time.us(); } uint32_t route_id; @@ -501,6 +501,8 @@ struct LoggedRouteChangeEvent { uint16_t return_overhead; }; +using LoggedRouteChangeEvent = InferredRouteChangeEvent; + enum class LoggedMediaType : uint8_t { kUnknown, kAudio, kVideo }; struct LoggedPacketInfo { diff --git a/logging/rtc_event_log/rtc_event_log_parser.cc b/logging/rtc_event_log/rtc_event_log_parser.cc index 1fd9068f13..9881bc35d7 100644 --- a/logging/rtc_event_log/rtc_event_log_parser.cc +++ b/logging/rtc_event_log/rtc_event_log_parser.cc @@ -91,7 +91,7 @@ struct OverheadChangeEvent { uint16_t overhead; }; std::vector GetOverheadChangingEvents( - const std::vector& route_changes, + const std::vector& route_changes, PacketDirection direction) { std::vector overheads; for (auto& event : route_changes) { @@ -1881,11 +1881,12 @@ ParsedRtcEventLog::MediaType ParsedRtcEventLog::GetMediaType( return MediaType::ANY; } -std::vector ParsedRtcEventLog::GetRouteChanges() const { - std::vector route_changes; +std::vector ParsedRtcEventLog::GetRouteChanges() + const { + std::vector route_changes; for (auto& candidate : ice_candidate_pair_configs()) { if (candidate.type == IceCandidatePairConfigType::kSelected) { - LoggedRouteChangeEvent route; + InferredRouteChangeEvent route; route.route_id = candidate.candidate_pair_id; route.log_time = Timestamp::ms(candidate.log_time_ms()); diff --git a/logging/rtc_event_log/rtc_event_log_parser.h b/logging/rtc_event_log/rtc_event_log_parser.h index de37d31927..d5ea658be0 100644 --- a/logging/rtc_event_log/rtc_event_log_parser.h +++ b/logging/rtc_event_log/rtc_event_log_parser.h @@ -522,7 +522,7 @@ class ParsedRtcEventLog { std::vector GetIceCandidates() const; std::vector GetIceEvents() const; - std::vector GetRouteChanges() const; + std::vector GetRouteChanges() const; private: bool ParseStreamInternal(