From a7af0218826cfed77664e6723470c77089e12db1 Mon Sep 17 00:00:00 2001 From: Emircan Uysaler Date: Sat, 22 Sep 2018 19:11:29 -0400 Subject: [PATCH] Disable ulpfec when field trial flag is present FecEnabled() still returns true although "WebRTC-DisableUlpFecExperiment" flag is set as described on https://bugs.chromium.org/p/webrtc/issues/detail?id=9439#c33. Bug: webrtc:9439 Change-Id: Iace802e4cf2be7a14750024f7b191f4bb59a499a Reviewed-on: https://webrtc-review.googlesource.com/101500 Reviewed-by: Stefan Holmer Commit-Queue: Emircan Uysaler Cr-Commit-Position: refs/heads/master@{#24833} --- call/rtp_video_sender.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/call/rtp_video_sender.cc b/call/rtp_video_sender.cc index a145fdd6d3..8a550e14f5 100644 --- a/call/rtp_video_sender.cc +++ b/call/rtp_video_sender.cc @@ -423,8 +423,10 @@ void RtpVideoSender::ConfigureProtection(const RtpConfig& rtp_config) { bool RtpVideoSender::FecEnabled() const { const bool flexfec_enabled = (flexfec_sender_ != nullptr); - int ulpfec_payload_type = rtp_config_.ulpfec.ulpfec_payload_type; - return flexfec_enabled || ulpfec_payload_type >= 0; + const bool ulpfec_enabled = + !webrtc::field_trial::IsEnabled("WebRTC-DisableUlpFecExperiment") && + (rtp_config_.ulpfec.ulpfec_payload_type >= 0); + return flexfec_enabled || ulpfec_enabled; } bool RtpVideoSender::NackEnabled() const {