diff --git a/pkg/rtc/roomtrackmanager.go b/pkg/rtc/roomtrackmanager.go index 621864ec5..2a5c93fbf 100644 --- a/pkg/rtc/roomtrackmanager.go +++ b/pkg/rtc/roomtrackmanager.go @@ -255,9 +255,9 @@ func (r *RoomTrackManager) GetDataTrackInfo(trackID livekit.TrackID) *DataTrackI return infos[0] } -func (r *RoomTrackManager) Report() { +func (r *RoomTrackManager) Report() (int, int) { r.lock.RLock() defer r.lock.RUnlock() - r.logger.Infow("room track manager report", "numTracks", len(r.tracks), "numDataTracks", len(r.dataTracks)) + return len(r.tracks), len(r.dataTracks) } diff --git a/pkg/sfu/forwarder.go b/pkg/sfu/forwarder.go index 9a9c6d8ff..b39c727f4 100644 --- a/pkg/sfu/forwarder.go +++ b/pkg/sfu/forwarder.go @@ -490,7 +490,12 @@ func (f *Forwarder) Mute(muted bool, isSubscribeMutable bool) bool { // It could result in some bandwidth consumed for stream without visibility in // the case of intentional mute. if muted && !isSubscribeMutable { - f.logger.Debugw("ignoring forwarder mute, paused due to congestion") + f.logger.Infow( + "ignoring forwarder mute, paused due to congestion", + "targetLayers", f.vls.GetTarget(), + "currentLayers", f.vls.GetCurrent(), + "lastAllocation", f.lastAllocation, + ) return false } @@ -2075,6 +2080,15 @@ func (f *Forwarder) getTranslationParamsVideo(extPkt *buffer.ExtPacket, layer in result := f.vls.Select(extPkt, layer) if !result.IsSelected { if f.isDDAvailable && extPkt.DependencyDescriptor == nil { + f.logger.Infow( + "turning off dependency descriptor", + "layer", layer, + "refInfos", logger.ObjectSlice(f.refInfos[:]), + "lastSwitchExtIncomingTS", f.lastSwitchExtIncomingTS, + "currentLayer", f.vls.GetCurrent(), + "targetLayer", f.vls.GetCurrent(), + "maxLayer", f.vls.GetMax(), + ) f.isDDAvailable = false switch f.mime { case mime.MimeTypeVP9: diff --git a/pkg/sfu/rtpmunger.go b/pkg/sfu/rtpmunger.go index c1cd73005..8d15ccaac 100644 --- a/pkg/sfu/rtpmunger.go +++ b/pkg/sfu/rtpmunger.go @@ -295,7 +295,7 @@ func (r *RTPMunger) UpdateAndGetPaddingSnTs( extLastSN := r.extLastSN extLastTS := r.extLastTS vals := make([]SnTs, num) - for i := 0; i < num; i++ { + for i := range num { extLastSN++ vals[i].extSequenceNumber = extLastSN diff --git a/pkg/sfu/videolayerselector/dependencydescriptor.go b/pkg/sfu/videolayerselector/dependencydescriptor.go index 0cb157093..88ebc7c34 100644 --- a/pkg/sfu/videolayerselector/dependencydescriptor.go +++ b/pkg/sfu/videolayerselector/dependencydescriptor.go @@ -83,7 +83,8 @@ func (d *DependencyDescriptor) Select(extPkt *buffer.ExtPacket, _layer int32) (r } if ddwdt.RestartGeneration > d.restartGeneration { - d.logger.Debugw("stream restarted", + d.logger.Debugw( + "stream restarted", "packet", ddwdt.RestartGeneration, "current", d.restartGeneration, "structureKeyFrame", d.extKeyFrameNum,