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 <stefan@webrtc.org>
Commit-Queue: Emircan Uysaler <emircan@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24833}
This commit is contained in:
Emircan Uysaler 2018-09-22 19:11:29 -04:00 committed by Commit Bot
parent e804f92740
commit a7af021882

View File

@ -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 {