From 55962e300cac271cde8e1618d863b7a07614013f Mon Sep 17 00:00:00 2001
From: cnderrauber <zengjie9004@gmail.com>
Date: Fri, 13 Jan 2023 17:07:06 +0800
Subject: [PATCH] enable track level audo nack config (#1306)

---
 pkg/rtc/mediatracksubscriptions.go |  1 +
 pkg/rtc/transport.go               | 17 ++++++++---------
 pkg/rtc/types/interfaces.go        |  1 +
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkg/rtc/mediatracksubscriptions.go b/pkg/rtc/mediatracksubscriptions.go
index 0f9f86877..c80c3d616 100644
--- a/pkg/rtc/mediatracksubscriptions.go
+++ b/pkg/rtc/mediatracksubscriptions.go
@@ -209,6 +209,7 @@ func (t *MediaTrackSubscriptions) AddSubscriber(sub types.LocalParticipant, wr *
 		info := t.params.MediaTrack.ToProto()
 		addTrackParams := types.AddTrackParams{
 			Stereo: info.Stereo,
+			Red:    !info.DisableRed,
 		}
 		sub.VerifySubscribeParticipantInfo(subTrack.PublisherID(), subTrack.PublisherVersion())
 		if sub.ProtocolVersion().SupportsTransceiverReuse() {
diff --git a/pkg/rtc/transport.go b/pkg/rtc/transport.go
index 14e22f1ba..899aaa28a 100644
--- a/pkg/rtc/transport.go
+++ b/pkg/rtc/transport.go
@@ -220,10 +220,6 @@ type TransportParams struct {
 
 func newPeerConnection(params TransportParams, onBandwidthEstimator func(estimator cc.BandwidthEstimator)) (*webrtc.PeerConnection, *webrtc.MediaEngine, error) {
 	directionConfig := params.DirectionConfig
-	// enable nack if audio red is not support
-	if !isCodecEnabled(params.EnabledCodecs, webrtc.RTPCodecCapability{MimeType: sfu.MimeTypeAudioRed}) || !params.ClientInfo.SupportsAudioRED() {
-		directionConfig.RTCPFeedback.Audio = append(directionConfig.RTCPFeedback.Audio, webrtc.RTCPFeedback{Type: webrtc.TypeRTCPFBNACK})
-	}
 
 	me, err := createMediaEngine(params.EnabledCodecs, directionConfig)
 	if err != nil {
@@ -273,7 +269,7 @@ func newPeerConnection(params TransportParams, onBandwidthEstimator func(estimat
 		if len(nat1to1Ips) > 0 {
 			params.Logger.Infow("client doesn't support prflx over relay, use external ip only as host candidate", "ips", nat1to1Ips)
 			se.SetNAT1To1IPs(nat1to1Ips, webrtc.ICECandidateTypeHost)
-			se.SetIPFilter(func (ip net.IP) bool {
+			se.SetIPFilter(func(ip net.IP) bool {
 				ipstr := ip.String()
 				for _, inc := range includeIps {
 					if inc == ipstr {
@@ -627,7 +623,7 @@ func (t *PCTransport) AddTrack(trackLocal webrtc.TrackLocal, params types.AddTra
 		return
 	}
 
-	configureTransceiverStereo(transceiver, params.Stereo)
+	configureAudioTransceiver(transceiver, params.Stereo, !params.Red || !t.params.ClientInfo.SupportsAudioRED())
 
 	return
 }
@@ -644,7 +640,7 @@ func (t *PCTransport) AddTransceiverFromTrack(trackLocal webrtc.TrackLocal, para
 		return
 	}
 
-	configureTransceiverStereo(transceiver, params.Stereo)
+	configureAudioTransceiver(transceiver, params.Stereo, !params.Red || !t.params.ClientInfo.SupportsAudioRED())
 
 	return
 }
@@ -1766,8 +1762,8 @@ func (t *PCTransport) handleICERestart(e *event) error {
 	return t.doICERestart()
 }
 
-// configure subscriber tranceiver for audio stereo
-func configureTransceiverStereo(tr *webrtc.RTPTransceiver, stereo bool) {
+// configure subscriber tranceiver for audio stereo and nack
+func configureAudioTransceiver(tr *webrtc.RTPTransceiver, stereo bool, nack bool) {
 	sender := tr.Sender()
 	if sender == nil {
 		return
@@ -1781,6 +1777,9 @@ func configureTransceiverStereo(tr *webrtc.RTPTransceiver, stereo bool) {
 			if stereo {
 				c.SDPFmtpLine += ";sprop-stereo=1"
 			}
+			if nack {
+				c.RTCPFeedback = append(c.RTCPFeedback, webrtc.RTCPFeedback{Type: webrtc.TypeRTCPFBNACK})
+			}
 		}
 		configCodecs = append(configCodecs, c)
 	}
diff --git a/pkg/rtc/types/interfaces.go b/pkg/rtc/types/interfaces.go
index 7006e7f33..c4bf76951 100644
--- a/pkg/rtc/types/interfaces.go
+++ b/pkg/rtc/types/interfaces.go
@@ -220,6 +220,7 @@ const (
 
 type AddTrackParams struct {
 	Stereo bool
+	Red    bool
 }
 
 //counterfeiter:generate . LocalParticipant