This reverts commit 6c2c13af06b32778b86950681758a7970d1c5d9e. Reason for revert: Intend to investigate and fix perf problems. Original change's description: > Revert "Reland "Move rtp-specific config out of EncoderSettings."" > > This reverts commit 04dd1768625eb2241d1fb97fd0137897e703e266. > > Reason for revert: Regression in ramp up perf tests. > > Original change's description: > > Reland "Move rtp-specific config out of EncoderSettings." > > > > This is a reland of bc900cb1d1810fcf678fe41cf1e3966daa39c88c > > > > Original change's description: > > > Move rtp-specific config out of EncoderSettings. > > > > > > In VideoSendStream::Config, move payload_name and payload_type from > > > EncoderSettings to Rtp. > > > > > > EncoderSettings now contains configuration for VideoStreamEncoder only, > > > and should perhaps be renamed in a follow up cl. It's no longer > > > passed as an argument to VideoCodecInitializer::SetupCodec. > > > > > > The latter then needs a different way to know the codec type, > > > which is provided by a new codec_type member in VideoEncoderConfig. > > > > > > Bug: webrtc:8830 > > > Change-Id: Ifcc691aef1ee6a95e43c0452c5e630d92a511cd6 > > > Reviewed-on: https://webrtc-review.googlesource.com/62062 > > > Commit-Queue: Niels Moller <nisse@webrtc.org> > > > Reviewed-by: Magnus Jedvert <magjed@webrtc.org> > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Reviewed-by: Rasmus Brandt <brandtr@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#22532} > > > > Bug: webrtc:8830 > > Change-Id: If88ef7d57cdaa4fae3c7b2a97ea5a6e1b833e019 > > Reviewed-on: https://webrtc-review.googlesource.com/63721 > > Reviewed-by: Rasmus Brandt <brandtr@webrtc.org> > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Commit-Queue: Niels Moller <nisse@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#22595} > > TBR=brandtr@webrtc.org,magjed@webrtc.org,nisse@webrtc.org,stefan@webrtc.org > > Bug: webrtc:8830,chromium:827080 > Change-Id: Iaaf146de91ec5c0d741b8efdf143f7e173084fef > Reviewed-on: https://webrtc-review.googlesource.com/65520 > Commit-Queue: Niels Moller <nisse@webrtc.org> > Reviewed-by: Niels Moller <nisse@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22677} TBR=brandtr@webrtc.org,magjed@webrtc.org,nisse@webrtc.org,stefan@webrtc.org # Not skipping CQ checks because original CL landed > 1 day ago. Bug: webrtc:8830, chromium:827080 Change-Id: I9b62987bf5daced90dfeb3ebb6739c80117c487f Reviewed-on: https://webrtc-review.googlesource.com/66862 Commit-Queue: Niels Moller <nisse@webrtc.org> Reviewed-by: Niels Moller <nisse@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22751}
279 lines
12 KiB
C++
279 lines
12 KiB
C++
/*
|
|
* Copyright 2018 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 "modules/video_coding/codecs/vp8/include/vp8.h"
|
|
#include "system_wrappers/include/metrics.h"
|
|
#include "system_wrappers/include/metrics_default.h"
|
|
#include "test/call_test.h"
|
|
#include "test/gtest.h"
|
|
#include "test/rtcp_packet_parser.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class HistogramTest : public test::CallTest {
|
|
protected:
|
|
void VerifyHistogramStats(bool use_rtx, bool use_fec, bool screenshare);
|
|
};
|
|
|
|
void HistogramTest::VerifyHistogramStats(bool use_rtx,
|
|
bool use_fec,
|
|
bool screenshare) {
|
|
class StatsObserver : public test::EndToEndTest,
|
|
public rtc::VideoSinkInterface<VideoFrame> {
|
|
public:
|
|
StatsObserver(bool use_rtx, bool use_fec, bool screenshare)
|
|
: EndToEndTest(kLongTimeoutMs),
|
|
use_rtx_(use_rtx),
|
|
use_fec_(use_fec),
|
|
screenshare_(screenshare),
|
|
// This test uses NACK, so to send FEC we can't use a fake encoder.
|
|
vp8_encoder_(use_fec ? VP8Encoder::Create() : nullptr),
|
|
sender_call_(nullptr),
|
|
receiver_call_(nullptr),
|
|
start_runtime_ms_(-1),
|
|
num_frames_received_(0) {}
|
|
|
|
private:
|
|
void OnFrame(const VideoFrame& video_frame) override {
|
|
// The RTT is needed to estimate |ntp_time_ms| which is used by
|
|
// end-to-end delay stats. Therefore, start counting received frames once
|
|
// |ntp_time_ms| is valid.
|
|
if (video_frame.ntp_time_ms() > 0 &&
|
|
Clock::GetRealTimeClock()->CurrentNtpInMilliseconds() >=
|
|
video_frame.ntp_time_ms()) {
|
|
rtc::CritScope lock(&crit_);
|
|
++num_frames_received_;
|
|
}
|
|
}
|
|
|
|
Action OnSendRtp(const uint8_t* packet, size_t length) override {
|
|
if (MinMetricRunTimePassed() && MinNumberOfFramesReceived())
|
|
observation_complete_.Set();
|
|
|
|
return SEND_PACKET;
|
|
}
|
|
|
|
bool MinMetricRunTimePassed() {
|
|
int64_t now = Clock::GetRealTimeClock()->TimeInMilliseconds();
|
|
if (start_runtime_ms_ == -1) {
|
|
start_runtime_ms_ = now;
|
|
return false;
|
|
}
|
|
int64_t elapsed_sec = (now - start_runtime_ms_) / 1000;
|
|
return elapsed_sec > metrics::kMinRunTimeInSeconds * 2;
|
|
}
|
|
|
|
bool MinNumberOfFramesReceived() const {
|
|
const int kMinRequiredHistogramSamples = 200;
|
|
rtc::CritScope lock(&crit_);
|
|
return num_frames_received_ > kMinRequiredHistogramSamples;
|
|
}
|
|
|
|
void ModifyVideoConfigs(
|
|
VideoSendStream::Config* send_config,
|
|
std::vector<VideoReceiveStream::Config>* receive_configs,
|
|
VideoEncoderConfig* encoder_config) override {
|
|
// NACK
|
|
send_config->rtp.nack.rtp_history_ms = kNackRtpHistoryMs;
|
|
(*receive_configs)[0].rtp.nack.rtp_history_ms = kNackRtpHistoryMs;
|
|
(*receive_configs)[0].renderer = this;
|
|
// FEC
|
|
if (use_fec_) {
|
|
send_config->rtp.ulpfec.ulpfec_payload_type = kUlpfecPayloadType;
|
|
send_config->rtp.ulpfec.red_payload_type = kRedPayloadType;
|
|
send_config->encoder_settings.encoder = vp8_encoder_.get();
|
|
send_config->rtp.payload_name = "VP8";
|
|
encoder_config->codec_type = kVideoCodecVP8;
|
|
(*receive_configs)[0].decoders[0].payload_name = "VP8";
|
|
(*receive_configs)[0].rtp.red_payload_type = kRedPayloadType;
|
|
(*receive_configs)[0].rtp.ulpfec_payload_type = kUlpfecPayloadType;
|
|
}
|
|
// RTX
|
|
if (use_rtx_) {
|
|
send_config->rtp.rtx.ssrcs.push_back(kSendRtxSsrcs[0]);
|
|
send_config->rtp.rtx.payload_type = kSendRtxPayloadType;
|
|
(*receive_configs)[0].rtp.rtx_ssrc = kSendRtxSsrcs[0];
|
|
(*receive_configs)[0]
|
|
.rtp.rtx_associated_payload_types[kSendRtxPayloadType] =
|
|
kFakeVideoSendPayloadType;
|
|
if (use_fec_) {
|
|
send_config->rtp.ulpfec.red_rtx_payload_type = kRtxRedPayloadType;
|
|
(*receive_configs)[0]
|
|
.rtp.rtx_associated_payload_types[kRtxRedPayloadType] =
|
|
kSendRtxPayloadType;
|
|
}
|
|
}
|
|
// RTT needed for RemoteNtpTimeEstimator for the receive stream.
|
|
(*receive_configs)[0].rtp.rtcp_xr.receiver_reference_time_report = true;
|
|
encoder_config->content_type =
|
|
screenshare_ ? VideoEncoderConfig::ContentType::kScreen
|
|
: VideoEncoderConfig::ContentType::kRealtimeVideo;
|
|
}
|
|
|
|
void OnCallsCreated(Call* sender_call, Call* receiver_call) override {
|
|
sender_call_ = sender_call;
|
|
receiver_call_ = receiver_call;
|
|
}
|
|
|
|
void PerformTest() override {
|
|
EXPECT_TRUE(Wait()) << "Timed out waiting for packet to be NACKed.";
|
|
}
|
|
|
|
rtc::CriticalSection crit_;
|
|
const bool use_rtx_;
|
|
const bool use_fec_;
|
|
const bool screenshare_;
|
|
const std::unique_ptr<VideoEncoder> vp8_encoder_;
|
|
Call* sender_call_;
|
|
Call* receiver_call_;
|
|
int64_t start_runtime_ms_;
|
|
int num_frames_received_ RTC_GUARDED_BY(&crit_);
|
|
} test(use_rtx, use_fec, screenshare);
|
|
|
|
metrics::Reset();
|
|
RunBaseTest(&test);
|
|
|
|
std::string video_prefix =
|
|
screenshare ? "WebRTC.Video.Screenshare." : "WebRTC.Video.";
|
|
// The content type extension is disabled in non screenshare test,
|
|
// therefore no slicing on simulcast id should be present.
|
|
std::string video_suffix = screenshare ? ".S0" : "";
|
|
// Verify that stats have been updated once.
|
|
EXPECT_EQ(2, metrics::NumSamples("WebRTC.Call.LifetimeInSeconds"));
|
|
EXPECT_EQ(1, metrics::NumSamples(
|
|
"WebRTC.Call.TimeReceivingVideoRtpPacketsInSeconds"));
|
|
EXPECT_EQ(1, metrics::NumSamples("WebRTC.Call.VideoBitrateReceivedInKbps"));
|
|
EXPECT_EQ(1, metrics::NumSamples("WebRTC.Call.RtcpBitrateReceivedInBps"));
|
|
EXPECT_EQ(1, metrics::NumSamples("WebRTC.Call.BitrateReceivedInKbps"));
|
|
EXPECT_EQ(1, metrics::NumSamples("WebRTC.Call.EstimatedSendBitrateInKbps"));
|
|
EXPECT_EQ(1, metrics::NumSamples("WebRTC.Call.PacerBitrateInKbps"));
|
|
|
|
EXPECT_EQ(1, metrics::NumSamples("WebRTC.Video.SendStreamLifetimeInSeconds"));
|
|
EXPECT_EQ(1,
|
|
metrics::NumSamples("WebRTC.Video.ReceiveStreamLifetimeInSeconds"));
|
|
|
|
EXPECT_EQ(1, metrics::NumSamples("WebRTC.Video.NackPacketsSentPerMinute"));
|
|
EXPECT_EQ(1,
|
|
metrics::NumSamples(video_prefix + "NackPacketsReceivedPerMinute"));
|
|
EXPECT_EQ(1, metrics::NumSamples("WebRTC.Video.FirPacketsSentPerMinute"));
|
|
EXPECT_EQ(1,
|
|
metrics::NumSamples(video_prefix + "FirPacketsReceivedPerMinute"));
|
|
EXPECT_EQ(1, metrics::NumSamples("WebRTC.Video.PliPacketsSentPerMinute"));
|
|
EXPECT_EQ(1,
|
|
metrics::NumSamples(video_prefix + "PliPacketsReceivedPerMinute"));
|
|
|
|
EXPECT_EQ(1, metrics::NumSamples(video_prefix + "KeyFramesSentInPermille"));
|
|
EXPECT_EQ(1, metrics::NumSamples("WebRTC.Video.KeyFramesReceivedInPermille"));
|
|
|
|
EXPECT_EQ(1, metrics::NumSamples(video_prefix + "SentPacketsLostInPercent"));
|
|
EXPECT_EQ(1,
|
|
metrics::NumSamples("WebRTC.Video.ReceivedPacketsLostInPercent"));
|
|
|
|
EXPECT_EQ(1, metrics::NumSamples(video_prefix + "InputWidthInPixels"));
|
|
EXPECT_EQ(1, metrics::NumSamples(video_prefix + "InputHeightInPixels"));
|
|
EXPECT_EQ(1, metrics::NumSamples(video_prefix + "SentWidthInPixels"));
|
|
EXPECT_EQ(1, metrics::NumSamples(video_prefix + "SentHeightInPixels"));
|
|
EXPECT_EQ(1, metrics::NumSamples(video_prefix + "ReceivedWidthInPixels"));
|
|
EXPECT_EQ(1, metrics::NumSamples(video_prefix + "ReceivedHeightInPixels"));
|
|
|
|
EXPECT_EQ(1, metrics::NumEvents(video_prefix + "InputWidthInPixels",
|
|
kDefaultWidth));
|
|
EXPECT_EQ(1, metrics::NumEvents(video_prefix + "InputHeightInPixels",
|
|
kDefaultHeight));
|
|
EXPECT_EQ(
|
|
1, metrics::NumEvents(video_prefix + "SentWidthInPixels", kDefaultWidth));
|
|
EXPECT_EQ(1, metrics::NumEvents(video_prefix + "SentHeightInPixels",
|
|
kDefaultHeight));
|
|
EXPECT_EQ(1, metrics::NumEvents(video_prefix + "ReceivedWidthInPixels",
|
|
kDefaultWidth));
|
|
EXPECT_EQ(1, metrics::NumEvents(video_prefix + "ReceivedHeightInPixels",
|
|
kDefaultHeight));
|
|
|
|
EXPECT_EQ(1, metrics::NumSamples(video_prefix + "InputFramesPerSecond"));
|
|
EXPECT_EQ(1, metrics::NumSamples(video_prefix + "SentFramesPerSecond"));
|
|
EXPECT_EQ(1, metrics::NumSamples("WebRTC.Video.DecodedFramesPerSecond"));
|
|
EXPECT_EQ(1, metrics::NumSamples("WebRTC.Video.RenderFramesPerSecond"));
|
|
|
|
EXPECT_EQ(1, metrics::NumSamples("WebRTC.Video.JitterBufferDelayInMs"));
|
|
EXPECT_EQ(1, metrics::NumSamples("WebRTC.Video.TargetDelayInMs"));
|
|
EXPECT_EQ(1, metrics::NumSamples("WebRTC.Video.CurrentDelayInMs"));
|
|
EXPECT_EQ(1, metrics::NumSamples("WebRTC.Video.OnewayDelayInMs"));
|
|
|
|
EXPECT_EQ(1, metrics::NumSamples(video_prefix + "EndToEndDelayInMs" +
|
|
video_suffix));
|
|
EXPECT_EQ(1, metrics::NumSamples(video_prefix + "EndToEndDelayMaxInMs" +
|
|
video_suffix));
|
|
EXPECT_EQ(1, metrics::NumSamples(video_prefix + "InterframeDelayInMs" +
|
|
video_suffix));
|
|
EXPECT_EQ(1, metrics::NumSamples(video_prefix + "InterframeDelayMaxInMs" +
|
|
video_suffix));
|
|
|
|
EXPECT_EQ(1, metrics::NumSamples("WebRTC.Video.RenderSqrtPixelsPerSecond"));
|
|
|
|
EXPECT_EQ(1, metrics::NumSamples(video_prefix + "EncodeTimeInMs"));
|
|
EXPECT_EQ(1, metrics::NumSamples("WebRTC.Video.DecodeTimeInMs"));
|
|
|
|
EXPECT_EQ(1, metrics::NumSamples(video_prefix + "NumberOfPauseEvents"));
|
|
EXPECT_EQ(1, metrics::NumSamples(video_prefix + "PausedTimeInPercent"));
|
|
|
|
EXPECT_EQ(1, metrics::NumSamples(video_prefix + "BitrateSentInKbps"));
|
|
EXPECT_EQ(1, metrics::NumSamples("WebRTC.Video.BitrateReceivedInKbps"));
|
|
EXPECT_EQ(1, metrics::NumSamples(video_prefix + "MediaBitrateSentInKbps"));
|
|
EXPECT_EQ(1, metrics::NumSamples("WebRTC.Video.MediaBitrateReceivedInKbps"));
|
|
EXPECT_EQ(1, metrics::NumSamples(video_prefix + "PaddingBitrateSentInKbps"));
|
|
EXPECT_EQ(1,
|
|
metrics::NumSamples("WebRTC.Video.PaddingBitrateReceivedInKbps"));
|
|
EXPECT_EQ(
|
|
1, metrics::NumSamples(video_prefix + "RetransmittedBitrateSentInKbps"));
|
|
EXPECT_EQ(1, metrics::NumSamples(
|
|
"WebRTC.Video.RetransmittedBitrateReceivedInKbps"));
|
|
|
|
EXPECT_EQ(1, metrics::NumSamples("WebRTC.Video.SendDelayInMs"));
|
|
EXPECT_EQ(1, metrics::NumSamples(video_prefix + "SendSideDelayInMs"));
|
|
EXPECT_EQ(1, metrics::NumSamples(video_prefix + "SendSideDelayMaxInMs"));
|
|
|
|
int num_rtx_samples = use_rtx ? 1 : 0;
|
|
EXPECT_EQ(num_rtx_samples,
|
|
metrics::NumSamples("WebRTC.Video.RtxBitrateSentInKbps"));
|
|
EXPECT_EQ(num_rtx_samples,
|
|
metrics::NumSamples("WebRTC.Video.RtxBitrateReceivedInKbps"));
|
|
|
|
int num_red_samples = use_fec ? 1 : 0;
|
|
EXPECT_EQ(num_red_samples,
|
|
metrics::NumSamples("WebRTC.Video.FecBitrateSentInKbps"));
|
|
EXPECT_EQ(num_red_samples,
|
|
metrics::NumSamples("WebRTC.Video.FecBitrateReceivedInKbps"));
|
|
EXPECT_EQ(num_red_samples,
|
|
metrics::NumSamples("WebRTC.Video.ReceivedFecPacketsInPercent"));
|
|
}
|
|
|
|
TEST_F(HistogramTest, VerifyHistogramStatsWithRtx) {
|
|
const bool kEnabledRtx = true;
|
|
const bool kEnabledRed = false;
|
|
const bool kScreenshare = false;
|
|
VerifyHistogramStats(kEnabledRtx, kEnabledRed, kScreenshare);
|
|
}
|
|
|
|
TEST_F(HistogramTest, VerifyHistogramStatsWithRed) {
|
|
const bool kEnabledRtx = false;
|
|
const bool kEnabledRed = true;
|
|
const bool kScreenshare = false;
|
|
VerifyHistogramStats(kEnabledRtx, kEnabledRed, kScreenshare);
|
|
}
|
|
|
|
TEST_F(HistogramTest, VerifyHistogramStatsWithScreenshare) {
|
|
const bool kEnabledRtx = false;
|
|
const bool kEnabledRed = false;
|
|
const bool kScreenshare = true;
|
|
VerifyHistogramStats(kEnabledRtx, kEnabledRed, kScreenshare);
|
|
}
|
|
|
|
} // namespace webrtc
|