From 1da46abbddb6802fd039853ab5454289658558ce Mon Sep 17 00:00:00 2001 From: Ilya Nikolaevskiy Date: Fri, 9 Oct 2020 16:09:11 +0200 Subject: [PATCH] Fix quality scaler being accidentally enabled for VP9 Bug: webrtc:12026 Change-Id: If8361ff665f82741270336ddc110b4f0662c83b1 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/187483 Reviewed-by: Evan Shrubsole Commit-Queue: Ilya Nikolaevskiy Cr-Commit-Position: refs/heads/master@{#32380} --- modules/video_coding/codecs/vp9/vp9_impl.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/video_coding/codecs/vp9/vp9_impl.cc b/modules/video_coding/codecs/vp9/vp9_impl.cc index 04aa53d9a8..49fa92fd8d 100644 --- a/modules/video_coding/codecs/vp9/vp9_impl.cc +++ b/modules/video_coding/codecs/vp9/vp9_impl.cc @@ -1619,7 +1619,8 @@ VideoEncoder::EncoderInfo VP9EncoderImpl::GetEncoderInfo() const { EncoderInfo info; info.supports_native_handle = false; info.implementation_name = "libvpx"; - if (quality_scaler_experiment_.enabled) { + if (quality_scaler_experiment_.enabled && inited_ && + codec_.VP9().automaticResizeOn) { info.scaling_settings = VideoEncoder::ScalingSettings( quality_scaler_experiment_.low_qp, quality_scaler_experiment_.high_qp); } else {