Use int64_t more consistently for times, in particular for RTT values.
Existing code was inconsistent about whether to use uint16_t, int, unsigned int,
or uint32_t, and sometimes silently truncated one to another, or truncated
int64_t. Because most core time-handling functions use int64_t, being
consistent about using int64_t unless otherwise necessary minimizes the number
of explicit or implicit casts.
BUG=chromium:81439
TEST=none
R=henrik.lundin@webrtc.org, holmer@google.com, tommi@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/31349004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8045 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/webrtc/modules/bitrate_controller/bitrate_controller_impl.cc b/webrtc/modules/bitrate_controller/bitrate_controller_impl.cc
index 605190d..acfeb59 100644
--- a/webrtc/modules/bitrate_controller/bitrate_controller_impl.cc
+++ b/webrtc/modules/bitrate_controller/bitrate_controller_impl.cc
@@ -33,7 +33,7 @@
// Received RTCP receiver block.
virtual void OnReceivedRtcpReceiverReport(
const ReportBlockList& report_blocks,
- uint16_t rtt,
+ int64_t rtt,
int64_t now_ms) OVERRIDE {
if (report_blocks.empty())
return;
@@ -153,7 +153,7 @@
}
uint32_t current_estimate;
uint8_t loss;
- uint32_t rtt;
+ int64_t rtt;
bandwidth_estimation_.CurrentEstimate(¤t_estimate, &loss, &rtt);
bandwidth_estimation_.SetSendBitrate(std::max(sum_start_bitrate,
current_estimate));
@@ -252,7 +252,7 @@
void BitrateControllerImpl::OnReceivedRtcpReceiverReport(
uint8_t fraction_loss,
- uint32_t rtt,
+ int64_t rtt,
int number_of_packets,
int64_t now_ms) {
CriticalSectionScoped cs(critsect_);
@@ -264,7 +264,7 @@
void BitrateControllerImpl::MaybeTriggerOnNetworkChanged() {
uint32_t bitrate;
uint8_t fraction_loss;
- uint32_t rtt;
+ int64_t rtt;
bandwidth_estimation_.CurrentEstimate(&bitrate, &fraction_loss, &rtt);
bitrate -= std::min(bitrate, reserved_bitrate_bps_);
@@ -286,7 +286,7 @@
void BitrateControllerImpl::OnNetworkChanged(uint32_t bitrate,
uint8_t fraction_loss,
- uint32_t rtt) {
+ int64_t rtt) {
// Sanity check.
if (bitrate_observers_.empty())
return;
@@ -304,7 +304,7 @@
void BitrateControllerImpl::NormalRateAllocation(uint32_t bitrate,
uint8_t fraction_loss,
- uint32_t rtt,
+ int64_t rtt,
uint32_t sum_min_bitrates) {
uint32_t number_of_observers = bitrate_observers_.size();
uint32_t bitrate_per_observer = (bitrate - sum_min_bitrates) /
@@ -344,7 +344,7 @@
void BitrateControllerImpl::LowRateAllocation(uint32_t bitrate,
uint8_t fraction_loss,
- uint32_t rtt,
+ int64_t rtt,
uint32_t sum_min_bitrates) {
if (enforce_min_bitrate_) {
// Min bitrate to all observers.
@@ -375,7 +375,7 @@
CriticalSectionScoped cs(critsect_);
uint32_t bitrate;
uint8_t fraction_loss;
- uint32_t rtt;
+ int64_t rtt;
bandwidth_estimation_.CurrentEstimate(&bitrate, &fraction_loss, &rtt);
if (bitrate) {
*bandwidth = bitrate - std::min(bitrate, reserved_bitrate_bps_);