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

Simplify EncoderStateFeedback.

Browse Source 
EncoderStateFeedback is now only connected to one encoder, so remove map
and other complexity to deliver feedback more directly.

BUG=webrtc:5494
R=danilchap@webrtc.org

Review URL: https://codereview.webrtc.org/1706803002 .

Cr-Commit-Position: refs/heads/master@{#11687}
This commit is contained in:
Peter Boström
2016-02-19 17:36:01 +01:00
parent 9674d7cb89
commit 45c44f0b94
4 changed files with 71 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
webrtc/video/encoder_state_feedback_unittest.cc
View File

@ -15,13 +15,10 @@
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "webrtc/base/scoped_ptr.h"
#include "webrtc/modules/bitrate_controller/include/bitrate_controller.h"
#include "webrtc/modules/pacing/paced_sender.h"
#include "webrtc/modules/pacing/packet_router.h"
#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
#include "webrtc/modules/utility/include/mock/mock_process_thread.h"
#include "webrtc/video/payload_router.h"
#include "webrtc/video/vie_encoder.h"
using ::testing::NiceMock;
@ -51,99 +48,33 @@ class MockVieEncoder : public ViEEncoder {
void(uint32_t old_ssrc, uint32_t new_ssrc));
};
class VieKeyRequestTest : public ::testing::Test {
protected:
VieKeyRequestTest()
: pacer_(Clock::GetRealTimeClock(),
&router_,
BitrateController::kDefaultStartBitrateKbps,
PacedSender::kDefaultPaceMultiplier *
BitrateController::kDefaultStartBitrateKbps,
0) {}
virtual void SetUp() {
process_thread_.reset(new NiceMock<MockProcessThread>);
encoder_state_feedback_.reset(new EncoderStateFeedback());
}
rtc::scoped_ptr<MockProcessThread> process_thread_;
rtc::scoped_ptr<EncoderStateFeedback> encoder_state_feedback_;
PacketRouter router_;
PacedSender pacer_;
};
TEST(VieKeyRequestTest, CreateAndTriggerRequests) {
static const uint32_t kSsrc = 1234;
NiceMock<MockProcessThread> process_thread;
PacketRouter router;
PacedSender pacer(Clock::GetRealTimeClock(), &router,
BitrateController::kDefaultStartBitrateKbps,
PacedSender::kDefaultPaceMultiplier *
BitrateController::kDefaultStartBitrateKbps,
0);
MockVieEncoder encoder(&process_thread, &pacer);
TEST_F(VieKeyRequestTest, CreateAndTriggerRequests) {
const int ssrc = 1234;
MockVieEncoder encoder(process_thread_.get(), &pacer_);
encoder_state_feedback_->AddEncoder(std::vector<uint32_t>(1, ssrc), &encoder);
EncoderStateFeedback encoder_state_feedback;
encoder_state_feedback.Init(std::vector<uint32_t>(1, kSsrc), &encoder);
EXPECT_CALL(encoder, OnReceivedIntraFrameRequest(ssrc))
EXPECT_CALL(encoder, OnReceivedIntraFrameRequest(kSsrc))
.Times(1);
encoder_state_feedback_->GetRtcpIntraFrameObserver()->
OnReceivedIntraFrameRequest(ssrc);
encoder_state_feedback.OnReceivedIntraFrameRequest(kSsrc);
const uint8_t sli_picture_id = 3;
EXPECT_CALL(encoder, OnReceivedSLI(ssrc, sli_picture_id))
EXPECT_CALL(encoder, OnReceivedSLI(kSsrc, sli_picture_id))
.Times(1);
encoder_state_feedback_->GetRtcpIntraFrameObserver()->OnReceivedSLI(
ssrc, sli_picture_id);
encoder_state_feedback.OnReceivedSLI(kSsrc, sli_picture_id);
const uint64_t rpsi_picture_id = 9;
EXPECT_CALL(encoder, OnReceivedRPSI(ssrc, rpsi_picture_id))
EXPECT_CALL(encoder, OnReceivedRPSI(kSsrc, rpsi_picture_id))
.Times(1);
encoder_state_feedback_->GetRtcpIntraFrameObserver()->OnReceivedRPSI(
ssrc, rpsi_picture_id);
encoder_state_feedback_->RemoveEncoder(&encoder);
}
// Register multiple encoders and make sure the request is relayed to correct
// ViEEncoder.
TEST_F(VieKeyRequestTest, MultipleEncoders) {
const int ssrc_1 = 1234;
const int ssrc_2 = 5678;
MockVieEncoder encoder_1(process_thread_.get(), &pacer_);
MockVieEncoder encoder_2(process_thread_.get(), &pacer_);
encoder_state_feedback_->AddEncoder(std::vector<uint32_t>(1, ssrc_1),
&encoder_1);
encoder_state_feedback_->AddEncoder(std::vector<uint32_t>(1, ssrc_2),
&encoder_2);
EXPECT_CALL(encoder_1, OnReceivedIntraFrameRequest(ssrc_1))
.Times(1);
EXPECT_CALL(encoder_2, OnReceivedIntraFrameRequest(ssrc_2))
.Times(1);
encoder_state_feedback_->GetRtcpIntraFrameObserver()->
OnReceivedIntraFrameRequest(ssrc_1);
encoder_state_feedback_->GetRtcpIntraFrameObserver()->
OnReceivedIntraFrameRequest(ssrc_2);
const uint8_t sli_pid_1 = 3;
const uint8_t sli_pid_2 = 4;
EXPECT_CALL(encoder_1, OnReceivedSLI(ssrc_1, sli_pid_1))
.Times(1);
EXPECT_CALL(encoder_2, OnReceivedSLI(ssrc_2, sli_pid_2))
.Times(1);
encoder_state_feedback_->GetRtcpIntraFrameObserver()->OnReceivedSLI(
ssrc_1, sli_pid_1);
encoder_state_feedback_->GetRtcpIntraFrameObserver()->OnReceivedSLI(
ssrc_2, sli_pid_2);
const uint64_t rpsi_pid_1 = 9;
const uint64_t rpsi_pid_2 = 10;
EXPECT_CALL(encoder_1, OnReceivedRPSI(ssrc_1, rpsi_pid_1))
.Times(1);
EXPECT_CALL(encoder_2, OnReceivedRPSI(ssrc_2, rpsi_pid_2))
.Times(1);
encoder_state_feedback_->GetRtcpIntraFrameObserver()->OnReceivedRPSI(
ssrc_1, rpsi_pid_1);
encoder_state_feedback_->GetRtcpIntraFrameObserver()->OnReceivedRPSI(
ssrc_2, rpsi_pid_2);
encoder_state_feedback_->RemoveEncoder(&encoder_1);
EXPECT_CALL(encoder_2, OnReceivedIntraFrameRequest(ssrc_2))
.Times(1);
encoder_state_feedback_->GetRtcpIntraFrameObserver()->
OnReceivedIntraFrameRequest(ssrc_2);
encoder_state_feedback_->RemoveEncoder(&encoder_2);
encoder_state_feedback.OnReceivedRPSI(kSsrc, rpsi_picture_id);
}
} // namespace webrtc