From 52490e345d2885b395ea345e60374df06dea3e92 Mon Sep 17 00:00:00 2001
From: Sebastian Jansson <srte@webrtc.org>
Date: Fri, 10 May 2019 16:55:11 +0200
Subject: [PATCH] Renaming inferred route change events.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This prepares for adding a logged event for route changes.

Bug: webrtc:10614
Change-Id: Iee989e029530c991da38697a30e0a585316d9a05
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/135951
Commit-Queue: Sebastian Jansson <srte@webrtc.org>
Reviewed-by: Björn Terelius <terelius@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27915}
---
 logging/rtc_event_log/logged_events.h         | 4 +++-
 logging/rtc_event_log/rtc_event_log_parser.cc | 9 +++++----
 logging/rtc_event_log/rtc_event_log_parser.h  | 2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

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<OverheadChangeEvent> GetOverheadChangingEvents(
-    const std::vector<LoggedRouteChangeEvent>& route_changes,
+    const std::vector<InferredRouteChangeEvent>& route_changes,
     PacketDirection direction) {
   std::vector<OverheadChangeEvent> overheads;
   for (auto& event : route_changes) {
@@ -1881,11 +1881,12 @@ ParsedRtcEventLog::MediaType ParsedRtcEventLog::GetMediaType(
   return MediaType::ANY;
 }
 
-std::vector<LoggedRouteChangeEvent> ParsedRtcEventLog::GetRouteChanges() const {
-  std::vector<LoggedRouteChangeEvent> route_changes;
+std::vector<InferredRouteChangeEvent> ParsedRtcEventLog::GetRouteChanges()
+    const {
+  std::vector<InferredRouteChangeEvent> 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<LoggedIceCandidatePairConfig> GetIceCandidates() const;
   std::vector<LoggedIceEvent> GetIceEvents() const;
 
-  std::vector<LoggedRouteChangeEvent> GetRouteChanges() const;
+  std::vector<InferredRouteChangeEvent> GetRouteChanges() const;
 
  private:
   bool ParseStreamInternal(