admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renaming inferred route change events.

Browse Source 
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}
This commit is contained in:
Sebastian Jansson 2019-05-10 16:55:11 +02:00 committed by Commit Bot
parent 2a1f020dd9
commit 52490e345d
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
logging/rtc_event_log/logged_events.h
View File

@ -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 {

9
logging/rtc_event_log/rtc_event_log_parser.cc
View File

@ -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());

2
logging/rtc_event_log/rtc_event_log_parser.h
View File

@ -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(