Remove deprecated pipe field from VideoQualityTestFixtureInterface::Params
To be landed after 23th October
Bug: webrtc:9630
Change-Id: I8de460d093438c8b72bca44cdfce49b72cbcc2d0
Reviewed-on: https://webrtc-review.googlesource.com/c/104481
Commit-Queue: Artem Titov <titovartem@webrtc.org>
Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25341}diff --git a/api/test/video_quality_test_fixture.h b/api/test/video_quality_test_fixture.h
index bf7fed6..069a243 100644
--- a/api/test/video_quality_test_fixture.h
+++ b/api/test/video_quality_test_fixture.h
@@ -82,10 +82,6 @@
std::string graph_data_output_filename;
std::string graph_title;
} analyzer;
- // Deprecated. DO NOT USE. Use config instead. This is not pipe actually,
- // it is just configuration, that will be passed to default implementation
- // of simulation layer.
- BuiltInNetworkBehaviorConfig pipe;
// Config for default simulation implementation. Must be nullopt if
// `sender_network` and `receiver_network` in InjectionComponents are
// non-null. May be nullopt even if `sender_network` and `receiver_network`
diff --git a/video/video_quality_test.cc b/video/video_quality_test.cc
index 7e1fd97..f2891f4 100644
--- a/video/video_quality_test.cc
+++ b/video/video_quality_test.cc
@@ -314,7 +314,6 @@
audio({false, false, false, false}),
screenshare{{false, false, 10, 0}, {false, false, 10, 0}},
analyzer({"", 0.0, 0.0, 0, "", ""}),
- pipe(),
config(absl::nullopt),
ss{{std::vector<VideoStream>(), 0, 0, -1, InterLayerPredMode::kOn,
std::vector<SpatialLayer>()},
@@ -351,9 +350,7 @@
}
if (!params_.config && injection_components_->sender_network == nullptr &&
injection_components_->receiver_network == nullptr) {
- // TODO(titovartem) replace with default config creation when removing
- // pipe.
- params_.config = params_.pipe;
+ params_.config = BuiltInNetworkBehaviorConfig();
}
RTC_CHECK(
(params_.config && injection_components_->sender_network == nullptr &&
