From 45ed030ce673d9d496588ba97a7125f70c5ce201 Mon Sep 17 00:00:00 2001 From: Antti Tapaninen Date: Fri, 3 May 2024 23:17:29 -0700 Subject: [PATCH] add missing strings.EqualFold for some mimeType comparisons (#2701) --- pkg/rtc/mediatrackreceiver.go | 2 +- pkg/rtc/mediatracksubscriptions.go | 5 +++-- pkg/rtc/wrappedreceiver.go | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkg/rtc/mediatrackreceiver.go b/pkg/rtc/mediatrackreceiver.go index ec4c9adf0..5453e4300 100644 --- a/pkg/rtc/mediatrackreceiver.go +++ b/pkg/rtc/mediatrackreceiver.go @@ -469,7 +469,7 @@ func (t *MediaTrackReceiver) AddSubscriber(sub types.LocalParticipant) (types.Su codec := receiver.Codec() var found bool for _, pc := range potentialCodecs { - if codec.MimeType == pc.MimeType { + if strings.EqualFold(codec.MimeType, pc.MimeType) { found = true break } diff --git a/pkg/rtc/mediatracksubscriptions.go b/pkg/rtc/mediatracksubscriptions.go index 158cafe10..78c045e88 100644 --- a/pkg/rtc/mediatracksubscriptions.go +++ b/pkg/rtc/mediatracksubscriptions.go @@ -16,6 +16,7 @@ package rtc import ( "errors" + "strings" "sync" "github.com/pion/rtcp" @@ -258,7 +259,7 @@ func (t *MediaTrackSubscriptions) AddSubscriber(sub types.LocalParticipant, wr * Stereo: info.Stereo, Red: !info.DisableRed, } - if addTrackParams.Red && (len(codecs) == 1 && codecs[0].MimeType == webrtc.MimeTypeOpus) { + if addTrackParams.Red && (len(codecs) == 1 && strings.EqualFold(codecs[0].MimeType, webrtc.MimeTypeOpus)) { addTrackParams.Red = false } @@ -354,7 +355,7 @@ func (t *MediaTrackSubscriptions) GetAllSubscribersForMime(mime string) []liveki subs := make([]livekit.ParticipantID, 0, len(t.subscribedTracks)) for id, subTrack := range t.subscribedTracks { - if subTrack.DownTrack().Codec().MimeType != mime { + if !strings.EqualFold(subTrack.DownTrack().Codec().MimeType, mime) { continue } diff --git a/pkg/rtc/wrappedreceiver.go b/pkg/rtc/wrappedreceiver.go index 42fe9d707..1d1a7cd9c 100644 --- a/pkg/rtc/wrappedreceiver.go +++ b/pkg/rtc/wrappedreceiver.go @@ -90,7 +90,7 @@ func (r *WrappedReceiver) StreamID() string { func (r *WrappedReceiver) DetermineReceiver(codec webrtc.RTPCodecCapability) { r.determinedCodec = codec for _, receiver := range r.receivers { - if c := receiver.Codec(); c.MimeType == codec.MimeType { + if c := receiver.Codec(); strings.EqualFold(c.MimeType, codec.MimeType) { r.TrackReceiver = receiver break } else if strings.EqualFold(c.MimeType, sfu.MimeTypeAudioRed) && strings.EqualFold(codec.MimeType, webrtc.MimeTypeOpus) {