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}
201 lines
7.5 KiB
C++
201 lines
7.5 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 "media/engine/internaldecoderfactory.h"
|
|
#include "media/engine/internalencoderfactory.h"
|
|
#include "modules/video_coding/codecs/h264/include/h264.h"
|
|
#include "modules/video_coding/codecs/multiplex/include/multiplex_decoder_adapter.h"
|
|
#include "modules/video_coding/codecs/multiplex/include/multiplex_encoder_adapter.h"
|
|
#include "modules/video_coding/codecs/vp8/include/vp8.h"
|
|
#include "modules/video_coding/codecs/vp9/include/vp9.h"
|
|
#include "test/call_test.h"
|
|
#include "test/encoder_settings.h"
|
|
#include "test/field_trial.h"
|
|
#include "test/gtest.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class CodecEndToEndTest : public test::CallTest,
|
|
public testing::WithParamInterface<std::string> {
|
|
public:
|
|
CodecEndToEndTest() : field_trial_(GetParam()) {}
|
|
|
|
virtual ~CodecEndToEndTest() {
|
|
EXPECT_EQ(nullptr, video_send_stream_);
|
|
EXPECT_TRUE(video_receive_streams_.empty());
|
|
}
|
|
|
|
private:
|
|
test::ScopedFieldTrials field_trial_;
|
|
};
|
|
|
|
INSTANTIATE_TEST_CASE_P(RoundRobin,
|
|
CodecEndToEndTest,
|
|
::testing::Values("WebRTC-RoundRobinPacing/Disabled/",
|
|
"WebRTC-RoundRobinPacing/Enabled/"));
|
|
|
|
class CodecObserver : public test::EndToEndTest,
|
|
public rtc::VideoSinkInterface<VideoFrame> {
|
|
public:
|
|
CodecObserver(int no_frames_to_wait_for,
|
|
VideoRotation rotation_to_test,
|
|
const std::string& payload_name,
|
|
std::unique_ptr<webrtc::VideoEncoder> encoder,
|
|
std::unique_ptr<webrtc::VideoDecoder> decoder)
|
|
: EndToEndTest(4 * CodecEndToEndTest::kDefaultTimeoutMs),
|
|
// TODO(hta): This timeout (120 seconds) is excessive.
|
|
// https://bugs.webrtc.org/6830
|
|
no_frames_to_wait_for_(no_frames_to_wait_for),
|
|
expected_rotation_(rotation_to_test),
|
|
payload_name_(payload_name),
|
|
encoder_(std::move(encoder)),
|
|
decoder_(std::move(decoder)),
|
|
frame_counter_(0) {}
|
|
|
|
void PerformTest() override {
|
|
EXPECT_TRUE(Wait())
|
|
<< "Timed out while waiting for enough frames to be decoded.";
|
|
}
|
|
|
|
void ModifyVideoConfigs(
|
|
VideoSendStream::Config* send_config,
|
|
std::vector<VideoReceiveStream::Config>* receive_configs,
|
|
VideoEncoderConfig* encoder_config) override {
|
|
encoder_config->codec_type = PayloadStringToCodecType(payload_name_);
|
|
send_config->encoder_settings.encoder = encoder_.get();
|
|
send_config->rtp.payload_name = payload_name_;
|
|
send_config->rtp.payload_type = test::CallTest::kVideoSendPayloadType;
|
|
|
|
(*receive_configs)[0].renderer = this;
|
|
(*receive_configs)[0].decoders.resize(1);
|
|
(*receive_configs)[0].decoders[0].payload_type =
|
|
send_config->rtp.payload_type;
|
|
(*receive_configs)[0].decoders[0].payload_name =
|
|
send_config->rtp.payload_name;
|
|
(*receive_configs)[0].decoders[0].decoder = decoder_.get();
|
|
}
|
|
|
|
void OnFrame(const VideoFrame& video_frame) override {
|
|
EXPECT_EQ(expected_rotation_, video_frame.rotation());
|
|
if (++frame_counter_ == no_frames_to_wait_for_)
|
|
observation_complete_.Set();
|
|
}
|
|
|
|
void OnFrameGeneratorCapturerCreated(
|
|
test::FrameGeneratorCapturer* frame_generator_capturer) override {
|
|
frame_generator_capturer->SetFakeRotation(expected_rotation_);
|
|
}
|
|
|
|
private:
|
|
int no_frames_to_wait_for_;
|
|
VideoRotation expected_rotation_;
|
|
std::string payload_name_;
|
|
std::unique_ptr<webrtc::VideoEncoder> encoder_;
|
|
std::unique_ptr<webrtc::VideoDecoder> decoder_;
|
|
int frame_counter_;
|
|
};
|
|
|
|
TEST_P(CodecEndToEndTest, SendsAndReceivesVP8) {
|
|
CodecObserver test(5, kVideoRotation_0, "VP8", VP8Encoder::Create(),
|
|
VP8Decoder::Create());
|
|
RunBaseTest(&test);
|
|
}
|
|
|
|
TEST_P(CodecEndToEndTest, SendsAndReceivesVP8Rotation90) {
|
|
CodecObserver test(5, kVideoRotation_90, "VP8", VP8Encoder::Create(),
|
|
VP8Decoder::Create());
|
|
RunBaseTest(&test);
|
|
}
|
|
|
|
#if !defined(RTC_DISABLE_VP9)
|
|
TEST_P(CodecEndToEndTest, SendsAndReceivesVP9) {
|
|
CodecObserver test(500, kVideoRotation_0, "VP9", VP9Encoder::Create(),
|
|
VP9Decoder::Create());
|
|
RunBaseTest(&test);
|
|
}
|
|
|
|
TEST_P(CodecEndToEndTest, SendsAndReceivesVP9VideoRotation90) {
|
|
CodecObserver test(5, kVideoRotation_90, "VP9", VP9Encoder::Create(),
|
|
VP9Decoder::Create());
|
|
RunBaseTest(&test);
|
|
}
|
|
|
|
// Mutiplex tests are using VP9 as the underlying implementation.
|
|
TEST_P(CodecEndToEndTest, SendsAndReceivesMultiplex) {
|
|
InternalEncoderFactory encoder_factory;
|
|
InternalDecoderFactory decoder_factory;
|
|
CodecObserver test(
|
|
5, kVideoRotation_0, "multiplex",
|
|
rtc::MakeUnique<MultiplexEncoderAdapter>(
|
|
&encoder_factory, SdpVideoFormat(cricket::kVp9CodecName)),
|
|
rtc::MakeUnique<MultiplexDecoderAdapter>(
|
|
&decoder_factory, SdpVideoFormat(cricket::kVp9CodecName)));
|
|
RunBaseTest(&test);
|
|
}
|
|
|
|
TEST_P(CodecEndToEndTest, SendsAndReceivesMultiplexVideoRotation90) {
|
|
InternalEncoderFactory encoder_factory;
|
|
InternalDecoderFactory decoder_factory;
|
|
CodecObserver test(
|
|
5, kVideoRotation_90, "multiplex",
|
|
rtc::MakeUnique<MultiplexEncoderAdapter>(
|
|
&encoder_factory, SdpVideoFormat(cricket::kVp9CodecName)),
|
|
rtc::MakeUnique<MultiplexDecoderAdapter>(
|
|
&decoder_factory, SdpVideoFormat(cricket::kVp9CodecName)));
|
|
RunBaseTest(&test);
|
|
}
|
|
|
|
#endif // !defined(RTC_DISABLE_VP9)
|
|
|
|
#if defined(WEBRTC_USE_H264)
|
|
class EndToEndTestH264 : public CodecEndToEndTest {};
|
|
|
|
const auto h264_field_trial_combinations = ::testing::Values(
|
|
"WebRTC-SpsPpsIdrIsH264Keyframe/Disabled/WebRTC-RoundRobinPacing/Disabled/",
|
|
"WebRTC-SpsPpsIdrIsH264Keyframe/Enabled/WebRTC-RoundRobinPacing/Disabled/",
|
|
"WebRTC-SpsPpsIdrIsH264Keyframe/Disabled/WebRTC-RoundRobinPacing/Enabled/",
|
|
"WebRTC-SpsPpsIdrIsH264Keyframe/Enabled/WebRTC-RoundRobinPacing/Enabled/");
|
|
INSTANTIATE_TEST_CASE_P(SpsPpsIdrIsKeyframe,
|
|
EndToEndTestH264,
|
|
h264_field_trial_combinations);
|
|
|
|
TEST_P(EndToEndTestH264, SendsAndReceivesH264) {
|
|
CodecObserver test(500, kVideoRotation_0, "H264",
|
|
H264Encoder::Create(cricket::VideoCodec("H264")),
|
|
H264Decoder::Create());
|
|
RunBaseTest(&test);
|
|
}
|
|
|
|
TEST_P(EndToEndTestH264, SendsAndReceivesH264VideoRotation90) {
|
|
CodecObserver test(5, kVideoRotation_90, "H264",
|
|
H264Encoder::Create(cricket::VideoCodec("H264")),
|
|
H264Decoder::Create());
|
|
RunBaseTest(&test);
|
|
}
|
|
|
|
TEST_P(EndToEndTestH264, SendsAndReceivesH264PacketizationMode0) {
|
|
cricket::VideoCodec codec = cricket::VideoCodec("H264");
|
|
codec.SetParam(cricket::kH264FmtpPacketizationMode, "0");
|
|
CodecObserver test(500, kVideoRotation_0, "H264", H264Encoder::Create(codec),
|
|
H264Decoder::Create());
|
|
RunBaseTest(&test);
|
|
}
|
|
|
|
TEST_P(EndToEndTestH264, SendsAndReceivesH264PacketizationMode1) {
|
|
cricket::VideoCodec codec = cricket::VideoCodec("H264");
|
|
codec.SetParam(cricket::kH264FmtpPacketizationMode, "1");
|
|
CodecObserver test(500, kVideoRotation_0, "H264", H264Encoder::Create(codec),
|
|
H264Decoder::Create());
|
|
RunBaseTest(&test);
|
|
}
|
|
#endif // defined(WEBRTC_USE_H264)
|
|
|
|
} // namespace webrtc
|