From 4792e7e1346bb3501ee68ce53446da3f0dd09ce6 Mon Sep 17 00:00:00 2001
From: cnderrauber <zengjie9004@gmail.com>
Date: Wed, 4 Sep 2024 02:42:18 +0000
Subject: [PATCH] Revert "Add tracksubscribed event on downtrack added (#2934)"
 (#2975)

This reverts commit 8b472182703566f175c203188549dc2939f59c4c.
---
 pkg/rtc/mediatrack.go |  1 -
 pkg/sfu/receiver.go   | 22 ++--------------------
 2 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/pkg/rtc/mediatrack.go b/pkg/rtc/mediatrack.go
index 673de6bd2..11f306a54 100644
--- a/pkg/rtc/mediatrack.go
+++ b/pkg/rtc/mediatrack.go
@@ -285,7 +285,6 @@ func (t *MediaTrack) AddReceiver(receiver *webrtc.RTPReceiver, track *webrtc.Tra
 			sfu.WithLoadBalanceThreshold(20),
 			sfu.WithStreamTrackers(),
 			sfu.WithForwardStats(t.params.ForwardStats),
-			sfu.WithEverHasDownTrackAdded(t.OnTrackSubscribed),
 		)
 		newWR.OnCloseHandler(func() {
 			t.MediaTrackReceiver.SetClosing()
diff --git a/pkg/sfu/receiver.go b/pkg/sfu/receiver.go
index 5f8c00ee3..0a565661f 100644
--- a/pkg/sfu/receiver.go
+++ b/pkg/sfu/receiver.go
@@ -126,10 +126,8 @@ type WebRTCReceiver struct {
 
 	connectionStats *connectionquality.ConnectionStats
 
-	onStatsUpdate        func(w *WebRTCReceiver, stat *livekit.AnalyticsStat)
-	onMaxLayerChange     func(maxLayer int32)
-	downTrackEverAdded   atomic.Bool
-	onDownTrackEverAdded func()
+	onStatsUpdate    func(w *WebRTCReceiver, stat *livekit.AnalyticsStat)
+	onMaxLayerChange func(maxLayer int32)
 
 	primaryReceiver atomic.Pointer[RedPrimaryReceiver]
 	redReceiver     atomic.Pointer[RedReceiver]
@@ -185,13 +183,6 @@ func WithForwardStats(forwardStats *ForwardStats) ReceiverOpts {
 	}
 }
 
-func WithEverHasDownTrackAdded(f func()) ReceiverOpts {
-	return func(w *WebRTCReceiver) *WebRTCReceiver {
-		w.onDownTrackEverAdded = f
-		return w
-	}
-}
-
 // NewWebRTCReceiver creates a new webrtc track receiver
 func NewWebRTCReceiver(
 	receiver *webrtc.RTPReceiver,
@@ -430,16 +421,9 @@ func (w *WebRTCReceiver) AddDownTrack(track TrackSender) error {
 
 	w.downTrackSpreader.Store(track)
 	w.logger.Debugw("downtrack added", "subscriberID", track.SubscriberID())
-	w.handleDowntrackAdded()
 	return nil
 }
 
-func (w *WebRTCReceiver) handleDowntrackAdded() {
-	if !w.downTrackEverAdded.Swap(true) && w.onDownTrackEverAdded != nil {
-		w.onDownTrackEverAdded()
-	}
-}
-
 func (w *WebRTCReceiver) notifyMaxExpectedLayer(layer int32) {
 	ti := w.TrackInfo()
 	if ti == nil {
@@ -802,7 +786,6 @@ func (w *WebRTCReceiver) GetPrimaryReceiverForRed() TrackReceiver {
 			w.bufferMu.Lock()
 			w.redPktWriter = pr.ForwardRTP
 			w.bufferMu.Unlock()
-			w.handleDowntrackAdded()
 		}
 	}
 	return w.primaryReceiver.Load()
@@ -822,7 +805,6 @@ func (w *WebRTCReceiver) GetRedReceiver() TrackReceiver {
 			w.bufferMu.Lock()
 			w.redPktWriter = pr.ForwardRTP
 			w.bufferMu.Unlock()
-			w.handleDowntrackAdded()
 		}
 	}
 	return w.redReceiver.Load()