From f5fc537c4bb1cb4f3608f78a5353a9bd61c8ebc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Spr=C3=A5ng?= Date: Wed, 19 Dec 2018 16:04:08 +0100 Subject: [PATCH] Allow H264 simulcast be default MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: chromium:908099 Change-Id: If50d59e01ea008ce29c8225c24f5189d34817506 Reviewed-on: https://webrtc-review.googlesource.com/c/115042 Reviewed-by: Ilya Nikolaevskiy Commit-Queue: Erik Språng Cr-Commit-Position: refs/heads/master@{#26059} --- media/engine/webrtcvideoengine.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media/engine/webrtcvideoengine.cc b/media/engine/webrtcvideoengine.cc index a6c6248326..b6f788bf58 100644 --- a/media/engine/webrtcvideoengine.cc +++ b/media/engine/webrtcvideoengine.cc @@ -219,7 +219,7 @@ static bool ValidateStreamParams(const StreamParams& sp) { // Returns true if the given codec is disallowed from doing simulcast. bool IsCodecBlacklistedForSimulcast(const std::string& codec_name) { - return webrtc::field_trial::IsEnabled("WebRTC-H264Simulcast") + return !webrtc::field_trial::IsDisabled("WebRTC-H264Simulcast") ? absl::EqualsIgnoreCase(codec_name, kVp9CodecName) : absl::EqualsIgnoreCase(codec_name, kH264CodecName) || absl::EqualsIgnoreCase(codec_name, kVp9CodecName);