From 132d1ad31a7458f670cb40fd77ffacea3bfb46f6 Mon Sep 17 00:00:00 2001 From: Raja Subramanian Date: Fri, 23 Feb 2024 08:20:03 +0530 Subject: [PATCH] Null out on slice compaction. (#2503) Go 1.22 does this automatically with `slices` - https://go.dev/blog/generic-slice-functions --- pkg/rtc/mediatrackreceiver.go | 1 + pkg/rtc/participant.go | 1 + pkg/rtc/participant_sdp.go | 1 + 3 files changed, 3 insertions(+) diff --git a/pkg/rtc/mediatrackreceiver.go b/pkg/rtc/mediatrackreceiver.go index d0818ceb1..b0bb43ed5 100644 --- a/pkg/rtc/mediatrackreceiver.go +++ b/pkg/rtc/mediatrackreceiver.go @@ -259,6 +259,7 @@ func (t *MediaTrackReceiver) ClearReceiver(mime string, willBeResumed bool) { for idx, receiver := range receivers { if strings.EqualFold(receiver.Codec().MimeType, mime) { receivers[idx] = receivers[len(receivers)-1] + receivers[len(receivers)-1] = nil receivers = receivers[:len(receivers)-1] break } diff --git a/pkg/rtc/participant.go b/pkg/rtc/participant.go index a3b939955..5e8ffd061 100644 --- a/pkg/rtc/participant.go +++ b/pkg/rtc/participant.go @@ -733,6 +733,7 @@ func (p *ParticipantImpl) removePendingMigratedTrack(mt *MediaTrack) { for i, t := range p.pendingMigratedTracks { if t == mt { p.pendingMigratedTracks[i] = p.pendingMigratedTracks[len(p.pendingMigratedTracks)-1] + p.pendingMigratedTracks[len(p.pendingMigratedTracks)-1] = nil p.pendingMigratedTracks = p.pendingMigratedTracks[:len(p.pendingMigratedTracks)-1] break } diff --git a/pkg/rtc/participant_sdp.go b/pkg/rtc/participant_sdp.go index ed47d2da9..2516291d3 100644 --- a/pkg/rtc/participant_sdp.go +++ b/pkg/rtc/participant_sdp.go @@ -157,6 +157,7 @@ func (p *ParticipantImpl) setCodecPreferencesVideoForPublisher(offer webrtc.Sess for i, attr := range unmatchVideo.Attributes { if strings.Contains(attr.Value, dd.ExtensionURI) { unmatchVideo.Attributes[i] = unmatchVideo.Attributes[len(unmatchVideo.Attributes)-1] + unmatchVideo.Attributes[len(unmatchVideo.Attributes)-1] = sdp.Attribute{} unmatchVideo.Attributes = unmatchVideo.Attributes[:len(unmatchVideo.Attributes)-1] break }