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

Deprecated BitrateController::CreateRtcpBandwidthObserver.

Browse Source 
The RtcpBandwidthObserverImpl did not provide any features that a raw pointer does not have. deprecating it to simplify further refactoring down the line. Preferring raw pointer usage as it provides equivalent functionality in less code.


Bug: webrtc:8415
Change-Id: Id2c4c73a331835f124da8d308615ca2ce34b2d1b
Reviewed-on: https://webrtc-review.googlesource.com/22500
Reviewed-by: Björn Terelius <terelius@webrtc.org>
Reviewed-by: Fredrik Solenberg <solenberg@webrtc.org>
Reviewed-by: Erik Språng <sprang@webrtc.org>
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Commit-Queue: Sebastian Jansson <srte@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20712}
This commit is contained in:
Sebastian Jansson
2017-11-15 17:22:16 +01:00
committed by Commit Bot
parent 90657302be
commit 8d9c5406c7
13 changed files with 35 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/bitrate_controller/bitrate_controller_unittest.cc
View File

@ -73,7 +73,7 @@ class BitrateControllerTest : public ::testing::Test {
EXPECT_EQ(kStartBitrateBps, bitrate_observer_.last_bitrate_);
controller_->SetMinMaxBitrate(kMinBitrateBps, kMaxBitrateBps);
EXPECT_EQ(kStartBitrateBps, bitrate_observer_.last_bitrate_);
bandwidth_observer_.reset(controller_->CreateRtcpBandwidthObserver());
bandwidth_observer_ = controller_.get();
}
virtual void TearDown() {
@ -89,7 +89,7 @@ class BitrateControllerTest : public ::testing::Test {
webrtc::SimulatedClock clock_;
TestBitrateObserver bitrate_observer_;
std::unique_ptr<BitrateController> controller_;
std::unique_ptr<RtcpBandwidthObserver> bandwidth_observer_;
RtcpBandwidthObserver* bandwidth_observer_;
testing::NiceMock<webrtc::MockRtcEventLog> event_log_;
};
@ -195,8 +195,7 @@ TEST_F(BitrateControllerTest, OneBitrateObserverTwoRtcpObservers) {
bandwidth_observer_->OnReceivedRtcpReceiverReport(report_blocks, 50, time_ms);
time_ms += 500;
RtcpBandwidthObserver* second_bandwidth_observer =
controller_->CreateRtcpBandwidthObserver();
RtcpBandwidthObserver* second_bandwidth_observer = controller_.get();
report_blocks = {CreateReportBlock(kSenderSsrc2, kMediaSsrc2, 0, 21)};
second_bandwidth_observer->OnReceivedRtcpReceiverReport(
report_blocks, 100, time_ms);
@ -273,7 +272,6 @@ TEST_F(BitrateControllerTest, OneBitrateObserverTwoRtcpObservers) {
// Min cap.
bandwidth_observer_->OnReceivedEstimatedBitrate(1000);
EXPECT_EQ(100000, bitrate_observer_.last_bitrate_);
delete second_bandwidth_observer;
}
TEST_F(BitrateControllerTest, OneBitrateObserverMultipleReportBlocks) {