Reduce chatty logs (#592)

This commit is contained in:
Raja Subramanian
2022-04-06 06:30:26 +05:30
committed by GitHub
parent 92009b6428
commit 73ae58bb42
4 changed files with 7 additions and 43 deletions
-1
View File
@@ -461,7 +461,6 @@ func (b *Buffer) getExtPacket(rawPacket []byte, rtpPacket *rtp.Packet, arrivalTi
ep.KeyFrame = IsAV1Keyframe(rtpPacket.Payload)
}
if ep.KeyFrame {
b.logger.Debugw("key frame received")
if b.rtpStats != nil {
b.rtpStats.UpdateKeyFrame(1)
}
-37
View File
@@ -176,7 +176,6 @@ func (r *RTPStats) Update(rtph *rtp.Header, payloadSize int, paddingSize int, pa
r.highestTime = packetTime
r.extStartSN = uint32(rtph.SequenceNumber)
r.logger.Debugw("RTPSTATS_DEBUG, setting extStartSN init", "extStartSN", r.extStartSN) // LK-DEBUG-REMOVE
r.cycles = 0
first = true
@@ -211,24 +210,6 @@ func (r *RTPStats) Update(rtph *rtp.Header, payloadSize int, paddingSize int, pa
flowState.LossStartInclusive = r.highestSN + 1
flowState.LossEndExclusive = rtph.SequenceNumber
}
// LK-DEBUG-REMOVE START
if diff > 100 {
r.logger.Debugw(
"RTPSTATS_DEBUG huge difference in sequence number",
"diff", diff,
"highestSN", r.highestSN,
"sn", rtph.SequenceNumber,
"startSN", r.extStartSN,
"lost", r.packetsLost,
"highestTS", r.highestTS,
"ts", rtph.Timestamp,
"tsDiff", rtph.Timestamp-r.highestTS,
"highestTime", r.highestTime,
"now", packetTime,
"timeDiff(ms)", float64(packetTime-r.highestTime)/1e6,
)
}
// LK-DEBUG-REMOVE END
// update gap histogram
r.updateGapHistogram(int(diff))
@@ -277,27 +258,9 @@ func (r *RTPStats) maybeAdjustStartSN(rtph *rtp.Header, packetTime int64) {
return
}
// LK-DEBUG-REMOVE START
r.logger.Debugw(
"RTPSTATS_DEBUG moving starting SN back",
"diff", rtph.SequenceNumber-uint16(r.extStartSN),
"loss added", uint16(r.extStartSN)-rtph.SequenceNumber,
"highestSN", r.highestSN,
"sn", rtph.SequenceNumber,
"startSN", r.extStartSN,
"lost", r.packetsLost,
"highestTS", r.highestTS,
"ts", rtph.Timestamp,
"tsDiff", rtph.Timestamp-r.highestTS,
"highestTime", r.highestTime,
"now", packetTime,
"timeDiff(ms)", float64(packetTime-r.highestTime)/1e6,
)
// LK-DEBUG-REMOVE END
// NOTE: current sequence number is counted as loss as it will be deducted in the duplicate check
r.packetsLost += uint32(uint16(r.extStartSN) - rtph.SequenceNumber)
r.extStartSN = uint32(rtph.SequenceNumber)
r.logger.Debugw("RTPSTATS_DEBUG, setting extStartSN moving back", "extStartSN", r.extStartSN) // LK-DEBUG-REMOVE
}
func (r *RTPStats) GetTotalPacketsPrimary() uint32 {
+3
View File
@@ -411,6 +411,8 @@ func (d *DownTrack) WriteRTP(extPkt *buffer.ExtPacket, layer int32) error {
if locked {
d.stopKeyFrameRequester()
}
d.logger.Debugw("forwarding key frame", "layer", layer)
}
d.rtpStats.Update(hdr, len(payload), 0, time.Now().UnixNano())
@@ -935,6 +937,7 @@ func (d *DownTrack) handleRTCP(bytes []byte) {
if pliOnce {
targetLayers := d.forwarder.TargetLayers()
if targetLayers != InvalidLayers {
d.logger.Debugw("sending PLI RTCP", "layer", targetLayers.spatial)
d.receiver.SendPLI(targetLayers.spatial)
d.isNACKThrottled.Store(true)
d.rtpStats.UpdatePliTime()
+4 -5
View File
@@ -11,7 +11,6 @@ import (
type TestExtPacketParams struct {
SetMarker bool
SetPadding bool
IsHead bool
IsKeyFrame bool
PayloadType uint8
@@ -19,7 +18,7 @@ type TestExtPacketParams struct {
Timestamp uint32
SSRC uint32
PayloadSize int
PaddingSize int
PaddingSize byte
ArrivalTime int64
}
@@ -29,15 +28,15 @@ func GetTestExtPacket(params *TestExtPacketParams) (*buffer.ExtPacket, error) {
packet := rtp.Packet{
Header: rtp.Header{
Version: 2,
Padding: params.SetPadding,
Padding: params.PaddingSize != 0,
Marker: params.SetMarker,
PayloadType: params.PayloadType,
SequenceNumber: params.SequenceNumber,
Timestamp: params.Timestamp,
SSRC: params.SSRC,
},
Payload: make([]byte, params.PayloadSize),
// LK-TODO need a newer version of pion/rtp PaddingSize: params.PaddingSize,
Payload: make([]byte, params.PayloadSize),
PaddingSize: params.PaddingSize,
}
raw, err := packet.Marshal()