From eb42ab77cfcee464a43f4bf95ce9142e185a3393 Mon Sep 17 00:00:00 2001 From: philipel Date: Mon, 11 Oct 2021 11:18:48 +0200 Subject: [PATCH] Dont use simulcast for AV1. Bug: none Change-Id: I9d3bfb3bff497db740e317fcad0e8f91bfa88d1c Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/234744 Reviewed-by: Ilya Nikolaevskiy Commit-Queue: Philip Eliasson Cr-Commit-Position: refs/heads/main@{#35177} --- media/engine/webrtc_video_engine.cc | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/media/engine/webrtc_video_engine.cc b/media/engine/webrtc_video_engine.cc index dc50a8ebfb..c11f29b779 100644 --- a/media/engine/webrtc_video_engine.cc +++ b/media/engine/webrtc_video_engine.cc @@ -296,10 +296,16 @@ static bool ValidateStreamParams(const StreamParams& sp) { // Returns true if the given codec is disallowed from doing simulcast. bool IsCodecDisabledForSimulcast(const std::string& codec_name, const webrtc::WebRtcKeyValueConfig& trials) { - return !absl::StartsWith(trials.Lookup("WebRTC-H264Simulcast"), "Disabled") - ? absl::EqualsIgnoreCase(codec_name, kVp9CodecName) - : absl::EqualsIgnoreCase(codec_name, kH264CodecName) || - absl::EqualsIgnoreCase(codec_name, kVp9CodecName); + if (absl::EqualsIgnoreCase(codec_name, kVp9CodecName) || + absl::EqualsIgnoreCase(codec_name, kAv1CodecName)) { + return true; + } + + if (absl::EqualsIgnoreCase(codec_name, kH264CodecName)) { + return absl::StartsWith(trials.Lookup("WebRTC-H264Simulcast"), "Disabled"); + } + + return false; } // The selected thresholds for QVGA and VGA corresponded to a QP around 10.