admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove deprecated pipe field from VideoQualityTestFixtureInterface::Params

Browse Source 
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}
This commit is contained in:
Artem Titov 2018-10-24 14:14:49 +02:00 committed by Commit Bot
parent 825f83b99e
commit 62ae178357
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/test/video_quality_test_fixture.h
View File

@ -82,10 +82,6 @@ class VideoQualityTestFixtureInterface {
std::string graph_data_output_filename; std::string graph_data_output_filename;
std::string graph_title; std::string graph_title;
} analyzer; } 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 // Config for default simulation implementation. Must be nullopt if
// `sender_network` and `receiver_network` in InjectionComponents are // `sender_network` and `receiver_network` in InjectionComponents are
// non-null. May be nullopt even if `sender_network` and `receiver_network` // non-null. May be nullopt even if `sender_network` and `receiver_network`

5
video/video_quality_test.cc
View File

@ -314,7 +314,6 @@ VideoQualityTest::Params::Params()
audio({false, false, false, false}), audio({false, false, false, false}),
screenshare{{false, false, 10, 0}, {false, false, 10, 0}}, screenshare{{false, false, 10, 0}, {false, false, 10, 0}},
analyzer({"", 0.0, 0.0, 0, "", ""}), analyzer({"", 0.0, 0.0, 0, "", ""}),
pipe(),
config(absl::nullopt), config(absl::nullopt),
ss{{std::vector<VideoStream>(), 0, 0, -1, InterLayerPredMode::kOn, ss{{std::vector<VideoStream>(), 0, 0, -1, InterLayerPredMode::kOn,
std::vector<SpatialLayer>()}, std::vector<SpatialLayer>()},
@ -351,9 +350,7 @@ void VideoQualityTest::CheckParamsAndInjectionComponents() {
} }
if (!params_.config && injection_components_->sender_network == nullptr && if (!params_.config && injection_components_->sender_network == nullptr &&
injection_components_->receiver_network == nullptr) { injection_components_->receiver_network == nullptr) {
// TODO(titovartem) replace with default config creation when removing params_.config = BuiltInNetworkBehaviorConfig();
// pipe.
params_.config = params_.pipe;
} }
RTC_CHECK( RTC_CHECK(
(params_.config && injection_components_->sender_network == nullptr && (params_.config && injection_components_->sender_network == nullptr &&