| commit | 2cd5feda58b09ba22d78a1d442c3eb345b9f8f61 | [log] [tgz] |
|---|---|---|
| author | lliuu <lliuu@webrtc.org> | Mon Aug 28 20:01:45 2017 |
| committer | Commit Bot <commit-bot@chromium.org> | Mon Aug 28 20:31:58 2017 |
| tree | c2914d8cc5b1eecdb28f5fde2856bed617539731 | |
| parent | d1f9dfcd0f69fdf9f7dd84442fabc5b9e11dbd7e [diff] |
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 <niklas.enbom@webrtc.org> Commit-Queue: Lu Liu <lliuu@webrtc.org> Cr-Original-Commit-Position: refs/heads/master@{#19567} Cr-Mirrored-From: https://chromium.googlesource.com/external/webrtc Cr-Mirrored-Commit: ff2824b917f6a01473bd4c7c2a201defe3c261a5
diff --git a/modules/audio_coding/audio_network_adaptor/bitrate_controller.cc b/modules/audio_coding/audio_network_adaptor/bitrate_controller.cc index 23db2cd..b585ce3 100644 --- a/modules/audio_coding/audio_network_adaptor/bitrate_controller.cc +++ b/modules/audio_coding/audio_network_adaptor/bitrate_controller.cc
@@ -55,7 +55,8 @@ 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<int>(*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<int>(bitrate_bps_);
diff --git a/modules/audio_coding/neteq/statistics_calculator.cc b/modules/audio_coding/neteq/statistics_calculator.cc index d7d1644..e47f92f 100644 --- a/modules/audio_coding/neteq/statistics_calculator.cc +++ b/modules/audio_coding/neteq/statistics_calculator.cc
@@ -282,7 +282,8 @@ discarded_secondary_packets_ * samples_per_packet; stats->secondary_discarded_rate = CalculateQ14Ratio( discarded_secondary_samples, - discarded_secondary_samples + secondary_decoded_samples_); + static_cast<uint32_t>(discarded_secondary_samples + + secondary_decoded_samples_)); if (waiting_times_.size() == 0) { stats->mean_waiting_time_ms = -1;