ec81bcd519
This reverts commit e30c27205148b34ba421184efe65f6a0780b436d (https://codereview.webrtc.org/1958053002/) Original reverted cl is in patch set #1. Changes in following patch sets. The cl now also make sure SendPacer starts with the configured bitrate provided in a call to CongestionController::SetBweBitrates)() It turns out that the failing tests in 609816 is due to a bug in the current code that runs the proper at 300kbit regardless of configured start bitrate. 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) BUG=chromium:609816, webrtc:5687 TBR=mflodman@webrtc.org NOTRY=True // Due to bug in android_x86 cq builder.... Review-Url: https://codereview.webrtc.org/1958113003 Cr-Commit-Position: refs/heads/master@{#12688}
79 lines
2.7 KiB
C++
79 lines
2.7 KiB
C++
/*
|
|
* Copyright (c) 2012 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 "webrtc/video/encoder_state_feedback.h"
|
|
|
|
#include "testing/gmock/include/gmock/gmock.h"
|
|
#include "testing/gtest/include/gtest/gtest.h"
|
|
#include "webrtc/modules/utility/include/mock/mock_process_thread.h"
|
|
#include "webrtc/video/vie_encoder.h"
|
|
|
|
using ::testing::NiceMock;
|
|
|
|
namespace webrtc {
|
|
|
|
class MockVieEncoder : public ViEEncoder {
|
|
public:
|
|
explicit MockVieEncoder(ProcessThread* process_thread)
|
|
: ViEEncoder(1, process_thread, nullptr, nullptr) {}
|
|
~MockVieEncoder() {}
|
|
|
|
MOCK_METHOD1(OnReceivedIntraFrameRequest, void(size_t));
|
|
MOCK_METHOD1(OnReceivedSLI, void(uint8_t picture_id));
|
|
MOCK_METHOD1(OnReceivedRPSI, void(uint64_t picture_id));
|
|
};
|
|
|
|
class VieKeyRequestTest : public ::testing::Test {
|
|
public:
|
|
VieKeyRequestTest()
|
|
: encoder_(&process_thread_),
|
|
simulated_clock_(123456789),
|
|
encoder_state_feedback_(
|
|
&simulated_clock_,
|
|
std::vector<uint32_t>(1, VieKeyRequestTest::kSsrc),
|
|
&encoder_) {}
|
|
|
|
protected:
|
|
const uint32_t kSsrc = 1234;
|
|
NiceMock<MockProcessThread> process_thread_;
|
|
MockVieEncoder encoder_;
|
|
SimulatedClock simulated_clock_;
|
|
EncoderStateFeedback encoder_state_feedback_;
|
|
};
|
|
|
|
TEST_F(VieKeyRequestTest, CreateAndTriggerRequests) {
|
|
EXPECT_CALL(encoder_, OnReceivedIntraFrameRequest(0)).Times(1);
|
|
encoder_state_feedback_.OnReceivedIntraFrameRequest(kSsrc);
|
|
|
|
const uint8_t sli_picture_id = 3;
|
|
EXPECT_CALL(encoder_, OnReceivedSLI(sli_picture_id)).Times(1);
|
|
encoder_state_feedback_.OnReceivedSLI(kSsrc, sli_picture_id);
|
|
|
|
const uint64_t rpsi_picture_id = 9;
|
|
EXPECT_CALL(encoder_, OnReceivedRPSI(rpsi_picture_id)).Times(1);
|
|
encoder_state_feedback_.OnReceivedRPSI(kSsrc, rpsi_picture_id);
|
|
}
|
|
|
|
TEST_F(VieKeyRequestTest, TooManyOnReceivedIntraFrameRequest) {
|
|
EXPECT_CALL(encoder_, OnReceivedIntraFrameRequest(0)).Times(1);
|
|
encoder_state_feedback_.OnReceivedIntraFrameRequest(kSsrc);
|
|
encoder_state_feedback_.OnReceivedIntraFrameRequest(kSsrc);
|
|
simulated_clock_.AdvanceTimeMilliseconds(10);
|
|
encoder_state_feedback_.OnReceivedIntraFrameRequest(kSsrc);
|
|
|
|
EXPECT_CALL(encoder_, OnReceivedIntraFrameRequest(0)).Times(1);
|
|
simulated_clock_.AdvanceTimeMilliseconds(300);
|
|
encoder_state_feedback_.OnReceivedIntraFrameRequest(kSsrc);
|
|
encoder_state_feedback_.OnReceivedIntraFrameRequest(kSsrc);
|
|
encoder_state_feedback_.OnReceivedIntraFrameRequest(kSsrc);
|
|
}
|
|
|
|
} // namespace webrtc
|