From 84b583f577ace8c3622502590e3453214e29edfc Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Fri, 16 Jul 2021 09:18:50 +0200 Subject: [PATCH] Remove video_codecs from RunParams (PC level framework). Bug: b/192821182 Change-Id: I17f728665a86d511c469dc8f29a29e56b2f28a25 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/226321 Reviewed-by: Andrey Logvin Commit-Queue: Mirko Bonadei Cr-Commit-Position: refs/heads/master@{#34486} --- .../peerconnection_quality_test_fixture.h | 13 ------------- test/pc/e2e/peer_configurer.cc | 19 +++---------------- 2 files changed, 3 insertions(+), 29 deletions(-) diff --git a/api/test/peerconnection_quality_test_fixture.h b/api/test/peerconnection_quality_test_fixture.h index 20d9c74efa..1619bd7169 100644 --- a/api/test/peerconnection_quality_test_fixture.h +++ b/api/test/peerconnection_quality_test_fixture.h @@ -391,19 +391,6 @@ class PeerConnectionE2EQualityTestFixture { // it will be shut downed. TimeDelta run_duration; - // DEPRECATED: Instead of setting the codecs in RunParams (which apply to - // all the participants in the call, please set them with - // PeerConfigurer, this will allow more flexibility and let - // different Peers support different codecs. - // - // List of video codecs to use during the test. These codecs will be - // negotiated in SDP during offer/answer exchange. The order of these codecs - // during negotiation will be the same as in |video_codecs|. Codecs have - // to be available in codecs list provided by peer connection to be - // negotiated. If some of specified codecs won't be found, the test will - // crash. - // If list is empty Vp8 with no required_params will be used. - std::vector video_codecs; bool use_ulp_fec = false; bool use_flex_fec = false; // Specifies how much video encoder target bitrate should be different than diff --git a/test/pc/e2e/peer_configurer.cc b/test/pc/e2e/peer_configurer.cc index 50ce51b49a..1829147658 100644 --- a/test/pc/e2e/peer_configurer.cc +++ b/test/pc/e2e/peer_configurer.cc @@ -92,22 +92,9 @@ void SetDefaultValuesForMissingParams( } if (p->video_codecs.empty()) { - // TODO(mbonadei): Remove the usage of RunParams to set codecs, this is - // only needed for backwards compatibility. - if (!run_params->video_codecs.empty()) { - p->video_codecs = run_params->video_codecs; - } else { - p->video_codecs.push_back( - PeerConnectionE2EQualityTestFixture::VideoCodecConfig( - cricket::kVp8CodecName)); - run_params->video_codecs = { - PeerConnectionE2EQualityTestFixture::VideoCodecConfig( - cricket::kVp8CodecName)}; - } - } else { - RTC_CHECK(run_params->video_codecs.empty()) - << "Setting video_codecs in both PeerConfigurer and RunParams is not " - "supported."; + p->video_codecs.push_back( + PeerConnectionE2EQualityTestFixture::VideoCodecConfig( + cricket::kVp8CodecName)); } } }