video: Re-configure scalers when encoder info changed.
Encoder info will be modified at runtime. In fact, we should reduce the
number of 'full' ReconfigureEncoder(). If only need subset of it at
runtime, consider handle it in VideoStreamEncoder::EncodeVideoFrame().
Consider two cases:
Re-configure scalers when encoder info changed. Consider two cases:
1. When the status of the scaler changes from enabled to disabled, if we
don't do this CL, scaler will adapt up/down to trigger an unnecessary
full ReconfigureEncoder() when the scaler should be banned.
2. When the status of the scaler changes from disabled to enabled, if we
don't do this CL, scaler will not work until some code trigger
ReconfigureEncoder(). In extreme cases, the scaler doesn't even work for
a long time when we expect that the scaler should work.
This CL aims to make scalers work properly when encoder info changed.
BUG: None
Change-Id: Iec17730b5fac5e642c0fb2d9b11c5b7434f0a220
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/233384
Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org>
Reviewed-by: Henrik Boström <hbos@webrtc.org>
Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#35175}
diff --git a/video/video_stream_encoder.cc b/video/video_stream_encoder.cc
index 8774ff7..9180bbb 100644
--- a/video/video_stream_encoder.cc
+++ b/video/video_stream_encoder.cc
@@ -848,6 +848,9 @@
});
}
+// We should reduce the number of 'full' ReconfigureEncoder(). If only need
+// subset of it at runtime, consider handle it in
+// VideoStreamEncoder::EncodeVideoFrame() when encoder_info_ != info.
void VideoStreamEncoder::ReconfigureEncoder() {
// Running on the encoder queue.
RTC_DCHECK(pending_encoder_reconfiguration_);
@@ -1668,8 +1671,18 @@
if (encoder_info_ != info) {
OnEncoderSettingsChanged();
stream_resource_manager_.ConfigureEncodeUsageResource();
- RTC_LOG(LS_INFO) << "Encoder settings changed from "
- << encoder_info_.ToString() << " to " << info.ToString();
+ // Re-configure scalers when encoder info changed. Consider two cases:
+ // 1. When the status of the scaler changes from enabled to disabled, if we
+ // don't do this CL, scaler will adapt up/down to trigger an unnecessary
+ // full ReconfigureEncoder() when the scaler should be banned.
+ // 2. When the status of the scaler changes from disabled to enabled, if we
+ // don't do this CL, scaler will not work until some code trigger
+ // ReconfigureEncoder(). In extreme cases, the scaler doesn't even work for
+ // a long time when we expect that the scaler should work.
+ stream_resource_manager_.ConfigureQualityScaler(info);
+ stream_resource_manager_.ConfigureBandwidthQualityScaler(info);
+
+ RTC_LOG(LS_INFO) << "Encoder info changed to " << info.ToString();
}
if (bitrate_adjuster_) {
