Always disable RED when ULPFEC is disabled.

This prevents a lot of unnecessary processing taking place when we are
not using FEC.

This CL also removes the FieldTrial that was used to disable ulpfec, as it's no longer used.

Bug: webrtc:9514
Change-Id: I8285b933f71eea971f5932cd19833455a42c8639
Reviewed-on: https://webrtc-review.googlesource.com/87848
Reviewed-by: Stefan Holmer <stefan@webrtc.org>
Reviewed-by: Rasmus Brandt <brandtr@webrtc.org>
Commit-Queue: Kári Helgason <kthelgason@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23952}
This commit is contained in:
Kári Tristan Helgason
2018-07-11 16:04:57 +02:00
committed by Commit Bot
parent 4238628c30
commit 798ee75d23
4 changed files with 16 additions and 44 deletions

View File

@ -426,13 +426,8 @@ class RtpRtcp : public Module, public RtcpFeedbackSenderInterface {
// Set RED and ULPFEC payload types. A payload type of -1 means that the
// corresponding feature is turned off. Note that we DO NOT support enabling
// ULPFEC without enabling RED. However, we DO support enabling RED without
// enabling ULPFEC. This is due to an RED/RTX workaround, where the receiver
// assumes that RTX packets carry RED if RED has been configured in the SDP,
// regardless of what RTX payload type mapping was negotiated in the SDP.
// TODO(brandtr): Update this comment when we have removed the RED/RTX
// send-side workaround, i.e., when we do not support enabling RED without
// enabling ULPFEC.
// ULPFEC without enabling RED, and RED is only ever used when ULPFEC is
// enabled.
virtual void SetUlpfecConfig(int red_payload_type,
int ulpfec_payload_type) = 0;