From 379a0b49d2bcfbabf62a9d1c5a7db0f7e46e8798 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=85sa=20Persson?= Date: Thu, 6 Oct 2022 11:25:38 +0200 Subject: [PATCH] Only set apply_alignment_to_all_simulcast_layers if set by any encoder. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: none Change-Id: I16448b71c54536d88e6e5326586219f833daf174 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/278044 Commit-Queue: Åsa Persson Reviewed-by: Ilya Nikolaevskiy Cr-Commit-Position: refs/heads/main@{#38305} --- media/engine/simulcast_encoder_adapter.cc | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/media/engine/simulcast_encoder_adapter.cc b/media/engine/simulcast_encoder_adapter.cc index e7f6205ab6..d2f982e849 100644 --- a/media/engine/simulcast_encoder_adapter.cc +++ b/media/engine/simulcast_encoder_adapter.cc @@ -928,12 +928,7 @@ VideoEncoder::EncoderInfo SimulcastEncoderAdapter::GetEncoderInfo() const { encoder_info.requested_resolution_alignment = cricket::LeastCommonMultiple( encoder_info.requested_resolution_alignment, encoder_impl_info.requested_resolution_alignment); - // request alignment on all layers if any of the encoders may need it, or - // if any non-top layer encoder requests a non-trivial alignment. - if (encoder_impl_info.apply_alignment_to_all_simulcast_layers || - (encoder_impl_info.requested_resolution_alignment > 1 && - (codec_.simulcastStream[i].height < codec_.height || - codec_.simulcastStream[i].width < codec_.width))) { + if (encoder_impl_info.apply_alignment_to_all_simulcast_layers) { encoder_info.apply_alignment_to_all_simulcast_layers = true; } }