From 80a82f1527156730c5c4deaea1e423093bb562e1 Mon Sep 17 00:00:00 2001 From: Artem Titov Date: Wed, 12 Feb 2020 16:28:14 +0100 Subject: [PATCH] PC test framework: cleanup deprecated API Bug: webrtc:10138 Change-Id: I116bb318d3b736f1ec60651eaab53c6e78fb9d07 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/168521 Reviewed-by: Karl Wiberg Commit-Queue: Artem Titov Cr-Commit-Position: refs/heads/master@{#30529} --- .../peerconnection_quality_test_fixture.h | 19 +------------------ test/pc/e2e/peer_connection_quality_test.cc | 4 ++-- 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/api/test/peerconnection_quality_test_fixture.h b/api/test/peerconnection_quality_test_fixture.h index 3721665a98..89c8e0429b 100644 --- a/api/test/peerconnection_quality_test_fixture.h +++ b/api/test/peerconnection_quality_test_fixture.h @@ -356,30 +356,13 @@ class PeerConnectionE2EQualityTestFixture { // it will be shut downed. TimeDelta run_duration; - // Deprecated. Use |video_codecs| instead. - // Next two fields are used to specify concrete video codec, that should be - // used in the test. Video code will be negotiated in SDP during offer/ - // answer exchange. - // Video codec name. You can find valid names in - // media/base/media_constants.h - std::string video_codec_name = cricket::kVp8CodecName; - // Deprecated. Use |video_codecs| instead. - // Map of parameters, that have to be specified on SDP codec. Each parameter - // is described by key and value. Codec parameters will match the specified - // map if and only if for each key from |video_codec_required_params| there - // will be a parameter with name equal to this key and parameter value will - // be equal to the value from |video_codec_required_params| for this key. - // If empty then only name will be used to match the codec. - std::map video_codec_required_params; // 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. - // TODO(titovartem) replace with Vp8 will be used as default after cleanup. - // If list is empty |video_codec_name| and |video_codec_required_params| - // will be used. + // 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; diff --git a/test/pc/e2e/peer_connection_quality_test.cc b/test/pc/e2e/peer_connection_quality_test.cc index 79af0ddc71..1f785a9e30 100644 --- a/test/pc/e2e/peer_connection_quality_test.cc +++ b/test/pc/e2e/peer_connection_quality_test.cc @@ -494,8 +494,8 @@ void PeerConnectionE2EQualityTest::SetDefaultValuesForMissingParams( } if (run_params->video_codecs.empty()) { - run_params->video_codecs.push_back(VideoCodecConfig( - run_params->video_codec_name, run_params->video_codec_required_params)); + run_params->video_codecs.push_back( + VideoCodecConfig(cricket::kVp8CodecName)); } }