zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[PCLF] Remove previously replaced configuration options

Browse Source 
VideoSimulcastConfig::encoding_params and VideoConfig::min/max_encode_bitrate_bps
were replaced by VideoConfig::encoding_params.
All usage of the previous options has been updated to the new option.

Bug: webrtc:11607
Change-Id: I52cd9efa6e640929485da7aa1e61d15a1a693b1d
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/261949
Reviewed-by: Artem Titov <titovartem@webrtc.org>
Commit-Queue: Florent Castelli <orphis@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#36865}
This commit is contained in:
Florent Castelli
2022-05-06 14:33:43 +02:00
committed by WebRTC LUCI CQ
parent 8c6d88ff5c
commit b5671da00d
3 changed files with 0 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
api/test/peerconnection_quality_test_fixture.h
View File

@ -174,14 +174,6 @@ class PeerConnectionE2EQualityTestFixture {
// It requires Selective Forwarding Unit (SFU) to be configured in the
// network.
absl::optional<int> target_spatial_index;
// Encoding parameters per simulcast layer. If not empty, `encoding_params`
// size have to be equal to `simulcast_streams_count`. Will be used to set
// transceiver send encoding params for simulcast layers. Applicable only
// for codecs that support simulcast (ex. Vp8) and will be ignored
// otherwise. RtpEncodingParameters::rid may be changed by fixture
// implementation to ensure signaling correctness.
std::vector<RtpEncodingParameters> encoding_params;
};
class VideoResolution {
@ -273,17 +265,6 @@ class PeerConnectionE2EQualityTestFixture {
// each RtpEncodingParameters of RtpParameters of corresponding
// RtpSenderInterface for this video stream.
absl::optional<int> temporal_layers_count;
// Sets the maximum encode bitrate in bps. If this value is not set, the
// encoder will be capped at an internal maximum value around 2 Mbps
// depending on the resolution. This means that it will never be able to
// utilize a high bandwidth link.
absl::optional<int> max_encode_bitrate_bps;
// Sets the minimum encode bitrate in bps. If this value is not set, the
// encoder will use an internal minimum value. Please note that if this
// value is set higher than the bandwidth of the link, the encoder will
// generate more data than the link can handle regardless of the bandwidth
// estimation.
absl::optional<int> min_encode_bitrate_bps;
// If specified the input stream will be also copied to specified file.
// It is actually one of the test's output file, which contains copy of what
// was captured during the test for this video stream on sender side.

14
test/pc/e2e/peer_configurer.cc
View File

@ -135,20 +135,6 @@ void PeerParamsPreprocessor::ValidateParams(const PeerConfigurerImpl& peer) {
RTC_CHECK_LT(*video_config.simulcast_config->target_spatial_index,
video_config.simulcast_config->simulcast_streams_count);
}
RTC_CHECK(!video_config.max_encode_bitrate_bps)
<< "Setting max encode bitrate is not implemented for simulcast.";
RTC_CHECK(!video_config.min_encode_bitrate_bps)
<< "Setting min encode bitrate is not implemented for simulcast.";
RTC_CHECK(video_config.simulcast_config->encoding_params.empty() ||
video_config.encoding_params.empty())
<< "Can't provide |encoding_params| in both |simulcast_config| and "
"|video_config|.";
if (!video_config.simulcast_config->encoding_params.empty()) {
RTC_CHECK_EQ(video_config.simulcast_config->simulcast_streams_count,
video_config.simulcast_config->encoding_params.size())
<< "|encoding_params| have to be specified for each simulcast "
<< "stream in |simulcast_config|.";
}
if (!video_config.encoding_params.empty()) {
RTC_CHECK_EQ(video_config.simulcast_config->simulcast_streams_count,
video_config.encoding_params.size())

5
test/pc/e2e/peer_connection_quality_test.cc
View File

@ -483,9 +483,6 @@ void PeerConnectionE2EQualityTest::SetupCallOnSignalingThread(
for (int i = 0;
i < video_config.simulcast_config->simulcast_streams_count; ++i) {
RtpEncodingParameters enc_params;
if (!video_config.simulcast_config->encoding_params.empty()) {
enc_params = video_config.simulcast_config->encoding_params[i];
}
if (!video_config.encoding_params.empty()) {
enc_params = video_config.encoding_params[i];
}
@ -501,8 +498,6 @@ void PeerConnectionE2EQualityTest::SetupCallOnSignalingThread(
if (video_config.encoding_params.size() == 1) {
enc_params = video_config.encoding_params[0];
}
enc_params.max_bitrate_bps = video_config.max_encode_bitrate_bps;
enc_params.min_bitrate_bps = video_config.min_encode_bitrate_bps;
transceiver_params.send_encodings.push_back(enc_params);
alice_video_transceivers_non_simulcast_counter++;