From 908b7a9bb14b0c64e10eb23ec84737178181ccf8 Mon Sep 17 00:00:00 2001 From: Raja Subramanian Date: Fri, 16 Jun 2023 19:00:17 +0530 Subject: [PATCH] Promote some migration logs to Infow (#1798) --- pkg/rtc/participant.go | 7 ++++--- pkg/sfu/buffer/rtpstats.go | 8 ++++++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/pkg/rtc/participant.go b/pkg/rtc/participant.go index 5971d00e9..3d0c573d1 100644 --- a/pkg/rtc/participant.go +++ b/pkg/rtc/participant.go @@ -565,7 +565,7 @@ func (p *ParticipantImpl) handleMigrateMutedTrack() { } if len(pti.trackInfos) > 1 { - p.params.Logger.Warnw("too many pending migrated tracks", nil, "count", len(pti.trackInfos), "cid", cid) + p.params.Logger.Warnw("too many pending migrated tracks", nil, "trackID", pti.trackInfos[0].Sid, "count", len(pti.trackInfos), "cid", cid) } ti := pti.trackInfos[0] @@ -638,6 +638,7 @@ func (p *ParticipantImpl) SetMigrateInfo( p.supervisor.SetPublicationMute(livekit.TrackID(ti.Sid), ti.Muted) p.pendingTracks[t.GetCid()] = &pendingTrackInfo{trackInfos: []*livekit.TrackInfo{ti}, migrated: true} + p.params.Logger.Infow("pending track added (migration)", "trackID", ti.Sid, "track", ti.String()) } p.pendingTracksLock.Unlock() @@ -787,7 +788,7 @@ func (p *ParticipantImpl) SetMigrateState(s types.MigrateState) { return } - p.params.Logger.Debugw("SetMigrateState", "state", s) + p.params.Logger.Infow("SetMigrateState", "state", s) p.migrateState.Store(s) p.dirty.Store(true) @@ -1678,7 +1679,7 @@ func (p *ParticipantImpl) mediaTrackReceived(track *webrtc.TrackRemote, rtpRecei } func (p *ParticipantImpl) addMigrateMutedTrack(cid string, ti *livekit.TrackInfo) *MediaTrack { - p.params.Logger.Debugw("add migrate muted track", "cid", cid, "track", ti.String()) + p.params.Logger.Infow("add migrate muted track", "cid", cid, "trackID", ti.Sid, "track", ti.String()) rtpReceiver := p.TransportManager.GetPublisherRTPReceiver(ti.Mid) if rtpReceiver == nil { p.params.Logger.Errorw("could not find receiver for migrated track", nil, "trackID", ti.Sid) diff --git a/pkg/sfu/buffer/rtpstats.go b/pkg/sfu/buffer/rtpstats.go index 173d7f3a1..0bb269ed6 100644 --- a/pkg/sfu/buffer/rtpstats.go +++ b/pkg/sfu/buffer/rtpstats.go @@ -1546,14 +1546,18 @@ func (r *RTPStats) getDrift() (packetDrift driftResult, reportDrift driftResult) packetDrift.rtpDiffSinceFirst = getExtTS(r.highestTS, r.tsCycles) - r.extStartTS packetDrift.driftSamples = int64(packetDrift.rtpDiffSinceFirst - uint64(packetDrift.timeSinceFirst.Nanoseconds()*int64(r.params.ClockRate)/1e9)) packetDrift.driftMs = (float64(packetDrift.driftSamples) * 1000) / float64(r.params.ClockRate) - packetDrift.sampleRate = float64(packetDrift.rtpDiffSinceFirst) / packetDrift.timeSinceFirst.Seconds() + if packetDrift.timeSinceFirst.Seconds() != 0 { + packetDrift.sampleRate = float64(packetDrift.rtpDiffSinceFirst) / packetDrift.timeSinceFirst.Seconds() + } if r.srFirst != nil && r.srNewest != nil && r.srFirst.RTPTimestamp != r.srNewest.RTPTimestamp { reportDrift.timeSinceFirst = r.srNewest.NTPTimestamp.Time().Sub(r.srFirst.NTPTimestamp.Time()) reportDrift.rtpDiffSinceFirst = r.srNewest.RTPTimestampExt - r.srFirst.RTPTimestampExt reportDrift.driftSamples = int64(reportDrift.rtpDiffSinceFirst - uint64(reportDrift.timeSinceFirst.Nanoseconds()*int64(r.params.ClockRate)/1e9)) reportDrift.driftMs = (float64(reportDrift.driftSamples) * 1000) / float64(r.params.ClockRate) - reportDrift.sampleRate = float64(reportDrift.rtpDiffSinceFirst) / reportDrift.timeSinceFirst.Seconds() + if reportDrift.timeSinceFirst.Seconds() != 0 { + reportDrift.sampleRate = float64(reportDrift.rtpDiffSinceFirst) / reportDrift.timeSinceFirst.Seconds() + } } return }