From 6a0b72c35746c247e732d2714bc566232df055ff Mon Sep 17 00:00:00 2001 From: Raja Subramanian Date: Fri, 1 Mar 2024 15:21:00 +0530 Subject: [PATCH] Use SubscriberID() is calls to `DeleteDownTrack`. (#2533) Thank you @cnderrauber for catching this. --- pkg/rtc/wrappedreceiver.go | 6 +++--- pkg/sfu/downtrack.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/rtc/wrappedreceiver.go b/pkg/rtc/wrappedreceiver.go index a887ef832..677da8c3d 100644 --- a/pkg/rtc/wrappedreceiver.go +++ b/pkg/rtc/wrappedreceiver.go @@ -263,13 +263,13 @@ func (d *DummyReceiver) AddDownTrack(track sfu.TrackSender) error { return nil } -func (d *DummyReceiver) DeleteDownTrack(participantID livekit.ParticipantID) { +func (d *DummyReceiver) DeleteDownTrack(subscriberID livekit.ParticipantID) { d.downtrackLock.Lock() defer d.downtrackLock.Unlock() if r, ok := d.receiver.Load().(sfu.TrackReceiver); ok { - r.DeleteDownTrack(participantID) + r.DeleteDownTrack(subscriberID) } else { - delete(d.downtracks, participantID) + delete(d.downtracks, subscriberID) } } diff --git a/pkg/sfu/downtrack.go b/pkg/sfu/downtrack.go index 23f7433cb..79abf6242 100644 --- a/pkg/sfu/downtrack.go +++ b/pkg/sfu/downtrack.go @@ -981,7 +981,7 @@ func (d *DownTrack) CloseWithFlush(flush bool) { d.onBindAndConnectedChange() d.params.Logger.Debugw("closing sender", "kind", d.kind) } - d.params.Receiver.DeleteDownTrack(d.params.SubID) + d.params.Receiver.DeleteDownTrack(d.SubscriberID()) if d.rtcpReader != nil && flush { d.params.Logger.Debugw("downtrack close rtcp reader")