From 25f0c206df4a6197e8446ece77fe0a107e447dab Mon Sep 17 00:00:00 2001 From: Bjorn Terelius Date: Wed, 2 May 2018 15:54:59 +0200 Subject: [PATCH] Log probing bitrate and cluster id as int32 in event log. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:8111 Change-Id: I0eca0b443f27ece6d2473c5287faa84978eee0dd Reviewed-on: https://webrtc-review.googlesource.com/73800 Reviewed-by: Philip Eliasson Commit-Queue: Björn Terelius Cr-Commit-Position: refs/heads/master@{#23122} --- logging/rtc_event_log/rtc_event_log.proto | 10 +++++----- logging/rtc_event_log/rtc_event_log_parser_new.h | 8 ++++---- logging/rtc_event_log/rtc_event_log_unittest_helper.cc | 10 +++++----- logging/rtc_event_log/rtc_event_log_unittest_helper.h | 10 +++++----- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/logging/rtc_event_log/rtc_event_log.proto b/logging/rtc_event_log/rtc_event_log.proto index bfac4f60dc..94e288e024 100644 --- a/logging/rtc_event_log/rtc_event_log.proto +++ b/logging/rtc_event_log/rtc_event_log.proto @@ -109,7 +109,7 @@ message RtpPacket { optional bytes header = 4; // optional - The probe cluster id. - optional uint32 probe_cluster_id = 5; + optional int32 probe_cluster_id = 5; // Do not add code to log user payload data without a privacy review! } @@ -297,10 +297,10 @@ message AudioNetworkAdaptation { message BweProbeCluster { // required - The id of this probe cluster. - optional uint32 id = 1; + optional int32 id = 1; // required - The bitrate in bps that this probe cluster is meant to probe. - optional uint64 bitrate_bps = 2; + optional int32 bitrate_bps = 2; // required - The minimum number of packets used to probe the given bitrate. optional uint32 min_packets = 3; @@ -311,7 +311,7 @@ message BweProbeCluster { message BweProbeResult { // required - The id of this probe cluster. - optional uint32 id = 1; + optional int32 id = 1; enum ResultType { SUCCESS = 0; @@ -324,7 +324,7 @@ message BweProbeResult { optional ResultType result = 2; // optional - but required if result == SUCCESS. The resulting bitrate in bps. - optional uint64 bitrate_bps = 3; + optional int32 bitrate_bps = 3; } message AlrState { diff --git a/logging/rtc_event_log/rtc_event_log_parser_new.h b/logging/rtc_event_log/rtc_event_log_parser_new.h index dd88608185..19cfcbb639 100644 --- a/logging/rtc_event_log/rtc_event_log_parser_new.h +++ b/logging/rtc_event_log/rtc_event_log_parser_new.h @@ -88,8 +88,8 @@ struct LoggedBweLossBasedUpdate { struct LoggedBweProbeClusterCreatedEvent { int64_t timestamp_us; - uint32_t id; - uint64_t bitrate_bps; + int32_t id; + int32_t bitrate_bps; uint32_t min_packets; uint32_t min_bytes; int64_t log_time_us() const { return timestamp_us; } @@ -98,8 +98,8 @@ struct LoggedBweProbeClusterCreatedEvent { struct LoggedBweProbeResultEvent { int64_t timestamp_us; - uint32_t id; - rtc::Optional bitrate_bps; + int32_t id; + rtc::Optional bitrate_bps; rtc::Optional failure_reason; int64_t log_time_us() const { return timestamp_us; } int64_t log_time_ms() const { return timestamp_us / 1000; } diff --git a/logging/rtc_event_log/rtc_event_log_unittest_helper.cc b/logging/rtc_event_log/rtc_event_log_unittest_helper.cc index 359f4182ff..466069661f 100644 --- a/logging/rtc_event_log/rtc_event_log_unittest_helper.cc +++ b/logging/rtc_event_log/rtc_event_log_unittest_helper.cc @@ -553,8 +553,8 @@ void RtcEventLogTestHelper::VerifyLogEndEvent( void RtcEventLogTestHelper::VerifyBweProbeCluster( const ParsedRtcEventLogNew& parsed_log, size_t index, - uint32_t id, - uint32_t bitrate_bps, + int32_t id, + int32_t bitrate_bps, uint32_t min_probes, uint32_t min_bytes) { ASSERT_LT(index, parsed_log.events_.size()); @@ -578,8 +578,8 @@ void RtcEventLogTestHelper::VerifyBweProbeCluster( void RtcEventLogTestHelper::VerifyProbeResultSuccess( const ParsedRtcEventLogNew& parsed_log, size_t index, - uint32_t id, - uint32_t bitrate_bps) { + int32_t id, + int32_t bitrate_bps) { ASSERT_LT(index, parsed_log.events_.size()); const rtclog::Event& event = parsed_log.events_[index]; ASSERT_TRUE(IsValidBasicEvent(event)); @@ -599,7 +599,7 @@ void RtcEventLogTestHelper::VerifyProbeResultSuccess( void RtcEventLogTestHelper::VerifyProbeResultFailure( const ParsedRtcEventLogNew& parsed_log, size_t index, - uint32_t id, + int32_t id, ProbeFailureReason failure_reason) { ASSERT_LT(index, parsed_log.events_.size()); const rtclog::Event& event = parsed_log.events_[index]; diff --git a/logging/rtc_event_log/rtc_event_log_unittest_helper.h b/logging/rtc_event_log/rtc_event_log_unittest_helper.h index e73b73b42e..d06a7d007f 100644 --- a/logging/rtc_event_log/rtc_event_log_unittest_helper.h +++ b/logging/rtc_event_log/rtc_event_log_unittest_helper.h @@ -72,19 +72,19 @@ class RtcEventLogTestHelper { static void VerifyBweProbeCluster(const ParsedRtcEventLogNew& parsed_log, size_t index, - uint32_t id, - uint32_t bitrate_bps, + int32_t id, + int32_t bitrate_bps, uint32_t min_probes, uint32_t min_bytes); static void VerifyProbeResultSuccess(const ParsedRtcEventLogNew& parsed_log, size_t index, - uint32_t id, - uint32_t bitrate_bps); + int32_t id, + int32_t bitrate_bps); static void VerifyProbeResultFailure(const ParsedRtcEventLogNew& parsed_log, size_t index, - uint32_t id, + int32_t id, ProbeFailureReason failure_reason); };