From ff2824b917f6a01473bd4c7c2a201defe3c261a5 Mon Sep 17 00:00:00 2001 From: lliuu Date: Mon, 28 Aug 2017 13:01:45 -0700 Subject: [PATCH] Fix compiler warnings due to type mismatch. BUG=webrtc:8169 Change-Id: Ie98dcaa09e1e5b7c9f48410cd3049740ccac67b9 Reviewed-on: https://chromium-review.googlesource.com/639314 Reviewed-by: Niklas Enbom Commit-Queue: Lu Liu Cr-Commit-Position: refs/heads/master@{#19567} --- .../audio_coding/audio_network_adaptor/bitrate_controller.cc | 3 ++- webrtc/modules/audio_coding/neteq/statistics_calculator.cc | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/bitrate_controller.cc b/webrtc/modules/audio_coding/audio_network_adaptor/bitrate_controller.cc index 23db2cdd0c..b585ce3ec0 100644 --- a/webrtc/modules/audio_coding/audio_network_adaptor/bitrate_controller.cc +++ b/webrtc/modules/audio_coding/audio_network_adaptor/bitrate_controller.cc @@ -55,7 +55,8 @@ void BitrateController::MakeDecision(AudioEncoderRuntimeConfig* config) { if (config->frame_length_ms) frame_length_ms_ = *config->frame_length_ms; int overhead_rate_bps = - *overhead_bytes_per_packet_ * 8 * 1000 / frame_length_ms_; + static_cast(*overhead_bytes_per_packet_ * 8 * 1000 / + frame_length_ms_); bitrate_bps_ = std::max(0, *target_audio_bitrate_bps_ - overhead_rate_bps); } config->bitrate_bps = rtc::Optional(bitrate_bps_); diff --git a/webrtc/modules/audio_coding/neteq/statistics_calculator.cc b/webrtc/modules/audio_coding/neteq/statistics_calculator.cc index d7d1644aae..e47f92fe97 100644 --- a/webrtc/modules/audio_coding/neteq/statistics_calculator.cc +++ b/webrtc/modules/audio_coding/neteq/statistics_calculator.cc @@ -282,7 +282,8 @@ void StatisticsCalculator::GetNetworkStatistics( discarded_secondary_packets_ * samples_per_packet; stats->secondary_discarded_rate = CalculateQ14Ratio( discarded_secondary_samples, - discarded_secondary_samples + secondary_decoded_samples_); + static_cast(discarded_secondary_samples + + secondary_decoded_samples_)); if (waiting_times_.size() == 0) { stats->mean_waiting_time_ms = -1;