From 6cac17affe52d498c8b07ce3108044fe19027e2a Mon Sep 17 00:00:00 2001
From: Raja Subramanian <raja.gobi@tutanota.com>
Date: Sat, 23 Dec 2023 18:55:24 +0530
Subject: [PATCH] Add some debug logs around track publish (#2340)

---
 pkg/rtc/mediatrack.go         | 8 +++++++-
 pkg/rtc/mediatrackreceiver.go | 2 +-
 pkg/rtc/participant.go        | 5 +++--
 pkg/sfu/downtrack.go          | 2 +-
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkg/rtc/mediatrack.go b/pkg/rtc/mediatrack.go
index 7a3ca64fc..3cc45dba6 100644
--- a/pkg/rtc/mediatrack.go
+++ b/pkg/rtc/mediatrack.go
@@ -211,7 +211,13 @@ func (t *MediaTrack) AddReceiver(receiver *webrtc.RTPReceiver, track *webrtc.Tra
 	t.lock.Lock()
 	mime := strings.ToLower(track.Codec().MimeType)
 	layer := buffer.RidToSpatialLayer(track.RID(), ti)
-	t.params.Logger.Debugw("AddReceiver", "mime", track.Codec().MimeType)
+	t.params.Logger.Debugw(
+		"AddReceiver",
+		"mime", track.Codec().MimeType,
+		"rid", track.RID(),
+		"layer", layer,
+		"ssrc", track.SSRC(),
+	)
 	wr := t.MediaTrackReceiver.Receiver(mime)
 	if wr == nil {
 		priority := -1
diff --git a/pkg/rtc/mediatrackreceiver.go b/pkg/rtc/mediatrackreceiver.go
index b4128f690..3c9db5616 100644
--- a/pkg/rtc/mediatrackreceiver.go
+++ b/pkg/rtc/mediatrackreceiver.go
@@ -186,8 +186,8 @@ func (t *MediaTrackReceiver) SetupReceiver(receiver sfu.TrackReceiver, priority
 
 		for i, ci := range t.trackInfo.Codecs {
 			if i == priority {
-				ci.Mid = mid
 				ci.MimeType = receiver.Codec().MimeType
+				ci.Mid = mid
 				break
 			}
 		}
diff --git a/pkg/rtc/participant.go b/pkg/rtc/participant.go
index 154d7c794..41e7a31a7 100644
--- a/pkg/rtc/participant.go
+++ b/pkg/rtc/participant.go
@@ -1833,7 +1833,7 @@ func (p *ParticipantImpl) mediaTrackReceived(track *webrtc.TrackRemote, rtpRecei
 				}
 			}
 			if codecFound != len(ti.Codecs) {
-				p.params.Logger.Warnw("migrated track codec mismatched", nil, "track", logger.Proto(ti), "webrtcCodec", parameters)
+				p.pubLogger.Warnw("migrated track codec mismatched", nil, "track", logger.Proto(ti), "webrtcCodec", parameters)
 				p.pendingTracksLock.Unlock()
 				p.IssueFullReconnect(types.ParticipantCloseReasonMigrateCodecMismatch)
 				return nil, false
@@ -1862,6 +1862,7 @@ func (p *ParticipantImpl) mediaTrackReceived(track *webrtc.TrackRemote, rtpRecei
 	if mt.AddReceiver(rtpReceiver, track, p.twcc, mid) {
 		p.removeMutedTrackNotFired(mt)
 		if newTrack {
+			p.pubLogger.Debugw("track published", nil, "trackID", mt.ID(), "track", logger.Proto(mt.ToProto()))
 			go p.handleTrackPublished(mt)
 		}
 	}
@@ -1993,7 +1994,7 @@ func (p *ParticipantImpl) addMediaTrack(signalCid string, sdpCid string, ti *liv
 
 		if !p.IsClosed() {
 			// unpublished events aren't necessary when participant is closed
-			p.pubLogger.Infow("unpublished track", "trackID", ti.Sid, "trackInfo", ti)
+			p.pubLogger.Debugw("track unpublished", "trackID", ti.Sid, "track", logger.Proto(ti))
 			p.lock.RLock()
 			onTrackUnpublished := p.onTrackUnpublished
 			p.lock.RUnlock()
diff --git a/pkg/sfu/downtrack.go b/pkg/sfu/downtrack.go
index a2ef60926..4a0533a73 100644
--- a/pkg/sfu/downtrack.go
+++ b/pkg/sfu/downtrack.go
@@ -458,7 +458,7 @@ func (d *DownTrack) SetStreamAllocatorListener(listener DownTrackStreamAllocator
 			d.transportWideExtID = 0
 		}
 
-		// kick of a gratuitous allocation
+		// kick off a gratuitous allocation
 		listener.OnSubscriptionChanged(d)
 	}
 }