diff --git a/webrtc/modules/bitrate_controller/bitrate_controller_impl.cc b/webrtc/modules/bitrate_controller/bitrate_controller_impl.cc index cff5dd1854..f1a9b471f3 100644 --- a/webrtc/modules/bitrate_controller/bitrate_controller_impl.cc +++ b/webrtc/modules/bitrate_controller/bitrate_controller_impl.cc @@ -27,7 +27,7 @@ class BitrateControllerImpl::RtcpBandwidthObserverImpl 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 @@ BitrateControllerImpl::FindObserverConfigurationPair(const BitrateObserver* 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 @@ void BitrateControllerImpl::SetReservedBitrate(uint32_t reserved_bitrate_bps) { 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 @@ int32_t BitrateControllerImpl::Process() { } 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::MaybeTriggerOnNetworkChanged() { } } -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; diff --git a/webrtc/modules/bitrate_controller/bitrate_controller_impl.h b/webrtc/modules/bitrate_controller/bitrate_controller_impl.h index aff127bd14..61b2e087cf 100644 --- a/webrtc/modules/bitrate_controller/bitrate_controller_impl.h +++ b/webrtc/modules/bitrate_controller/bitrate_controller_impl.h @@ -37,9 +37,9 @@ class BitrateControllerImpl : public BitrateController { 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 @@ class BitrateControllerImpl : public BitrateController { 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 @@ class BitrateControllerImpl : public BitrateController { // 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_); diff --git a/webrtc/modules/bitrate_controller/bitrate_controller_unittest.cc b/webrtc/modules/bitrate_controller/bitrate_controller_unittest.cc index 040cfec384..6344ee8c05 100644 --- a/webrtc/modules/bitrate_controller/bitrate_controller_unittest.cc +++ b/webrtc/modules/bitrate_controller/bitrate_controller_unittest.cc @@ -43,9 +43,9 @@ class TestBitrateObserver: public BitrateObserver { last_rtt_(0) { } - virtual void OnNetworkChanged(const uint32_t bitrate, - const uint8_t fraction_loss, - const uint32_t rtt) { + virtual void OnNetworkChanged(uint32_t bitrate, + uint8_t fraction_loss, + uint32_t rtt) { last_bitrate_ = bitrate; last_fraction_loss_ = fraction_loss; last_rtt_ = rtt; diff --git a/webrtc/modules/bitrate_controller/include/bitrate_controller.h b/webrtc/modules/bitrate_controller/include/bitrate_controller.h index 46d7830300..8a558f50c8 100644 --- a/webrtc/modules/bitrate_controller/include/bitrate_controller.h +++ b/webrtc/modules/bitrate_controller/include/bitrate_controller.h @@ -29,9 +29,9 @@ class BitrateObserver { * per second. */ public: - virtual void OnNetworkChanged(const uint32_t target_bitrate, - const uint8_t fraction_loss, // 0 - 255. - const uint32_t rtt) = 0; + virtual void OnNetworkChanged(uint32_t target_bitrate, + uint8_t fraction_loss, // 0 - 255. + uint32_t rtt) = 0; virtual ~BitrateObserver() {} }; @@ -67,9 +67,9 @@ class BitrateController : public Module { * max_bitrate_kit = 0 equals no max bitrate. */ virtual void SetBitrateObserver(BitrateObserver* observer, - const uint32_t start_bitrate, - const uint32_t min_bitrate, - const uint32_t max_bitrate) = 0; + uint32_t start_bitrate, + uint32_t min_bitrate, + uint32_t max_bitrate) = 0; virtual void RemoveBitrateObserver(BitrateObserver* observer) = 0; diff --git a/webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.cc b/webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.cc index d238362603..9fb8c1bddc 100644 --- a/webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.cc +++ b/webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.cc @@ -103,7 +103,7 @@ void SendSideBandwidthEstimation::UpdateReceiverEstimate(uint32_t bandwidth) { void SendSideBandwidthEstimation::UpdateReceiverBlock(uint8_t fraction_loss, uint32_t rtt, int number_of_packets, - uint32_t now_ms) { + int64_t now_ms) { if (first_report_time_ms_ == -1) first_report_time_ms_ = now_ms; @@ -163,7 +163,7 @@ void SendSideBandwidthEstimation::UpdateUmaStats(int64_t now_ms, } } -void SendSideBandwidthEstimation::UpdateEstimate(uint32_t now_ms) { +void SendSideBandwidthEstimation::UpdateEstimate(int64_t now_ms) { // We trust the REMB during the first 2 seconds if we haven't had any // packet loss reported, to allow startup bitrate probing. if (ProbingExperimentIsEnabled()) { @@ -230,7 +230,7 @@ bool SendSideBandwidthEstimation::IsInStartPhase(int64_t now_ms) const { now_ms - first_report_time_ms_ < kStartPhaseMs; } -void SendSideBandwidthEstimation::UpdateMinHistory(uint32_t now_ms) { +void SendSideBandwidthEstimation::UpdateMinHistory(int64_t now_ms) { // Remove old data points from history. // Since history precision is in ms, add one so it is able to increase // bitrate if it is off by as little as 0.5ms. diff --git a/webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.h b/webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.h index 67fb0ddf43..b8006e4e22 100644 --- a/webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.h +++ b/webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.h @@ -27,7 +27,7 @@ class SendSideBandwidthEstimation { void CurrentEstimate(uint32_t* bitrate, uint8_t* loss, uint32_t* rtt) const; // Call periodically to update estimate. - void UpdateEstimate(uint32_t now_ms); + void UpdateEstimate(int64_t now_ms); // Call when we receive a RTCP message with TMMBR or REMB. void UpdateReceiverEstimate(uint32_t bandwidth); @@ -36,7 +36,7 @@ class SendSideBandwidthEstimation { void UpdateReceiverBlock(uint8_t fraction_loss, uint32_t rtt, int number_of_packets, - uint32_t now_ms); + int64_t now_ms); void SetSendBitrate(uint32_t bitrate); void SetMinMaxBitrate(uint32_t min_bitrate, uint32_t max_bitrate); @@ -59,9 +59,9 @@ class SendSideBandwidthEstimation { // Updates history of min bitrates. // After this method returns min_bitrate_history_.front().second contains the // min bitrate used during last kBweIncreaseIntervalMs. - void UpdateMinHistory(uint32_t now_ms); + void UpdateMinHistory(int64_t now_ms); - std::deque > min_bitrate_history_; + std::deque > min_bitrate_history_; // incoming filters int accumulate_lost_packets_Q8_; @@ -71,12 +71,12 @@ class SendSideBandwidthEstimation { uint32_t min_bitrate_configured_; uint32_t max_bitrate_configured_; - uint32_t time_last_receiver_block_ms_; + int64_t time_last_receiver_block_ms_; uint8_t last_fraction_loss_; uint16_t last_round_trip_time_ms_; uint32_t bwe_incoming_; - uint32_t time_last_decrease_ms_; + int64_t time_last_decrease_ms_; int64_t first_report_time_ms_; int initially_lost_packets_; int bitrate_at_2_seconds_kbps_; diff --git a/webrtc/video_engine/vie_encoder.cc b/webrtc/video_engine/vie_encoder.cc index 6c2f2011b8..a1ab46b76d 100644 --- a/webrtc/video_engine/vie_encoder.cc +++ b/webrtc/video_engine/vie_encoder.cc @@ -96,9 +96,9 @@ class ViEBitrateObserver : public BitrateObserver { } virtual ~ViEBitrateObserver() {} // Implements BitrateObserver. - virtual void OnNetworkChanged(const uint32_t bitrate_bps, - const uint8_t fraction_lost, - const uint32_t rtt) { + virtual void OnNetworkChanged(uint32_t bitrate_bps, + uint8_t fraction_lost, + uint32_t rtt) { owner_->OnNetworkChanged(bitrate_bps, fraction_lost, rtt); } private: @@ -865,9 +865,9 @@ void ViEEncoder::SetMinTransmitBitrate(int min_transmit_bitrate_kbps) { } // Called from ViEBitrateObserver. -void ViEEncoder::OnNetworkChanged(const uint32_t bitrate_bps, - const uint8_t fraction_lost, - const uint32_t round_trip_time_ms) { +void ViEEncoder::OnNetworkChanged(uint32_t bitrate_bps, + uint8_t fraction_lost, + uint32_t round_trip_time_ms) { LOG(LS_VERBOSE) << "OnNetworkChanged, bitrate" << bitrate_bps << " packet loss " << fraction_lost << " rtt " << round_trip_time_ms; diff --git a/webrtc/video_engine/vie_encoder.h b/webrtc/video_engine/vie_encoder.h index 896806c974..9ef6426a7c 100644 --- a/webrtc/video_engine/vie_encoder.h +++ b/webrtc/video_engine/vie_encoder.h @@ -179,9 +179,9 @@ class ViEEncoder protected: // Called by BitrateObserver. - void OnNetworkChanged(const uint32_t bitrate_bps, - const uint8_t fraction_lost, - const uint32_t round_trip_time_ms); + void OnNetworkChanged(uint32_t bitrate_bps, + uint8_t fraction_lost, + uint32_t round_trip_time_ms); // Called by PacedSender. bool TimeToSendPacket(uint32_t ssrc, uint16_t sequence_number,