28a44564c9
This reverts commit 825eb58d59940a4c3c9837595c4b3b07059c93ca. This Relands the cl reviewed in https://codereview.webrtc.org/1917793002/ patchset #1 is a pure reland. patchset #2 fix an overflow in BitrateProber that caused WebRtcVideoChannel2BaseTest.TwoStreamsSendAndReceive to fail. Original cl description: Remove SendPacer from ViEEncoder This CL moves the logic where the ViEEncoder pause if the pacer is full to the BitrateController. If the queue is full, the controller reports a bitrate of zero to Call (and BitrateAllocator) R=stefan@webrtc.org TBR=mflodman@webrtc.org BUG=webrtc:5687 Review URL: https://codereview.webrtc.org/1947873002 . Cr-Commit-Position: refs/heads/master@{#12630}
112 lines
4.2 KiB
C++
112 lines
4.2 KiB
C++
/*
|
|
* Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#include "testing/gmock/include/gmock/gmock.h"
|
|
#include "testing/gtest/include/gtest/gtest.h"
|
|
#include "webrtc/modules/pacing/mock/mock_paced_sender.h"
|
|
#include "webrtc/modules/congestion_controller/include/congestion_controller.h"
|
|
#include "webrtc/modules/congestion_controller/include/mock/mock_congestion_controller.h"
|
|
#include "webrtc/modules/remote_bitrate_estimator/include/mock/mock_remote_bitrate_observer.h"
|
|
#include "webrtc/system_wrappers/include/clock.h"
|
|
|
|
using testing::_;
|
|
using testing::NiceMock;
|
|
using testing::Return;
|
|
using testing::SaveArg;
|
|
using testing::StrictMock;
|
|
|
|
namespace webrtc {
|
|
namespace test {
|
|
|
|
class CongestionControllerTest : public ::testing::Test {
|
|
protected:
|
|
CongestionControllerTest() : clock_(123456) {}
|
|
~CongestionControllerTest() override {}
|
|
|
|
void SetUp() override {
|
|
EXPECT_CALL(observer_, OnNetworkChanged(_, _, _))
|
|
.WillOnce(SaveArg<0>(&initial_bitrate_bps_));
|
|
|
|
pacer_ = new NiceMock<MockPacedSender>();
|
|
std::unique_ptr<PacedSender> pacer(pacer_); // Passes ownership.
|
|
std::unique_ptr<PacketRouter> packet_router(new PacketRouter());
|
|
controller_.reset(
|
|
new CongestionController(&clock_, &observer_, &remote_bitrate_observer_,
|
|
std::move(packet_router), std::move(pacer)));
|
|
EXPECT_GT(initial_bitrate_bps_, 0u);
|
|
bandwidth_observer_.reset(
|
|
controller_->GetBitrateController()->CreateRtcpBandwidthObserver());
|
|
}
|
|
|
|
SimulatedClock clock_;
|
|
StrictMock<MockCongestionObserver> observer_;
|
|
NiceMock<MockPacedSender>* pacer_;
|
|
NiceMock<MockRemoteBitrateObserver> remote_bitrate_observer_;
|
|
std::unique_ptr<RtcpBandwidthObserver> bandwidth_observer_;
|
|
std::unique_ptr<CongestionController> controller_;
|
|
uint32_t initial_bitrate_bps_ = 0;
|
|
};
|
|
|
|
TEST_F(CongestionControllerTest, OnNetworkChanged) {
|
|
// Test no change.
|
|
clock_.AdvanceTimeMilliseconds(25);
|
|
controller_->Process();
|
|
|
|
EXPECT_CALL(observer_, OnNetworkChanged(initial_bitrate_bps_ * 2, _, _));
|
|
bandwidth_observer_->OnReceivedEstimatedBitrate(initial_bitrate_bps_ * 2);
|
|
clock_.AdvanceTimeMilliseconds(25);
|
|
controller_->Process();
|
|
|
|
EXPECT_CALL(observer_, OnNetworkChanged(initial_bitrate_bps_, _, _));
|
|
bandwidth_observer_->OnReceivedEstimatedBitrate(initial_bitrate_bps_);
|
|
clock_.AdvanceTimeMilliseconds(25);
|
|
controller_->Process();
|
|
}
|
|
|
|
TEST_F(CongestionControllerTest, OnSendQueueFull) {
|
|
EXPECT_CALL(*pacer_, ExpectedQueueTimeMs())
|
|
.WillOnce(Return(PacedSender::kMaxQueueLengthMs + 1));
|
|
|
|
EXPECT_CALL(observer_, OnNetworkChanged(0, _, _));
|
|
controller_->Process();
|
|
|
|
// Let the pacer not be full next time the controller checks.
|
|
EXPECT_CALL(*pacer_, ExpectedQueueTimeMs())
|
|
.WillOnce(Return(PacedSender::kMaxQueueLengthMs - 1));
|
|
|
|
EXPECT_CALL(observer_, OnNetworkChanged(initial_bitrate_bps_, _, _));
|
|
controller_->Process();
|
|
}
|
|
|
|
TEST_F(CongestionControllerTest, OnSendQueueFullAndEstimateChange) {
|
|
EXPECT_CALL(*pacer_, ExpectedQueueTimeMs())
|
|
.WillOnce(Return(PacedSender::kMaxQueueLengthMs + 1));
|
|
EXPECT_CALL(observer_, OnNetworkChanged(0, _, _));
|
|
controller_->Process();
|
|
|
|
// Receive new estimate but let the queue still be full.
|
|
bandwidth_observer_->OnReceivedEstimatedBitrate(initial_bitrate_bps_ * 2);
|
|
EXPECT_CALL(*pacer_, ExpectedQueueTimeMs())
|
|
.WillOnce(Return(PacedSender::kMaxQueueLengthMs + 1));
|
|
clock_.AdvanceTimeMilliseconds(25);
|
|
controller_->Process();
|
|
|
|
// Let the pacer not be full next time the controller checks.
|
|
// |OnNetworkChanged| should be called with the new estimate.
|
|
EXPECT_CALL(*pacer_, ExpectedQueueTimeMs())
|
|
.WillOnce(Return(PacedSender::kMaxQueueLengthMs - 1));
|
|
EXPECT_CALL(observer_, OnNetworkChanged(initial_bitrate_bps_ * 2, _, _));
|
|
clock_.AdvanceTimeMilliseconds(25);
|
|
controller_->Process();
|
|
}
|
|
|
|
} // namespace test
|
|
} // namespace webrtc
|