From 6f68324adbf52b247e10b33a4e83a586e66cc6df Mon Sep 17 00:00:00 2001 From: Lu Liu Date: Tue, 25 Sep 2018 18:48:48 +0000 Subject: [PATCH] Revert "Added field trial WebRTC-GenericDescriptor for the new generic descriptor." MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 3f4a4fad8cd661309ff5d9a631e89518f32e7c5e. Reason for revert: Breaking internal tests Original change's description: > Added field trial WebRTC-GenericDescriptor for the new generic descriptor. > > Also parameterized tests to test the new generic descriptor and > added --generic_descriptor flag to loopback tests. > > Bug: webrtc:9361 > Change-Id: I2b76889606fe2e81249ecdebb0b7b61151682485 > Reviewed-on: https://webrtc-review.googlesource.com/101900 > Commit-Queue: Philip Eliasson > Reviewed-by: Erik Språng > Reviewed-by: Danil Chapovalov > Reviewed-by: Stefan Holmer > Cr-Commit-Position: refs/heads/master@{#24835} TBR=danilchap@webrtc.org,sprang@webrtc.org,stefan@webrtc.org,philipel@webrtc.org Change-Id: I4d4714a9f4ab0e95adf0f4130bc1a932efc448fa No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:9361 Reviewed-on: https://webrtc-review.googlesource.com/101940 Reviewed-by: Lu Liu Commit-Queue: Lu Liu Cr-Commit-Position: refs/heads/master@{#24839} --- api/test/video_quality_test_fixture.h | 1 - call/rtp_payload_params.cc | 8 +- call/rtp_payload_params.h | 1 - call/rtp_payload_params_unittest.cc | 6 +- .../rtp_generic_frame_descriptor_extension.h | 1 - modules/rtp_rtcp/source/rtp_sender.cc | 3 - test/call_test.cc | 2 - test/constants.cc | 1 - test/constants.h | 1 - video/end_to_end_tests/codec_tests.cc | 25 ++--- video/full_stack_tests.cc | 98 +++++-------------- video/screenshare_loopback.cc | 5 +- video/sv_loopback.cc | 5 +- video/video_loopback.cc | 5 +- video/video_quality_test.cc | 33 +++---- 15 files changed, 52 insertions(+), 143 deletions(-) diff --git a/api/test/video_quality_test_fixture.h b/api/test/video_quality_test_fixture.h index 99451f9ee8..5c0e8ce169 100644 --- a/api/test/video_quality_test_fixture.h +++ b/api/test/video_quality_test_fixture.h @@ -34,7 +34,6 @@ class VideoQualityTestFixtureInterface { ~Params(); struct CallConfig { bool send_side_bwe; - bool generic_descriptor; BitrateConstraints call_bitrate_config; int num_thumbnails; // Indicates if secondary_(video|ss|screenshare) structures are used. diff --git a/call/rtp_payload_params.cc b/call/rtp_payload_params.cc index ffbda1a2db..0c8b30755b 100644 --- a/call/rtp_payload_params.cc +++ b/call/rtp_payload_params.cc @@ -116,9 +116,7 @@ RtpPayloadParams::RtpPayloadParams(const uint32_t ssrc, const RtpPayloadState* state) : ssrc_(ssrc), generic_picture_id_experiment_( - field_trial::IsEnabled("WebRTC-GenericPictureId")), - generic_descriptor_experiment_( - field_trial::IsEnabled("WebRTC-GenericDescriptor")) { + field_trial::IsEnabled("WebRTC-GenericPictureId")) { for (auto& spatial_layer : last_shared_frame_id_) spatial_layer.fill(-1); @@ -154,9 +152,7 @@ RTPVideoHeader RtpPayloadParams::GetRtpVideoHeader( : true; SetCodecSpecific(&rtp_video_header, first_frame_in_picture); - - if (generic_descriptor_experiment_) - SetGeneric(shared_frame_id, is_keyframe, &rtp_video_header); + SetGeneric(shared_frame_id, is_keyframe, &rtp_video_header); return rtp_video_header; } diff --git a/call/rtp_payload_params.h b/call/rtp_payload_params.h index f6829cace5..664ac17346 100644 --- a/call/rtp_payload_params.h +++ b/call/rtp_payload_params.h @@ -60,7 +60,6 @@ class RtpPayloadParams final { RtpPayloadState state_; const bool generic_picture_id_experiment_; - const bool generic_descriptor_experiment_; }; } // namespace webrtc #endif // CALL_RTP_PAYLOAD_PARAMS_H_ diff --git a/call/rtp_payload_params_unittest.cc b/call/rtp_payload_params_unittest.cc index a3cb379d18..c125c4ee8f 100644 --- a/call/rtp_payload_params_unittest.cc +++ b/call/rtp_payload_params_unittest.cc @@ -300,10 +300,7 @@ class RtpPayloadParamsVp8ToGenericTest : public ::testing::Test { public: enum LayerSync { kNoSync, kSync }; - RtpPayloadParamsVp8ToGenericTest() - : generic_descriptor_field_trial_("WebRTC-GenericDescriptor/Enabled/"), - state_(), - params_(123, &state_) {} + RtpPayloadParamsVp8ToGenericTest() : state_(), params_(123, &state_) {} void ConvertAndCheck(int temporal_index, int64_t shared_frame_id, @@ -333,7 +330,6 @@ class RtpPayloadParamsVp8ToGenericTest : public ::testing::Test { } protected: - test::ScopedFieldTrials generic_descriptor_field_trial_; RtpPayloadState state_; RtpPayloadParams params_; }; diff --git a/modules/rtp_rtcp/source/rtp_generic_frame_descriptor_extension.h b/modules/rtp_rtcp/source/rtp_generic_frame_descriptor_extension.h index 2dd9dd49eb..d59a9b03a4 100644 --- a/modules/rtp_rtcp/source/rtp_generic_frame_descriptor_extension.h +++ b/modules/rtp_rtcp/source/rtp_generic_frame_descriptor_extension.h @@ -25,7 +25,6 @@ class RtpGenericFrameDescriptorExtension { static constexpr char kUri[] = "http://www.webrtc.org/experiments/rtp-hdrext/" "generic-frame-descriptor-00"; - static constexpr int kMaxSizeBytes = 16; static bool Parse(rtc::ArrayView data, RtpGenericFrameDescriptor* descriptor); diff --git a/modules/rtp_rtcp/source/rtp_sender.cc b/modules/rtp_rtcp/source/rtp_sender.cc index 55dad2049e..d69a6f07b6 100644 --- a/modules/rtp_rtcp/source/rtp_sender.cc +++ b/modules/rtp_rtcp/source/rtp_sender.cc @@ -22,7 +22,6 @@ #include "modules/rtp_rtcp/include/rtp_cvo.h" #include "modules/rtp_rtcp/source/byte_io.h" #include "modules/rtp_rtcp/source/playout_delay_oracle.h" -#include "modules/rtp_rtcp/source/rtp_generic_frame_descriptor_extension.h" #include "modules/rtp_rtcp/source/rtp_header_extensions.h" #include "modules/rtp_rtcp/source/rtp_packet_to_send.h" #include "modules/rtp_rtcp/source/rtp_sender_audio.h" @@ -75,8 +74,6 @@ constexpr RtpExtensionSize kVideoExtensionSizes[] = { CreateExtensionSize(), CreateExtensionSize(), {RtpMid::kId, RtpMid::kMaxValueSizeBytes}, - {RtpGenericFrameDescriptorExtension::kId, - RtpGenericFrameDescriptorExtension::kMaxSizeBytes}, }; const char* FrameTypeToString(FrameType frame_type) { diff --git a/test/call_test.cc b/test/call_test.cc index 89ac329302..f7828a4c3f 100644 --- a/test/call_test.cc +++ b/test/call_test.cc @@ -238,8 +238,6 @@ void CallTest::CreateVideoSendConfig(VideoSendStream::Config* video_config, kTransportSequenceNumberExtensionId)); video_config->rtp.extensions.push_back(RtpExtension( RtpExtension::kVideoContentTypeUri, kVideoContentTypeExtensionId)); - video_config->rtp.extensions.push_back(RtpExtension( - RtpExtension::kGenericFrameDescriptorUri, kGenericDescriptorExtensionId)); if (video_encoder_configs_.empty()) { video_encoder_configs_.emplace_back(); FillEncoderConfiguration(kVideoCodecGeneric, num_video_streams, diff --git a/test/constants.cc b/test/constants.cc index 12ae8e8449..0835777570 100644 --- a/test/constants.cc +++ b/test/constants.cc @@ -20,7 +20,6 @@ const int kTransportSequenceNumberExtensionId = 8; const int kVideoRotationExtensionId = 9; const int kVideoContentTypeExtensionId = 10; const int kVideoTimingExtensionId = 11; -const int kGenericDescriptorExtensionId = 12; } // namespace test } // namespace webrtc diff --git a/test/constants.h b/test/constants.h index 3cee828b20..85e8c18d53 100644 --- a/test/constants.h +++ b/test/constants.h @@ -18,6 +18,5 @@ extern const int kTransportSequenceNumberExtensionId; extern const int kVideoRotationExtensionId; extern const int kVideoContentTypeExtensionId; extern const int kVideoTimingExtensionId; -extern const int kGenericDescriptorExtensionId; } // namespace test } // namespace webrtc diff --git a/video/end_to_end_tests/codec_tests.cc b/video/end_to_end_tests/codec_tests.cc index 5c5255567a..31742ee3cd 100644 --- a/video/end_to_end_tests/codec_tests.cc +++ b/video/end_to_end_tests/codec_tests.cc @@ -23,13 +23,9 @@ namespace webrtc { -class CodecEndToEndTest : public test::CallTest, - public testing::WithParamInterface { +class CodecEndToEndTest : public test::CallTest { public: - CodecEndToEndTest() : field_trial_(GetParam()) {} - - private: - test::ScopedFieldTrials field_trial_; + CodecEndToEndTest() = default; }; class CodecObserver : public test::EndToEndTest, @@ -93,12 +89,7 @@ class CodecObserver : public test::EndToEndTest, int frame_counter_; }; -INSTANTIATE_TEST_CASE_P(GenericDescriptor, - CodecEndToEndTest, - ::testing::Values("WebRTC-GenericDescriptor/Disabled/", - "WebRTC-GenericDescriptor/Enabled/")); - -TEST_P(CodecEndToEndTest, SendsAndReceivesVP8) { +TEST_F(CodecEndToEndTest, SendsAndReceivesVP8) { test::FunctionVideoEncoderFactory encoder_factory( []() { return VP8Encoder::Create(); }); CodecObserver test(5, kVideoRotation_0, "VP8", &encoder_factory, @@ -106,7 +97,7 @@ TEST_P(CodecEndToEndTest, SendsAndReceivesVP8) { RunBaseTest(&test); } -TEST_P(CodecEndToEndTest, SendsAndReceivesVP8Rotation90) { +TEST_F(CodecEndToEndTest, SendsAndReceivesVP8Rotation90) { test::FunctionVideoEncoderFactory encoder_factory( []() { return VP8Encoder::Create(); }); CodecObserver test(5, kVideoRotation_90, "VP8", &encoder_factory, @@ -115,7 +106,7 @@ TEST_P(CodecEndToEndTest, SendsAndReceivesVP8Rotation90) { } #if !defined(RTC_DISABLE_VP9) -TEST_P(CodecEndToEndTest, SendsAndReceivesVP9) { +TEST_F(CodecEndToEndTest, SendsAndReceivesVP9) { test::FunctionVideoEncoderFactory encoder_factory( []() { return VP9Encoder::Create(); }); CodecObserver test(500, kVideoRotation_0, "VP9", &encoder_factory, @@ -123,7 +114,7 @@ TEST_P(CodecEndToEndTest, SendsAndReceivesVP9) { RunBaseTest(&test); } -TEST_P(CodecEndToEndTest, SendsAndReceivesVP9VideoRotation90) { +TEST_F(CodecEndToEndTest, SendsAndReceivesVP9VideoRotation90) { test::FunctionVideoEncoderFactory encoder_factory( []() { return VP9Encoder::Create(); }); CodecObserver test(5, kVideoRotation_90, "VP9", &encoder_factory, @@ -132,7 +123,7 @@ TEST_P(CodecEndToEndTest, SendsAndReceivesVP9VideoRotation90) { } // Mutiplex tests are using VP9 as the underlying implementation. -TEST_P(CodecEndToEndTest, SendsAndReceivesMultiplex) { +TEST_F(CodecEndToEndTest, SendsAndReceivesMultiplex) { InternalEncoderFactory internal_encoder_factory; InternalDecoderFactory decoder_factory; test::FunctionVideoEncoderFactory encoder_factory( @@ -147,7 +138,7 @@ TEST_P(CodecEndToEndTest, SendsAndReceivesMultiplex) { RunBaseTest(&test); } -TEST_P(CodecEndToEndTest, SendsAndReceivesMultiplexVideoRotation90) { +TEST_F(CodecEndToEndTest, SendsAndReceivesMultiplexVideoRotation90) { InternalEncoderFactory internal_encoder_factory; InternalDecoderFactory decoder_factory; test::FunctionVideoEncoderFactory encoder_factory( diff --git a/video/full_stack_tests.cc b/video/full_stack_tests.cc index 0f7fb34faf..32625128b6 100644 --- a/video/full_stack_tests.cc +++ b/video/full_stack_tests.cc @@ -50,7 +50,6 @@ const char kScreenshareSimulcastExperiment[] = "WebRTC-SimulcastScreenshare/Enabled/"; const char kPacerPushBackExperiment[] = "WebRTC-PacerPushbackExperiment/Enabled/"; -const char kGenericDescriptorExperiment[] = "WebRTC-GenericDescriptor"; struct ParamsWithLogging : public VideoQualityTest::Params { public: @@ -83,8 +82,6 @@ std::string AppendFieldTrials(std::string new_trial_string) { // logs // bool // }; -class GenericDescriptorTest : public ::testing::TestWithParam {}; - #if !defined(RTC_DISABLE_VP9) TEST(FullStackTest, ForemanCifWithoutPacketLossVp9) { auto fixture = CreateVideoQualityTestFixture(); @@ -98,19 +95,15 @@ TEST(FullStackTest, ForemanCifWithoutPacketLossVp9) { fixture->RunWithAnalyzer(foreman_cif); } -TEST_P(GenericDescriptorTest, ForemanCifPlr5Vp9) { - test::ScopedFieldTrials field_trial(GetParam()); - std::string test_name = "foreman_cif_delay_50_0_plr_5_VP9"; - if (field_trial::IsEnabled(kGenericDescriptorExperiment)) - test_name += "_generic_descriptor"; - +TEST(FullStackTest, ForemanCifPlr5Vp9) { auto fixture = CreateVideoQualityTestFixture(); ParamsWithLogging foreman_cif; foreman_cif.call.send_side_bwe = true; foreman_cif.video[0] = {true, 352, 288, 30, 30000, 500000, 2000000, false, "VP9", 1, 0, 0, false, false, false, "foreman_cif"}; - foreman_cif.analyzer = {test_name, 0.0, 0.0, kFullStackTestDurationSecs}; + foreman_cif.analyzer = {"foreman_cif_delay_50_0_plr_5_VP9", 0.0, 0.0, + kFullStackTestDurationSecs}; foreman_cif.config->loss_percent = 5; foreman_cif.config->queue_delay_ms = 50; fixture->RunWithAnalyzer(foreman_cif); @@ -189,12 +182,7 @@ TEST(FullStackTest, MAYBE_ParisQcifWithoutPacketLoss) { fixture->RunWithAnalyzer(paris_qcif); } -TEST_P(GenericDescriptorTest, ForemanCifWithoutPacketLoss) { - test::ScopedFieldTrials field_trial(GetParam()); - std::string test_name = "foreman_cif_net_delay_0_0_plr_0"; - if (field_trial::IsEnabled(kGenericDescriptorExperiment)) - test_name += "_generic_descriptor"; - +TEST(FullStackTest, ForemanCifWithoutPacketLoss) { auto fixture = CreateVideoQualityTestFixture(); // TODO(pbos): Decide on psnr/ssim thresholds for foreman_cif. ParamsWithLogging foreman_cif; @@ -202,23 +190,20 @@ TEST_P(GenericDescriptorTest, ForemanCifWithoutPacketLoss) { foreman_cif.video[0] = {true, 352, 288, 30, 700000, 700000, 700000, false, "VP8", 1, 0, 0, false, false, false, "foreman_cif"}; - foreman_cif.analyzer = {test_name, 0.0, 0.0, kFullStackTestDurationSecs}; + foreman_cif.analyzer = {"foreman_cif_net_delay_0_0_plr_0", 0.0, 0.0, + kFullStackTestDurationSecs}; fixture->RunWithAnalyzer(foreman_cif); } -TEST_P(GenericDescriptorTest, ForemanCif30kbpsWithoutPacketLoss) { - test::ScopedFieldTrials field_trial(GetParam()); - std::string test_name = "foreman_cif_30kbps_net_delay_0_0_plr_0"; - if (field_trial::IsEnabled(kGenericDescriptorExperiment)) - test_name += "_generic_descriptor"; - +TEST(FullStackTest, ForemanCif30kbpsWithoutPacketLoss) { auto fixture = CreateVideoQualityTestFixture(); ParamsWithLogging foreman_cif; foreman_cif.call.send_side_bwe = true; foreman_cif.video[0] = {true, 352, 288, 10, 30000, 30000, 30000, false, "VP8", 1, 0, 0, false, false, false, "foreman_cif"}; - foreman_cif.analyzer = {test_name, 0.0, 0.0, kFullStackTestDurationSecs}; + foreman_cif.analyzer = {"foreman_cif_30kbps_net_delay_0_0_plr_0", 0.0, 0.0, + kFullStackTestDurationSecs}; fixture->RunWithAnalyzer(foreman_cif); } @@ -237,37 +222,29 @@ TEST(FullStackTest, ForemanCifLink150kbpsWithoutPacketLoss) { fixture->RunWithAnalyzer(foreman_cif); } -TEST_P(GenericDescriptorTest, ForemanCifPlr5) { - test::ScopedFieldTrials field_trial(GetParam()); - std::string test_name = "foreman_cif_delay_50_0_plr_5"; - if (field_trial::IsEnabled(kGenericDescriptorExperiment)) - test_name += "_generic_descriptor"; - +TEST(FullStackTest, ForemanCifPlr5) { auto fixture = CreateVideoQualityTestFixture(); ParamsWithLogging foreman_cif; foreman_cif.call.send_side_bwe = true; foreman_cif.video[0] = {true, 352, 288, 30, 30000, 500000, 2000000, false, "VP8", 1, 0, 0, false, false, false, "foreman_cif"}; - foreman_cif.analyzer = {test_name, 0.0, 0.0, kFullStackTestDurationSecs}; + foreman_cif.analyzer = {"foreman_cif_delay_50_0_plr_5", 0.0, 0.0, + kFullStackTestDurationSecs}; foreman_cif.config->loss_percent = 5; foreman_cif.config->queue_delay_ms = 50; fixture->RunWithAnalyzer(foreman_cif); } -TEST_P(GenericDescriptorTest, ForemanCifPlr5Ulpfec) { - test::ScopedFieldTrials field_trial(GetParam()); - std::string test_name = "foreman_cif_delay_50_0_plr_5_ulpfec"; - if (field_trial::IsEnabled(kGenericDescriptorExperiment)) - test_name += "_generic_descriptor"; - +TEST(FullStackTest, ForemanCifPlr5Ulpfec) { auto fixture = CreateVideoQualityTestFixture(); ParamsWithLogging foreman_cif; foreman_cif.call.send_side_bwe = true; foreman_cif.video[0] = {true, 352, 288, 30, 30000, 500000, 2000000, false, "VP8", 1, 0, 0, true, false, false, "foreman_cif"}; - foreman_cif.analyzer = {test_name, 0.0, 0.0, kFullStackTestDurationSecs}; + foreman_cif.analyzer = {"foreman_cif_delay_50_0_plr_5_ulpfec", 0.0, 0.0, + kFullStackTestDurationSecs}; foreman_cif.config->loss_percent = 5; foreman_cif.config->queue_delay_ms = 50; fixture->RunWithAnalyzer(foreman_cif); @@ -343,19 +320,15 @@ TEST(FullStackTest, ForemanCif30kbpsWithoutPacketlossH264) { fixture->RunWithAnalyzer(foreman_cif); } -TEST_P(GenericDescriptorTest, ForemanCifPlr5H264) { - test::ScopedFieldTrials field_trial(GetParam()); - std::string test_name = "foreman_cif_delay_50_0_plr_5_H264"; - if (field_trial::IsEnabled(kGenericDescriptorExperiment)) - test_name += "_generic_descriptor"; - +TEST(FullStackTest, ForemanCifPlr5H264) { auto fixture = CreateVideoQualityTestFixture(); ParamsWithLogging foreman_cif; foreman_cif.call.send_side_bwe = true; foreman_cif.video[0] = {true, 352, 288, 30, 30000, 500000, 2000000, false, "H264", 1, 0, 0, false, false, false, "foreman_cif"}; - foreman_cif.analyzer = {test_name, 0.0, 0.0, kFullStackTestDurationSecs}; + foreman_cif.analyzer = {"foreman_cif_delay_50_0_plr_5_H264", 0.0, 0.0, + kFullStackTestDurationSecs}; foreman_cif.config->loss_percent = 5; foreman_cif.config->queue_delay_ms = 50; fixture->RunWithAnalyzer(foreman_cif); @@ -455,19 +428,15 @@ TEST(FullStackTest, ForemanCif500kbps100ms) { fixture->RunWithAnalyzer(foreman_cif); } -TEST_P(GenericDescriptorTest, ForemanCif500kbps100msLimitedQueue) { - test::ScopedFieldTrials field_trial(GetParam()); - std::string test_name = "foreman_cif_500kbps_100ms_32pkts_queue"; - if (field_trial::IsEnabled(kGenericDescriptorExperiment)) - test_name += "_generic_descriptor"; - +TEST(FullStackTest, ForemanCif500kbps100msLimitedQueue) { auto fixture = CreateVideoQualityTestFixture(); ParamsWithLogging foreman_cif; foreman_cif.call.send_side_bwe = true; foreman_cif.video[0] = {true, 352, 288, 30, 30000, 500000, 2000000, false, "VP8", 1, 0, 0, false, false, false, "foreman_cif"}; - foreman_cif.analyzer = {test_name, 0.0, 0.0, kFullStackTestDurationSecs}; + foreman_cif.analyzer = {"foreman_cif_500kbps_100ms_32pkts_queue", 0.0, 0.0, + kFullStackTestDurationSecs}; foreman_cif.config->queue_length_packets = 32; foreman_cif.config->queue_delay_ms = 100; foreman_cif.config->link_capacity_kbps = 500; @@ -538,12 +507,7 @@ TEST(FullStackTest, ConferenceMotionHd1TLModerateLimits) { fixture->RunWithAnalyzer(conf_motion_hd); } -TEST_P(GenericDescriptorTest, ConferenceMotionHd2TLModerateLimits) { - test::ScopedFieldTrials field_trial(GetParam()); - std::string test_name = "conference_motion_hd_2tl_moderate_limits"; - if (field_trial::IsEnabled(kGenericDescriptorExperiment)) - test_name += "_generic_descriptor"; - +TEST(FullStackTest, ConferenceMotionHd2TLModerateLimits) { auto fixture = CreateVideoQualityTestFixture(); ParamsWithLogging conf_motion_hd; conf_motion_hd.call.send_side_bwe = true; @@ -551,7 +515,8 @@ TEST_P(GenericDescriptorTest, ConferenceMotionHd2TLModerateLimits) { true, 1280, 720, 50, 30000, 3000000, 3000000, false, "VP8", 2, -1, 0, false, false, false, "ConferenceMotion_1280_720_50"}; - conf_motion_hd.analyzer = {test_name, 0.0, 0.0, kFullStackTestDurationSecs}; + conf_motion_hd.analyzer = {"conference_motion_hd_2tl_moderate_limits", 0.0, + 0.0, kFullStackTestDurationSecs}; conf_motion_hd.config->queue_length_packets = 50; conf_motion_hd.config->loss_percent = 3; conf_motion_hd.config->queue_delay_ms = 100; @@ -686,12 +651,7 @@ TEST(FullStackTest, ScreenshareSlidesVP8_2TL_Scroll) { fixture->RunWithAnalyzer(config); } -TEST_P(GenericDescriptorTest, ScreenshareSlidesVP8_2TL_LossyNet) { - test::ScopedFieldTrials field_trial(GetParam()); - std::string test_name = "screenshare_slides_lossy_net"; - if (field_trial::IsEnabled(kGenericDescriptorExperiment)) - test_name += "_generic_descriptor"; - +TEST(FullStackTest, ScreenshareSlidesVP8_2TL_LossyNet) { auto fixture = CreateVideoQualityTestFixture(); ParamsWithLogging screenshare; screenshare.call.send_side_bwe = true; @@ -699,7 +659,8 @@ TEST_P(GenericDescriptorTest, ScreenshareSlidesVP8_2TL_LossyNet) { 1000000, false, "VP8", 2, 1, 400000, false, false, false, ""}; screenshare.screenshare[0] = {true, false, 10}; - screenshare.analyzer = {test_name, 0.0, 0.0, kFullStackTestDurationSecs}; + screenshare.analyzer = {"screenshare_slides_lossy_net", 0.0, 0.0, + kFullStackTestDurationSecs}; screenshare.config->loss_percent = 5; screenshare.config->queue_delay_ms = 200; screenshare.config->link_capacity_kbps = 500; @@ -1092,11 +1053,6 @@ TEST(FullStackTest, MAYBE_LargeRoomVP8_50thumb) { fixture->RunWithAnalyzer(large_room); } -INSTANTIATE_TEST_CASE_P(FullStackTest, - GenericDescriptorTest, - ::testing::Values("WebRTC-GenericDescriptor/Disabled/", - "WebRTC-GenericDescriptor/Enabled/")); - class DualStreamsTest : public ::testing::TestWithParam {}; // Disable dual video test on mobile device becuase it's too heavy. diff --git a/video/screenshare_loopback.cc b/video/screenshare_loopback.cc index ec1d59e6a4..804fbccf25 100644 --- a/video/screenshare_loopback.cc +++ b/video/screenshare_loopback.cc @@ -220,8 +220,6 @@ DEFINE_bool(logs, false, "print logs to stderr"); DEFINE_bool(send_side_bwe, true, "Use send-side bandwidth estimation"); -DEFINE_bool(generic_descriptor, false, "Use the generic frame descriptor."); - DEFINE_bool(allow_reordering, false, "Allow packet reordering to occur"); DEFINE_string( @@ -290,8 +288,7 @@ void Loopback() { call_bitrate_config.max_bitrate_bps = -1; // Don't cap bandwidth estimate. VideoQualityTest::Params params; - params.call = {flags::FLAG_send_side_bwe, flags::FLAG_generic_descriptor, - call_bitrate_config}; + params.call = {flags::FLAG_send_side_bwe, call_bitrate_config}; params.video[0] = {true, flags::Width(), flags::Height(), diff --git a/video/sv_loopback.cc b/video/sv_loopback.cc index 25bfa01dbc..0555fb3552 100644 --- a/video/sv_loopback.cc +++ b/video/sv_loopback.cc @@ -419,8 +419,6 @@ DEFINE_bool(logs, false, "print logs to stderr"); DEFINE_bool(send_side_bwe, true, "Use send-side bandwidth estimation"); -DEFINE_bool(generic_descriptor, false, "Use the generic frame descriptor."); - DEFINE_bool(allow_reordering, false, "Allow packet reordering to occur"); DEFINE_bool(use_ulpfec, false, "Use RED+ULPFEC forward error correction."); @@ -494,8 +492,7 @@ void Loopback() { 1000; VideoQualityTest::Params params, camera_params, screenshare_params; - params.call = {flags::FLAG_send_side_bwe, flags::FLAG_generic_descriptor, - call_bitrate_config, 0}; + params.call = {flags::FLAG_send_side_bwe, call_bitrate_config, 0}; params.call.dual_video = true; params.video[screenshare_idx] = { true, diff --git a/video/video_loopback.cc b/video/video_loopback.cc index 71a86f73d6..52f0a65084 100644 --- a/video/video_loopback.cc +++ b/video/video_loopback.cc @@ -235,8 +235,6 @@ DEFINE_bool(logs, false, "print logs to stderr"); DEFINE_bool(send_side_bwe, true, "Use send-side bandwidth estimation"); -DEFINE_bool(generic_descriptor, false, "Use the generic frame descriptor."); - DEFINE_bool(allow_reordering, false, "Allow packet reordering to occur"); DEFINE_bool(use_ulpfec, false, "Use RED+ULPFEC forward error correction."); @@ -294,8 +292,7 @@ void Loopback() { call_bitrate_config.max_bitrate_bps = -1; // Don't cap bandwidth estimate. VideoQualityTest::Params params; - params.call = {flags::FLAG_send_side_bwe, flags::FLAG_generic_descriptor, - call_bitrate_config, 0}; + params.call = {flags::FLAG_send_side_bwe, call_bitrate_config, 0}; params.video[0] = {flags::FLAG_video, flags::Width(), flags::Height(), diff --git a/video/video_quality_test.cc b/video/video_quality_test.cc index cd4c5f7608..7f7c8737a1 100644 --- a/video/video_quality_test.cc +++ b/video/video_quality_test.cc @@ -214,7 +214,7 @@ VideoQualityTest::VideoQualityTest( } VideoQualityTest::Params::Params() - : call({false, false, BitrateConstraints(), 0}), + : call({false, BitrateConstraints(), 0}), video{{false, 640, 480, 30, 50, 800, 800, false, "VP8", 1, -1, 0, false, false, false, ""}, {false, 640, 480, 30, 50, 800, 800, false, "VP8", 1, -1, 0, false, @@ -536,29 +536,18 @@ void VideoQualityTest::SetupVideo(Transport* send_transport, } video_send_configs_[video_idx].rtp.extensions.clear(); if (params_.call.send_side_bwe) { - video_send_configs_[video_idx].rtp.extensions.emplace_back( - RtpExtension::kTransportSequenceNumberUri, - test::kTransportSequenceNumberExtensionId); + video_send_configs_[video_idx].rtp.extensions.push_back( + RtpExtension(RtpExtension::kTransportSequenceNumberUri, + test::kTransportSequenceNumberExtensionId)); } else { - video_send_configs_[video_idx].rtp.extensions.emplace_back( - RtpExtension::kAbsSendTimeUri, test::kAbsSendTimeExtensionId); + video_send_configs_[video_idx].rtp.extensions.push_back(RtpExtension( + RtpExtension::kAbsSendTimeUri, test::kAbsSendTimeExtensionId)); } - - if (params_.call.generic_descriptor) { - // The generic descriptor is currently behind a field trial, so it needs - // to be set for this flag to have any effect. - // TODO(philipel): Remove this check when the experiment is removed. - RTC_CHECK(field_trial::IsEnabled("WebRTC-GenericDescriptor")); - - video_send_configs_[video_idx].rtp.extensions.emplace_back( - RtpExtension::kGenericFrameDescriptorUri, - test::kGenericDescriptorExtensionId); - } - - video_send_configs_[video_idx].rtp.extensions.emplace_back( - RtpExtension::kVideoContentTypeUri, test::kVideoContentTypeExtensionId); - video_send_configs_[video_idx].rtp.extensions.emplace_back( - RtpExtension::kVideoTimingUri, test::kVideoTimingExtensionId); + video_send_configs_[video_idx].rtp.extensions.push_back( + RtpExtension(RtpExtension::kVideoContentTypeUri, + test::kVideoContentTypeExtensionId)); + video_send_configs_[video_idx].rtp.extensions.push_back(RtpExtension( + RtpExtension::kVideoTimingUri, test::kVideoTimingExtensionId)); video_encoder_configs_[video_idx].video_format.name = params_.video[video_idx].codec;