diff --git a/test/pc/e2e/peer_configurer.cc b/test/pc/e2e/peer_configurer.cc index adc3e4f299..d7dd94be6d 100644 --- a/test/pc/e2e/peer_configurer.cc +++ b/test/pc/e2e/peer_configurer.cc @@ -70,12 +70,8 @@ void PeerParamsPreprocessor::SetDefaultValuesForMissingParams( peer_names_provider_.MaybeSetName(params->name); DefaultNamesProvider video_stream_names_provider(*params->name + "_auto_video_stream_label_"); - for (size_t i = 0; i < configurable_params->video_configs.size(); ++i) { - video_stream_names_provider.MaybeSetName( - configurable_params->video_configs[i].stream_label); - // TODO(titovartem): remove when downstream will migrate on new API. - params->video_configs[i].stream_label = - configurable_params->video_configs[i].stream_label; + for (VideoConfig& config : configurable_params->video_configs) { + video_stream_names_provider.MaybeSetName(config.stream_label); } if (params->audio_config) { DefaultNamesProvider audio_stream_names_provider( diff --git a/test/pc/e2e/peer_configurer.h b/test/pc/e2e/peer_configurer.h index 8c316120c1..c8239c08d4 100644 --- a/test/pc/e2e/peer_configurer.h +++ b/test/pc/e2e/peer_configurer.h @@ -128,16 +128,12 @@ class PeerConfigurerImpl final PeerConnectionE2EQualityTestFixture::VideoConfig config) override { video_sources_.push_back( CreateSquareFrameGenerator(config, /*type=*/absl::nullopt)); - // TODO(titovartem): remove when downstream will migrate on new API. - params_->video_configs.push_back(config); configurable_params_->video_configs.push_back(std::move(config)); return this; } PeerConfigurer* AddVideoConfig( PeerConnectionE2EQualityTestFixture::VideoConfig config, std::unique_ptr generator) override { - // TODO(titovartem): remove when downstream will migrate on new API. - params_->video_configs.push_back(config); configurable_params_->video_configs.push_back(std::move(config)); video_sources_.push_back(std::move(generator)); return this; @@ -146,8 +142,6 @@ class PeerConfigurerImpl final PeerConnectionE2EQualityTestFixture::VideoConfig config, PeerConnectionE2EQualityTestFixture::CapturingDeviceIndex index) override { - // TODO(titovartem): remove when downstream will migrate on new API. - params_->video_configs.push_back(config); configurable_params_->video_configs.push_back(std::move(config)); video_sources_.push_back(index); return this; @@ -155,8 +149,6 @@ class PeerConfigurerImpl final PeerConfigurer* SetVideoSubscription( PeerConnectionE2EQualityTestFixture::VideoSubscription subscription) override { - // TODO(titovartem): remove when downstream will migrate on new API. - params_->video_subscription = subscription; configurable_params_->video_subscription = std::move(subscription); return this; } diff --git a/test/pc/e2e/peer_connection_quality_test_params.h b/test/pc/e2e/peer_connection_quality_test_params.h index d49140f493..645ed7a290 100644 --- a/test/pc/e2e/peer_connection_quality_test_params.h +++ b/test/pc/e2e/peer_connection_quality_test_params.h @@ -114,9 +114,6 @@ struct InjectableComponents { struct Params { // Peer name. If empty - default one will be set by the fixture. absl::optional name; - // If `video_configs` is empty - no video should be added to the test call. - // TODO(titovartem): remove when downstream will migrate on new API. - std::vector video_configs; // If `audio_config` is set audio stream will be configured absl::optional audio_config; // Flags to set on `cricket::PortAllocator`. These flags will be added @@ -144,11 +141,6 @@ struct Params { BitrateSettings bitrate_settings; std::vector video_codecs; - - // TODO(titovartem): remove when downstream will migrate on new API. - PeerConnectionE2EQualityTestFixture::VideoSubscription video_subscription = - PeerConnectionE2EQualityTestFixture::VideoSubscription() - .SubscribeToAllPeers(); }; // Contains parameters that maybe changed by test writer during the test call.