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.h

diff --git a/webrtc/modules/bitrate_controller/bitrate_controller_impl.h b/webrtc/modules/bitrate_controller/bitrate_controller_impl.h
index aff127b..61b2e08 100644
--- a/webrtc/modules/bitrate_controller/bitrate_controller_impl.h
+++ b/webrtc/modules/bitrate_controller/bitrate_controller_impl.h
@@ -37,9 +37,9 @@
   virtual RtcpBandwidthObserver* CreateRtcpBandwidthObserver() OVERRIDE;
 
   virtual void SetBitrateObserver(BitrateObserver* observer,
-                                  const uint32_t start_bitrate,
-                                  const uint32_t min_bitrate,
-                                  const uint32_t max_bitrate) OVERRIDE;
+                                  uint32_t start_bitrate,
+                                  uint32_t min_bitrate,
+                                  uint32_t max_bitrate) OVERRIDE;
 
   virtual void RemoveBitrateObserver(BitrateObserver* observer) OVERRIDE;
 
@@ -80,18 +80,18 @@
   void UpdateMinMaxBitrate() EXCLUSIVE_LOCKS_REQUIRED(*critsect_);
 
   // Called by BitrateObserver's direct from the RTCP module.
-  void OnReceivedEstimatedBitrate(const uint32_t bitrate);
+  void OnReceivedEstimatedBitrate(uint32_t bitrate);
 
-  void OnReceivedRtcpReceiverReport(const uint8_t fraction_loss,
-                                    const uint32_t rtt,
-                                    const int number_of_packets,
-                                    const uint32_t now_ms);
+  void OnReceivedRtcpReceiverReport(uint8_t fraction_loss,
+                                    uint32_t rtt,
+                                    int number_of_packets,
+                                    int64_t now_ms);
 
   void MaybeTriggerOnNetworkChanged() EXCLUSIVE_LOCKS_REQUIRED(*critsect_);
 
-  void OnNetworkChanged(const uint32_t bitrate,
-                        const uint8_t fraction_loss,  // 0 - 255.
-                        const uint32_t rtt)
+  void OnNetworkChanged(uint32_t bitrate,
+                        uint8_t fraction_loss,  // 0 - 255.
+                        uint32_t rtt)
       EXCLUSIVE_LOCKS_REQUIRED(*critsect_);
 
   void NormalRateAllocation(uint32_t bitrate,
@@ -113,7 +113,7 @@
 
   // Used by process thread.
   Clock* clock_;
-  uint32_t last_bitrate_update_ms_;
+  int64_t last_bitrate_update_ms_;
 
   CriticalSectionWrapper* critsect_;
   SendSideBandwidthEstimation bandwidth_estimation_ GUARDED_BY(*critsect_);