From d7a076cc8e3f7f13e8b549c9ca0b3224132e411e Mon Sep 17 00:00:00 2001 From: Bjorn Terelius Date: Fri, 25 May 2018 13:36:28 +0200 Subject: [PATCH] Minor type fix in RTC event logging for probing events. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:8111 Change-Id: I61cd5917c62c72571f3318411cb03b7ee74ec4cf Reviewed-on: https://webrtc-review.googlesource.com/78940 Reviewed-by: Elad Alon Commit-Queue: Björn Terelius Cr-Commit-Position: refs/heads/master@{#23399} --- .../events/rtc_event_probe_cluster_created.cc | 8 ++++---- .../events/rtc_event_probe_cluster_created.h | 16 ++++++++-------- .../events/rtc_event_probe_result_failure.cc | 2 +- .../events/rtc_event_probe_result_failure.h | 4 ++-- .../events/rtc_event_probe_result_success.cc | 3 ++- .../events/rtc_event_probe_result_success.h | 6 +++--- 6 files changed, 20 insertions(+), 19 deletions(-) diff --git a/logging/rtc_event_log/events/rtc_event_probe_cluster_created.cc b/logging/rtc_event_log/events/rtc_event_probe_cluster_created.cc index d5dad74122..a8ca59111a 100644 --- a/logging/rtc_event_log/events/rtc_event_probe_cluster_created.cc +++ b/logging/rtc_event_log/events/rtc_event_probe_cluster_created.cc @@ -12,10 +12,10 @@ namespace webrtc { -RtcEventProbeClusterCreated::RtcEventProbeClusterCreated(int id, - int bitrate_bps, - int min_probes, - int min_bytes) +RtcEventProbeClusterCreated::RtcEventProbeClusterCreated(int32_t id, + int32_t bitrate_bps, + uint32_t min_probes, + uint32_t min_bytes) : id_(id), bitrate_bps_(bitrate_bps), min_probes_(min_probes), diff --git a/logging/rtc_event_log/events/rtc_event_probe_cluster_created.h b/logging/rtc_event_log/events/rtc_event_probe_cluster_created.h index 938ba4f32e..aa2e29f881 100644 --- a/logging/rtc_event_log/events/rtc_event_probe_cluster_created.h +++ b/logging/rtc_event_log/events/rtc_event_probe_cluster_created.h @@ -17,20 +17,20 @@ namespace webrtc { class RtcEventProbeClusterCreated final : public RtcEvent { public: - RtcEventProbeClusterCreated(int id, - int bitrate_bps, - int min_probes, - int min_bytes); + RtcEventProbeClusterCreated(int32_t id, + int32_t bitrate_bps, + uint32_t min_probes, + uint32_t min_bytes); ~RtcEventProbeClusterCreated() override = default; Type GetType() const override; bool IsConfigEvent() const override; - const int id_; - const int bitrate_bps_; - const int min_probes_; - const int min_bytes_; + const int32_t id_; + const int32_t bitrate_bps_; + const uint32_t min_probes_; + const uint32_t min_bytes_; }; } // namespace webrtc diff --git a/logging/rtc_event_log/events/rtc_event_probe_result_failure.cc b/logging/rtc_event_log/events/rtc_event_probe_result_failure.cc index 1242ab825a..590d345146 100644 --- a/logging/rtc_event_log/events/rtc_event_probe_result_failure.cc +++ b/logging/rtc_event_log/events/rtc_event_probe_result_failure.cc @@ -13,7 +13,7 @@ namespace webrtc { RtcEventProbeResultFailure::RtcEventProbeResultFailure( - int id, + int32_t id, ProbeFailureReason failure_reason) : id_(id), failure_reason_(failure_reason) {} diff --git a/logging/rtc_event_log/events/rtc_event_probe_result_failure.h b/logging/rtc_event_log/events/rtc_event_probe_result_failure.h index 90ef4dec51..3cd52bc561 100644 --- a/logging/rtc_event_log/events/rtc_event_probe_result_failure.h +++ b/logging/rtc_event_log/events/rtc_event_probe_result_failure.h @@ -24,14 +24,14 @@ enum class ProbeFailureReason { class RtcEventProbeResultFailure final : public RtcEvent { public: - RtcEventProbeResultFailure(int id, ProbeFailureReason failure_reason); + RtcEventProbeResultFailure(int32_t id, ProbeFailureReason failure_reason); ~RtcEventProbeResultFailure() override = default; Type GetType() const override; bool IsConfigEvent() const override; - const int id_; + const int32_t id_; const ProbeFailureReason failure_reason_; }; diff --git a/logging/rtc_event_log/events/rtc_event_probe_result_success.cc b/logging/rtc_event_log/events/rtc_event_probe_result_success.cc index f7b06fe28e..45cdf4dc4e 100644 --- a/logging/rtc_event_log/events/rtc_event_probe_result_success.cc +++ b/logging/rtc_event_log/events/rtc_event_probe_result_success.cc @@ -12,7 +12,8 @@ namespace webrtc { -RtcEventProbeResultSuccess::RtcEventProbeResultSuccess(int id, int bitrate_bps) +RtcEventProbeResultSuccess::RtcEventProbeResultSuccess(int32_t id, + int32_t bitrate_bps) : id_(id), bitrate_bps_(bitrate_bps) {} RtcEvent::Type RtcEventProbeResultSuccess::GetType() const { diff --git a/logging/rtc_event_log/events/rtc_event_probe_result_success.h b/logging/rtc_event_log/events/rtc_event_probe_result_success.h index f8f02164d6..54da8a6e25 100644 --- a/logging/rtc_event_log/events/rtc_event_probe_result_success.h +++ b/logging/rtc_event_log/events/rtc_event_probe_result_success.h @@ -17,15 +17,15 @@ namespace webrtc { class RtcEventProbeResultSuccess final : public RtcEvent { public: - RtcEventProbeResultSuccess(int id, int bitrate_bps); + RtcEventProbeResultSuccess(int32_t id, int32_t bitrate_bps); ~RtcEventProbeResultSuccess() override = default; Type GetType() const override; bool IsConfigEvent() const override; - const int id_; - const int bitrate_bps_; + const int32_t id_; + const int32_t bitrate_bps_; }; } // namespace webrtc