Updates how min bitrate is set for VP9 SVC in perf tests.

In the video quality tests the codec-level min bitrate is sometimes set
as if single-stream simulcast will be used. When VP9 spatial layers are
then generated the will get new appropriate min bitrate levels.
The encoder adjuster can however look at the codec level min bitrate
and incorrectly adjust the bitrate up if it is set too high.

This CL removes the codec-level min bitrate if svc is used.

Bug: webrtc:12080
Change-Id: I563a57f3031c90c116448f1d255d3b6711f4ee75
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/190520
Reviewed-by: Stefan Holmer <stefan@webrtc.org>
Commit-Queue: Erik Språng <sprang@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#32509}
This commit is contained in:
Erik Språng
2020-10-27 13:01:37 +01:00
committed by Commit Bot
parent 2963d303b0
commit 25a1334534

View File

@ -862,6 +862,10 @@ void VideoQualityTest::SetupVideo(Transport* send_transport,
video_encoder_configs_[video_idx].encoder_specific_settings =
new rtc::RefCountedObject<
VideoEncoderConfig::Vp9EncoderSpecificSettings>(vp9_settings);
RTC_DCHECK_EQ(video_encoder_configs_[video_idx].simulcast_layers.size(),
1);
// Min bitrate will be enforced by spatial layer config instead.
video_encoder_configs_[video_idx].simulcast_layers[0].min_bitrate_bps = 0;
} else if (params_.video[video_idx].automatic_scaling) {
if (params_.video[video_idx].codec == "VP8") {
VideoCodecVP8 vp8_settings = VideoEncoder::GetDefaultVp8Settings();