From 9fe6df086a7d8f9be5db2db3169deefadd9c4032 Mon Sep 17 00:00:00 2001 From: Bjorn Terelius Date: Sat, 26 May 2018 19:11:27 +0200 Subject: [PATCH] Fix confusion between enum types in event log parser. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:9314 Change-Id: I923eacb60a951ca76a387f1cc6d5ffd8d0b41f3d Reviewed-on: https://webrtc-review.googlesource.com/79140 Reviewed-by: Elad Alon Commit-Queue: Björn Terelius Cr-Commit-Position: refs/heads/master@{#23401} --- .../rtc_event_log/rtc_event_log_parser_new.cc | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/logging/rtc_event_log/rtc_event_log_parser_new.cc b/logging/rtc_event_log/rtc_event_log_parser_new.cc index 47c635e8e3..bee0e0d2a2 100644 --- a/logging/rtc_event_log/rtc_event_log_parser_new.cc +++ b/logging/rtc_event_log/rtc_event_log_parser_new.cc @@ -623,55 +623,55 @@ void ParsedRtcEventLogNew::StoreParsedEvent(const rtclog::Event& event) { } break; } - case ParsedRtcEventLogNew::LOG_START: { + case rtclog::Event::LOG_START: { start_log_events_.push_back(LoggedStartEvent(GetTimestamp(event))); break; } - case ParsedRtcEventLogNew::LOG_END: { + case rtclog::Event::LOG_END: { stop_log_events_.push_back(LoggedStopEvent(GetTimestamp(event))); break; } - case ParsedRtcEventLogNew::AUDIO_PLAYOUT_EVENT: { + case rtclog::Event::AUDIO_PLAYOUT_EVENT: { LoggedAudioPlayoutEvent playout_event = GetAudioPlayout(event); audio_playout_events_[playout_event.ssrc].push_back(playout_event); break; } - case ParsedRtcEventLogNew::LOSS_BASED_BWE_UPDATE: { + case rtclog::Event::LOSS_BASED_BWE_UPDATE: { bwe_loss_updates_.push_back(GetLossBasedBweUpdate(event)); break; } - case ParsedRtcEventLogNew::DELAY_BASED_BWE_UPDATE: { + case rtclog::Event::DELAY_BASED_BWE_UPDATE: { bwe_delay_updates_.push_back(GetDelayBasedBweUpdate(event)); break; } - case ParsedRtcEventLogNew::AUDIO_NETWORK_ADAPTATION_EVENT: { + case rtclog::Event::AUDIO_NETWORK_ADAPTATION_EVENT: { LoggedAudioNetworkAdaptationEvent ana_event = GetAudioNetworkAdaptation(event); audio_network_adaptation_events_.push_back(ana_event); break; } - case ParsedRtcEventLogNew::BWE_PROBE_CLUSTER_CREATED_EVENT: { + case rtclog::Event::BWE_PROBE_CLUSTER_CREATED_EVENT: { bwe_probe_cluster_created_events_.push_back( GetBweProbeClusterCreated(event)); break; } - case ParsedRtcEventLogNew::BWE_PROBE_RESULT_EVENT: { + case rtclog::Event::BWE_PROBE_RESULT_EVENT: { bwe_probe_result_events_.push_back(GetBweProbeResult(event)); break; } - case ParsedRtcEventLogNew::ALR_STATE_EVENT: { + case rtclog::Event::ALR_STATE_EVENT: { alr_state_events_.push_back(GetAlrState(event)); break; } - case ParsedRtcEventLogNew::ICE_CANDIDATE_PAIR_CONFIG: { + case rtclog::Event::ICE_CANDIDATE_PAIR_CONFIG: { ice_candidate_pair_configs_.push_back(GetIceCandidatePairConfig(event)); break; } - case ParsedRtcEventLogNew::ICE_CANDIDATE_PAIR_EVENT: { + case rtclog::Event::ICE_CANDIDATE_PAIR_EVENT: { ice_candidate_pair_events_.push_back(GetIceCandidatePairEvent(event)); break; } - case ParsedRtcEventLogNew::UNKNOWN_EVENT: { + case rtclog::Event::UNKNOWN_EVENT: { break; } }