[PCLF] Remove previously replaced configuration options
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:

committed by
WebRTC LUCI CQ

parent
8c6d88ff5c
commit
b5671da00d
@ -174,14 +174,6 @@ class PeerConnectionE2EQualityTestFixture {
|
|||||||
// It requires Selective Forwarding Unit (SFU) to be configured in the
|
// It requires Selective Forwarding Unit (SFU) to be configured in the
|
||||||
// network.
|
// network.
|
||||||
absl::optional<int> target_spatial_index;
|
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 {
|
class VideoResolution {
|
||||||
@ -273,17 +265,6 @@ class PeerConnectionE2EQualityTestFixture {
|
|||||||
// each RtpEncodingParameters of RtpParameters of corresponding
|
// each RtpEncodingParameters of RtpParameters of corresponding
|
||||||
// RtpSenderInterface for this video stream.
|
// RtpSenderInterface for this video stream.
|
||||||
absl::optional<int> temporal_layers_count;
|
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.
|
// 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
|
// 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.
|
// was captured during the test for this video stream on sender side.
|
||||||
|
@ -135,20 +135,6 @@ void PeerParamsPreprocessor::ValidateParams(const PeerConfigurerImpl& peer) {
|
|||||||
RTC_CHECK_LT(*video_config.simulcast_config->target_spatial_index,
|
RTC_CHECK_LT(*video_config.simulcast_config->target_spatial_index,
|
||||||
video_config.simulcast_config->simulcast_streams_count);
|
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()) {
|
if (!video_config.encoding_params.empty()) {
|
||||||
RTC_CHECK_EQ(video_config.simulcast_config->simulcast_streams_count,
|
RTC_CHECK_EQ(video_config.simulcast_config->simulcast_streams_count,
|
||||||
video_config.encoding_params.size())
|
video_config.encoding_params.size())
|
||||||
|
@ -483,9 +483,6 @@ void PeerConnectionE2EQualityTest::SetupCallOnSignalingThread(
|
|||||||
for (int i = 0;
|
for (int i = 0;
|
||||||
i < video_config.simulcast_config->simulcast_streams_count; ++i) {
|
i < video_config.simulcast_config->simulcast_streams_count; ++i) {
|
||||||
RtpEncodingParameters enc_params;
|
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()) {
|
if (!video_config.encoding_params.empty()) {
|
||||||
enc_params = video_config.encoding_params[i];
|
enc_params = video_config.encoding_params[i];
|
||||||
}
|
}
|
||||||
@ -501,8 +498,6 @@ void PeerConnectionE2EQualityTest::SetupCallOnSignalingThread(
|
|||||||
if (video_config.encoding_params.size() == 1) {
|
if (video_config.encoding_params.size() == 1) {
|
||||||
enc_params = video_config.encoding_params[0];
|
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);
|
transceiver_params.send_encodings.push_back(enc_params);
|
||||||
|
|
||||||
alice_video_transceivers_non_simulcast_counter++;
|
alice_video_transceivers_non_simulcast_counter++;
|
||||||
|
Reference in New Issue
Block a user