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

StatsEndToEndTests: Remove unneeded fake renderer in tests.

Browse Source 
Bug: none
Change-Id: I1f14fa2e606dde38113560c32640fb6b2996ea14
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/238428
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Commit-Queue: Åsa Persson <asapersson@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#35404}
This commit is contained in:
Asa Persson
2021-11-19 14:07:10 +01:00
committed by WebRTC LUCI CQ
parent f47a724168
commit 6d057976e9
1 changed files with 3 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
video/end_to_end_tests/stats_tests.cc
View File

@ -48,24 +48,13 @@ TEST_F(StatsEndToEndTest, GetStats) {
static const int kStartBitrateBps = 3000000; static const int kStartBitrateBps = 3000000;
static const int kExpectedRenderDelayMs = 20; static const int kExpectedRenderDelayMs = 20;
class ReceiveStreamRenderer : public rtc::VideoSinkInterface<VideoFrame> {
public:
ReceiveStreamRenderer() {}
private:
void OnFrame(const VideoFrame& video_frame) override {}
};
class StatsObserver : public test::EndToEndTest { class StatsObserver : public test::EndToEndTest {
public: public:
StatsObserver() StatsObserver()
: EndToEndTest(kLongTimeoutMs), : EndToEndTest(kLongTimeoutMs), encoder_factory_([]() {
encoder_factory_([]() {
return std::make_unique<test::DelayedEncoder>( return std::make_unique<test::DelayedEncoder>(
Clock::GetRealTimeClock(), 10); Clock::GetRealTimeClock(), 10);
}), }) {}
send_stream_(nullptr),
expected_send_ssrcs_() {}
private: private:
Action OnSendRtp(const uint8_t* packet, size_t length) override { Action OnSendRtp(const uint8_t* packet, size_t length) override {
@ -274,7 +263,6 @@ TEST_F(StatsEndToEndTest, GetStats) {
expected_receive_ssrcs_.push_back( expected_receive_ssrcs_.push_back(
(*receive_configs)[i].rtp.remote_ssrc); (*receive_configs)[i].rtp.remote_ssrc);
(*receive_configs)[i].render_delay_ms = kExpectedRenderDelayMs; (*receive_configs)[i].render_delay_ms = kExpectedRenderDelayMs;
(*receive_configs)[i].renderer = &receive_stream_renderer_;
(*receive_configs)[i].rtp.nack.rtp_history_ms = kNackRtpHistoryMs; (*receive_configs)[i].rtp.nack.rtp_history_ms = kNackRtpHistoryMs;
(*receive_configs)[i].rtp.rtx_ssrc = kSendRtxSsrcs[i]; (*receive_configs)[i].rtp.rtx_ssrc = kSendRtxSsrcs[i];
@ -342,14 +330,13 @@ TEST_F(StatsEndToEndTest, GetStats) {
std::vector<VideoReceiveStream*> receive_streams_; std::vector<VideoReceiveStream*> receive_streams_;
std::map<std::string, bool> receive_stats_filled_; std::map<std::string, bool> receive_stats_filled_;
VideoSendStream* send_stream_; VideoSendStream* send_stream_ = nullptr;
std::map<std::string, bool> send_stats_filled_; std::map<std::string, bool> send_stats_filled_;
std::vector<uint32_t> expected_receive_ssrcs_; std::vector<uint32_t> expected_receive_ssrcs_;
std::set<uint32_t> expected_send_ssrcs_; std::set<uint32_t> expected_send_ssrcs_;
rtc::Event check_stats_event_; rtc::Event check_stats_event_;
ReceiveStreamRenderer receive_stream_renderer_;
TaskQueueBase* task_queue_ = nullptr; TaskQueueBase* task_queue_ = nullptr;
} test; } test;
@ -666,7 +653,6 @@ TEST_F(StatsEndToEndTest, VerifyNackStats) {
VideoEncoderConfig* encoder_config) override { VideoEncoderConfig* encoder_config) override {
send_config->rtp.nack.rtp_history_ms = kNackRtpHistoryMs; send_config->rtp.nack.rtp_history_ms = kNackRtpHistoryMs;
(*receive_configs)[0].rtp.nack.rtp_history_ms = kNackRtpHistoryMs; (*receive_configs)[0].rtp.nack.rtp_history_ms = kNackRtpHistoryMs;
(*receive_configs)[0].renderer = &fake_renderer_;
} }
void OnVideoStreamsCreated( void OnVideoStreamsCreated(
@ -682,7 +668,6 @@ TEST_F(StatsEndToEndTest, VerifyNackStats) {
EXPECT_TRUE(Wait()) << "Timed out waiting for packet to be NACKed."; EXPECT_TRUE(Wait()) << "Timed out waiting for packet to be NACKed.";
} }
test::FakeVideoRenderer fake_renderer_;
Mutex mutex_; Mutex mutex_;
uint64_t sent_rtp_packets_ RTC_GUARDED_BY(&mutex_) = 0; uint64_t sent_rtp_packets_ RTC_GUARDED_BY(&mutex_) = 0;
uint16_t dropped_rtp_packet_ RTC_GUARDED_BY(&mutex_) = 0; uint16_t dropped_rtp_packet_ RTC_GUARDED_BY(&mutex_) = 0;