dandri/livekit
1
0
Fork 0
mirror of https://github.com/livekit/livekit.git synced 2026-03-30 15:35:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove packet debug. (#1909)

Browse Source 
Not showing anything too useful.
This commit is contained in:
Raja Subramanian
2023-07-27 10:04:04 +05:30
committed by GitHub
parent 886e7b024c
commit 7a10f60be7
2 changed files with 1 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
pkg/sfu/downtrack.go
View File

@@ -621,25 +621,11 @@ func (d *DownTrack) WriteRTP(extPkt *buffer.ExtPacket, layer int32) error {
return err
}
var iPID, iTL0PICIDX, iKEYIDX, iTID, oPID, oTL0PICIDX, oKEYIDX, oTID int // TOOD-REMOVE-AFTER-DEBUG
var payload []byte
pool := PacketFactory.Get().(*[]byte)
if len(tp.codecBytes) != 0 {
incomingVP8, ok := extPkt.Payload.(buffer.VP8)
if ok {
iPID = int(incomingVP8.PictureID)
iTL0PICIDX = int(incomingVP8.TL0PICIDX)
iKEYIDX = int(incomingVP8.KEYIDX)
iTID = int(incomingVP8.TID)
var outgoingVP8 buffer.VP8
if uerr := outgoingVP8.Unmarshal(append(tp.codecBytes, 0x0)); uerr == nil {
oPID = int(outgoingVP8.PictureID)
oTL0PICIDX = int(outgoingVP8.TL0PICIDX)
oKEYIDX = int(outgoingVP8.KEYIDX)
oTID = int(outgoingVP8.TID)
}
payload = d.translateVP8PacketTo(extPkt.Packet, &incomingVP8, tp.codecBytes, pool)
}
}
@@ -668,28 +654,6 @@ func (d *DownTrack) WriteRTP(extPkt *buffer.ExtPacket, layer int32) error {
return err
}
if d.kind == webrtc.RTPCodecTypeVideo {
d.logger.Debugw(
"packet debug (forwarding)",
"layer", layer,
"isn", extPkt.Packet.SequenceNumber,
"its", extPkt.Packet.Timestamp,
"im", extPkt.Packet.Marker,
"osn", hdr.SequenceNumber,
"ots", hdr.Timestamp,
"om", hdr.Marker,
"len", len(payload),
"iPID", iPID,
"iTL0PICIDX", iTL0PICIDX,
"iKEYIDX", iKEYIDX,
"iTID", iTID,
"oPID", oPID,
"oTL0PICIDX", oTL0PICIDX,
"oKEYIDX", oKEYIDX,
"oTID", oTID,
)
}
d.pacer.Enqueue(pacer.Packet{
Header: hdr,
Extensions: []pacer.ExtensionData{{ID: uint8(d.dependencyDescriptorExtID), Payload: tp.ddBytes}},
@@ -773,16 +737,6 @@ func (d *DownTrack) WritePaddingRTP(bytesToSend int, paddingOnMute bool, forceMa
// last byte of padding has padding size including that byte
payload[RTPPaddingMaxPayloadSize-1] = byte(RTPPaddingMaxPayloadSize)
if d.kind == webrtc.RTPCodecTypeVideo {
d.logger.Debugw(
"packet debug (padding)",
"osn", hdr.SequenceNumber,
"ots", hdr.Timestamp,
"om", hdr.Marker,
"len", len(payload),
)
}
d.pacer.Enqueue(pacer.Packet{
Header: &hdr,
Payload: payload,
@@ -1540,19 +1494,16 @@ func (d *DownTrack) retransmitPackets(nacks []uint16) {
numRepeatedNACKs++
}
var incomingHdr rtp.Header // TODO-REMOVE-AFTER-DEBUG
var pkt rtp.Packet
if err = pkt.Unmarshal(pktBuff[:n]); err != nil {
d.logger.Errorw("unmarshalling rtp packet failed in retransmit", err)
continue
}
incomingHdr = pkt.Header
pkt.Header.SequenceNumber = meta.targetSeqNo
pkt.Header.Timestamp = meta.timestamp
pkt.Header.SSRC = d.ssrc
pkt.Header.PayloadType = d.payloadType
var iPID, iTL0PICIDX, iKEYIDX, iTID, oPID, oTL0PICIDX, oKEYIDX, oTID int // TOOD-REMOVE-AFTER-DEBUG
var payload []byte
pool := PacketFactory.Get().(*[]byte)
if d.mime == "video/vp8" && len(pkt.Payload) > 0 && len(meta.codecBytes) != 0 {
@@ -1563,19 +1514,6 @@ func (d *DownTrack) retransmitPackets(nacks []uint16) {
continue
}
iPID = int(incomingVP8.PictureID)
iTL0PICIDX = int(incomingVP8.TL0PICIDX)
iKEYIDX = int(incomingVP8.KEYIDX)
iTID = int(incomingVP8.TID)
var outgoingVP8 buffer.VP8
if uerr := outgoingVP8.Unmarshal(append(meta.codecBytes, 0x0)); uerr == nil {
oPID = int(outgoingVP8.PictureID)
oTL0PICIDX = int(outgoingVP8.TL0PICIDX)
oKEYIDX = int(outgoingVP8.KEYIDX)
oTID = int(outgoingVP8.TID)
}
payload = d.translateVP8PacketTo(&pkt, &incomingVP8, meta.codecBytes, pool)
}
if payload == nil {
@@ -1583,28 +1521,6 @@ func (d *DownTrack) retransmitPackets(nacks []uint16) {
copy(payload, pkt.Payload)
}
if d.kind == webrtc.RTPCodecTypeVideo {
d.logger.Debugw(
"packet debug (retransmit)",
"layer", meta.layer,
"isn", incomingHdr.SequenceNumber,
"its", incomingHdr.Timestamp,
"im", incomingHdr.Marker,
"osn", pkt.Header.SequenceNumber,
"ots", pkt.Header.Timestamp,
"om", pkt.Header.Marker,
"len", len(payload),
"iPID", iPID,
"iTL0PICIDX", iTL0PICIDX,
"iKEYIDX", iKEYIDX,
"iTID", iTID,
"oPID", oPID,
"oTL0PICIDX", oTL0PICIDX,
"oKEYIDX", oKEYIDX,
"oTID", oTID,
)
}
d.pacer.Enqueue(pacer.Packet{
Header: &pkt.Header,
Extensions: []pacer.ExtensionData{{ID: uint8(d.dependencyDescriptorExtID), Payload: meta.ddBytes}},
@@ -1892,7 +1808,7 @@ func (d *DownTrack) packetSent(md interface{}, hdr *rtp.Header, payloadSize int,
d.isNACKThrottled.Store(false)
d.rtpStats.UpdateKeyFrame(1)
d.logger.Debugw(
"forwarding key frame",
"forwarded key frame",
"layer", spmd.layer,
"rtpsn", hdr.SequenceNumber,
"rtpts", hdr.Timestamp,

14
pkg/sfu/forwarder.go
View File

@@ -1984,20 +1984,6 @@ done:
if !targetLayer.IsValid() {
distance += (maxSeenLayer.Temporal + 1)
}
// TODO-REMOVE-AFTER-DEBUG
logger.Debugw(
"distance to desired",
"maxSeenLauer", maxSeenLayer,
"availableLayers", availableLayers,
"brs", brs,
"targetLayer", targetLayer,
"maxLayer", maxLayer,
"adjustedMaxLayer", adjustedMaxLayer,
"maxAvailableSpatial", maxAvailableSpatial,
"maxAvailableTemporal", maxAvailableTemporal,
"distance", distance,
"distanceToDesired", float64(distance)/float64(maxSeenLayer.Temporal+1),
)
return float64(distance) / float64(maxSeenLayer.Temporal+1)
}