commit edeea91803eac26f6a229e88a7045797d2af61b7
author stefan@webrtc.org <stefan@webrtc.org> Mon Dec 08 19:46:23 2014 +0000
committer stefan@webrtc.org <stefan@webrtc.org> Mon Dec 08 19:46:23 2014 +0000
tree 9d38e274e9eadc74c37ad859bdaba3634a2b702c
parent fcbe36a1d984e2f62086f621984cdb96adaa5b7a

Change all system clock types to int64_t in bitrate_controller.

They are both compared to int64_t types inside the class, and is being called
with int64_t types. Could possibly cause bugs.

R=pbos@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/33529004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7832 4adac7df-926f-26a2-2b94-8c16560cd09d

webrtc/modules/bitrate_controller/bitrate_controller_impl.cc

diff --git a/webrtc/modules/bitrate_controller/bitrate_controller_impl.cc b/webrtc/modules/bitrate_controller/bitrate_controller_impl.cc
index cff5dd1..f1a9b47 100644
--- a/webrtc/modules/bitrate_controller/bitrate_controller_impl.cc
+++ b/webrtc/modules/bitrate_controller/bitrate_controller_impl.cc
@@ -27,7 +27,7 @@
   virtual ~RtcpBandwidthObserverImpl() {
   }
   // Received RTCP REMB or TMMBR.
-  virtual void OnReceivedEstimatedBitrate(const uint32_t bitrate) OVERRIDE {
+  virtual void OnReceivedEstimatedBitrate(uint32_t bitrate) OVERRIDE {
     owner_->OnReceivedEstimatedBitrate(bitrate);
   }
   // Received RTCP receiver block.
@@ -126,9 +126,9 @@
 
 void BitrateControllerImpl::SetBitrateObserver(
     BitrateObserver* observer,
-    const uint32_t start_bitrate,
-    const uint32_t min_bitrate,
-    const uint32_t max_bitrate) {
+    uint32_t start_bitrate,
+    uint32_t min_bitrate,
+    uint32_t max_bitrate) {
   CriticalSectionScoped cs(critsect_);
 
   BitrateObserverConfList::iterator it = FindObserverConfigurationPair(
@@ -217,7 +217,7 @@
   MaybeTriggerOnNetworkChanged();
 }
 
-void BitrateControllerImpl::OnReceivedEstimatedBitrate(const uint32_t bitrate) {
+void BitrateControllerImpl::OnReceivedEstimatedBitrate(uint32_t bitrate) {
   CriticalSectionScoped cs(critsect_);
   bandwidth_estimation_.UpdateReceiverEstimate(bitrate);
   MaybeTriggerOnNetworkChanged();
@@ -244,10 +244,10 @@
 }
 
 void BitrateControllerImpl::OnReceivedRtcpReceiverReport(
-    const uint8_t fraction_loss,
-    const uint32_t rtt,
-    const int number_of_packets,
-    const uint32_t now_ms) {
+    uint8_t fraction_loss,
+    uint32_t rtt,
+    int number_of_packets,
+    int64_t now_ms) {
   CriticalSectionScoped cs(critsect_);
   bandwidth_estimation_.UpdateReceiverBlock(
       fraction_loss, rtt, number_of_packets, now_ms);
@@ -277,9 +277,9 @@
   }
 }
 
-void BitrateControllerImpl::OnNetworkChanged(const uint32_t bitrate,
-                                             const uint8_t fraction_loss,
-                                             const uint32_t rtt) {
+void BitrateControllerImpl::OnNetworkChanged(uint32_t bitrate,
+                                             uint8_t fraction_loss,
+                                             uint32_t rtt) {
   // Sanity check.
   if (bitrate_observers_.empty())
     return;