zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Deprecated the Get BitrateController method

Browse Source 
GetBandwidthObserver should be used instead as it exposes a smaller interface.

Bug: webrtc:8415
Change-Id: I29ca795657e205186d7ebd929e756038a294b5f7
Reviewed-on: https://webrtc-review.googlesource.com/23900
Reviewed-by: Björn Terelius <terelius@webrtc.org>
Reviewed-by: Stefan Holmer <stefan@webrtc.org>
Commit-Queue: Sebastian Jansson <srte@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20871}
This commit is contained in:
srte
2017-11-22 19:37:43 +01:00
committed by Commit Bot
parent 012b56b5d4
commit a6092a9ea7
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
call/call.cc
View File

@ -912,8 +912,7 @@ Call::Stats Call::GetStats() const {
Stats stats; Stats stats;
// Fetch available send/receive bitrates. // Fetch available send/receive bitrates.
uint32_t send_bandwidth = 0; uint32_t send_bandwidth = 0;
transport_send_->send_side_cc()->GetBitrateController()->AvailableBandwidth( transport_send_->send_side_cc()->AvailableBandwidth(&send_bandwidth);
&send_bandwidth);
std::vector<unsigned int> ssrcs; std::vector<unsigned int> ssrcs;
uint32_t recv_bandwidth = 0; uint32_t recv_bandwidth = 0;
receive_side_cc_.GetRemoteBitrateEstimator(false)->LatestEstimate( receive_side_cc_.GetRemoteBitrateEstimator(false)->LatestEstimate(

6
modules/congestion_controller/include/send_side_congestion_controller.h
View File

@ -86,8 +86,12 @@ class SendSideCongestionController : public CallStatsObserver,
virtual void SignalNetworkState(NetworkState state); virtual void SignalNetworkState(NetworkState state);
virtual void SetTransportOverhead(size_t transport_overhead_bytes_per_packet); virtual void SetTransportOverhead(size_t transport_overhead_bytes_per_packet);
virtual BitrateController* GetBitrateController() const; // Deprecated: Use GetBandwidthObserver instead.
RTC_DEPRECATED virtual BitrateController* GetBitrateController() const;
virtual RtcpBandwidthObserver* GetBandwidthObserver() const; virtual RtcpBandwidthObserver* GetBandwidthObserver() const;
virtual bool AvailableBandwidth(uint32_t* bandwidth) const;
virtual int64_t GetPacerQueuingDelayMs() const; virtual int64_t GetPacerQueuingDelayMs() const;
virtual int64_t GetFirstPacketTimeMs() const; virtual int64_t GetFirstPacketTimeMs() const;

5
modules/congestion_controller/send_side_congestion_controller.cc
View File

@ -212,6 +212,11 @@ BitrateController* SendSideCongestionController::GetBitrateController() const {
return bitrate_controller_.get(); return bitrate_controller_.get();
} }
bool SendSideCongestionController::AvailableBandwidth(
uint32_t* bandwidth) const {
return bitrate_controller_->AvailableBandwidth(bandwidth);
}
RtcpBandwidthObserver* SendSideCongestionController::GetBandwidthObserver() RtcpBandwidthObserver* SendSideCongestionController::GetBandwidthObserver()
const { const {
return bitrate_controller_.get(); return bitrate_controller_.get();