From b971a534e91452fbd9bbbb41fbfb6e99a4e8da53 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Wed, 23 Aug 2023 14:09:54 -0700 Subject: [PATCH] Fix inconsistent logics to check if temporal layer is supported MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In fucntion EncoderStreamFactory::CreateSimulcastOrConferenceModeScreenshareStreams, the follow code allows TL for H264. const bool temporal_layers_supported = absl::EqualsIgnoreCase(codec_name_, kVp8CodecName) || absl::EqualsIgnoreCase(codec_name_, kH264CodecName); However, the helper function IsTemporalLayersSupported does not allow TL for H264. The diff unifies the logic by using the helper function Bug: webrtc:15442 Change-Id: I1497ccc1cd5d3715310e0485f9179bd8e6948f1a Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/317542 Commit-Queue: Philip Eliasson Reviewed-by: Philip Eliasson Reviewed-by: Philipp Hancke Reviewed-by: Erik Språng Cr-Commit-Position: refs/heads/main@{#40629} --- video/config/encoder_stream_factory.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/video/config/encoder_stream_factory.cc b/video/config/encoder_stream_factory.cc index c955602cfc..a4e41ad62d 100644 --- a/video/config/encoder_stream_factory.cc +++ b/video/config/encoder_stream_factory.cc @@ -313,9 +313,7 @@ EncoderStreamFactory::CreateSimulcastOrConferenceModeScreenshareStreams( const absl::optional& experimental_min_bitrate) const { std::vector layers; - const bool temporal_layers_supported = - absl::EqualsIgnoreCase(codec_name_, kVp8CodecName) || - absl::EqualsIgnoreCase(codec_name_, kH264CodecName); + const bool temporal_layers_supported = IsTemporalLayersSupported(codec_name_); // Use legacy simulcast screenshare if conference mode is explicitly enabled // or use the regular simulcast configuration path which is generic. layers = GetSimulcastConfig(FindRequiredActiveLayers(encoder_config),