From 3da7de76c7167bf84493252e40ba58dd18f8a554 Mon Sep 17 00:00:00 2001 From: Raja Subramanian Date: Mon, 10 Feb 2025 13:40:16 +0530 Subject: [PATCH] Fix sense of codec match check while setting layer SSRC. (#3418) --- pkg/rtc/dynacast/dynacastmanager.go | 3 +-- pkg/rtc/mediatrackreceiver.go | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkg/rtc/dynacast/dynacastmanager.go b/pkg/rtc/dynacast/dynacastmanager.go index b2ef9bc20..e32b9a0cc 100644 --- a/pkg/rtc/dynacast/dynacastmanager.go +++ b/pkg/rtc/dynacast/dynacastmanager.go @@ -114,8 +114,7 @@ func (d *DynacastManager) HandleCodecRegression(fromMime, toMime mime.MimeType) d.update(false) fromDq.Stop() - ToDq := d.getOrCreateDynacastQuality(toMime) - fromDq.RegressTo(ToDq) + fromDq.RegressTo(d.getOrCreateDynacastQuality(toMime)) } func (d *DynacastManager) Restart() { diff --git a/pkg/rtc/mediatrackreceiver.go b/pkg/rtc/mediatrackreceiver.go index 6aff85278..1bffa5657 100644 --- a/pkg/rtc/mediatrackreceiver.go +++ b/pkg/rtc/mediatrackreceiver.go @@ -238,9 +238,9 @@ func (t *MediaTrackReceiver) SetupReceiver(receiver sfu.TrackReceiver, priority onSetupReceiver := t.onSetupReceiver t.lock.Unlock() - var receiverCodecs []mime.MimeType + var receiverCodecs []string for _, r := range receivers { - receiverCodecs = append(receiverCodecs, r.Mime()) + receiverCodecs = append(receiverCodecs, r.Mime().String()) } t.params.Logger.Debugw( "setup receiver", @@ -667,7 +667,7 @@ func (t *MediaTrackReceiver) SetLayerSsrc(mimeType mime.MimeType, rid string, ss quality := buffer.SpatialLayerToVideoQuality(layer, trackInfo) // set video layer ssrc info for i, ci := range trackInfo.Codecs { - if mime.NormalizeMimeType(ci.MimeType) == mimeType { + if mime.NormalizeMimeType(ci.MimeType) != mimeType { continue }