mirror of
https://github.com/livekit/livekit.git
synced 2026-05-24 08:05:33 +00:00
Promote switch logs to Infow. (#1790)
This commit is contained in:
+27
-2
@@ -1461,6 +1461,13 @@ func (f *Forwarder) getTranslationParamsCommon(extPkt *buffer.ExtPacket, layer i
|
||||
f.referenceLayerSpatial = layer
|
||||
f.rtpMunger.SetLastSnTs(extPkt)
|
||||
f.codecMunger.SetLast(extPkt)
|
||||
f.logger.Infow(
|
||||
"starting forwarding",
|
||||
"sequenceNumber", extPkt.Packet.SequenceNumber,
|
||||
"timestamp", extPkt.Packet.Timestamp,
|
||||
"layer", layer,
|
||||
"referenceLayerSpatial", f.referenceLayerSpatial,
|
||||
)
|
||||
} else {
|
||||
if f.referenceLayerSpatial == buffer.InvalidLayerSpatial {
|
||||
// on a resume, reference layer may not be set, so only set when it is invalid
|
||||
@@ -1483,7 +1490,7 @@ func (f *Forwarder) getTranslationParamsCommon(extPkt *buffer.ExtPacket, layer i
|
||||
lastTS := f.rtpMunger.GetLast().LastTS
|
||||
refTS := lastTS
|
||||
expectedTS := lastTS
|
||||
minTS := uint64(lastTS)
|
||||
minTS := ^uint64(0)
|
||||
switchingAt := time.Now()
|
||||
if f.getReferenceLayerRTPTimestamp != nil {
|
||||
ts, err := f.getReferenceLayerRTPTimestamp(extPkt.Packet.Timestamp, layer, f.referenceLayerSpatial)
|
||||
@@ -1502,6 +1509,15 @@ func (f *Forwarder) getTranslationParamsCommon(extPkt *buffer.ExtPacket, layer i
|
||||
timeSinceFirst := time.Since(f.preStartTime)
|
||||
rtpDiff = uint32(timeSinceFirst.Nanoseconds() * int64(f.codec.ClockRate) / 1e9)
|
||||
f.refTSOffset = f.firstTS + rtpDiff - refTS
|
||||
f.logger.Infow(
|
||||
"calculating refTSOffset",
|
||||
"preStartTime", f.preStartTime.String(),
|
||||
"firstTS", f.firstTS,
|
||||
"timeSinceFirst", timeSinceFirst,
|
||||
"rtpDiff", rtpDiff,
|
||||
"refTS", refTS,
|
||||
"refTSOffset", f.refTSOffset,
|
||||
)
|
||||
}
|
||||
expectedTS += rtpDiff
|
||||
}
|
||||
@@ -1511,8 +1527,11 @@ func (f *Forwarder) getTranslationParamsCommon(extPkt *buffer.ExtPacket, layer i
|
||||
f.logger.Infow(
|
||||
"next timestamp on switch",
|
||||
"switchingAt", switchingAt.String(),
|
||||
"layer", layer,
|
||||
"lastTS", lastTS,
|
||||
"refTS", refTS,
|
||||
"refTSOffset", f.refTSOffset,
|
||||
"referenceLayerSpatial", f.referenceLayerSpatial,
|
||||
"expectedTS", expectedTS,
|
||||
"minTS", minTS,
|
||||
"nextTS", nextTS,
|
||||
@@ -1647,6 +1666,12 @@ func (f *Forwarder) maybeStart() {
|
||||
f.rtpMunger.SetLastSnTs(extPkt)
|
||||
|
||||
f.firstTS = extPkt.Packet.Timestamp
|
||||
f.logger.Infow(
|
||||
"starting with dummy forwarding",
|
||||
"sequenceNumber", extPkt.Packet.SequenceNumber,
|
||||
"timestamp", extPkt.Packet.Timestamp,
|
||||
"preStartTime", f.preStartTime,
|
||||
)
|
||||
}
|
||||
|
||||
func (f *Forwarder) GetSnTsForPadding(num int, forceMarker bool) ([]SnTs, error) {
|
||||
@@ -1679,7 +1704,7 @@ func (f *Forwarder) GetSnTsForBlankFrames(frameRate uint32, numPackets int) ([]S
|
||||
|
||||
lastTS := f.rtpMunger.GetLast().LastTS
|
||||
expectedTS := lastTS
|
||||
minTS := uint64(lastTS)
|
||||
minTS := ^uint64(0)
|
||||
if f.getExpectedRTPTimestamp != nil {
|
||||
ts, min, err := f.getExpectedRTPTimestamp(time.Now())
|
||||
if err == nil {
|
||||
|
||||
@@ -577,7 +577,7 @@ func (s *StreamTrackerManager) GetReferenceLayerRTPTimestamp(ts uint32, layer in
|
||||
ntpDiff := srRef.NTPTimestamp.Time().Sub(srLayer.NTPTimestamp.Time())
|
||||
rtpDiff := ntpDiff.Nanoseconds() * int64(s.clockRate) / 1e9
|
||||
normalizedTS := srLayer.RTPTimestamp + uint32(rtpDiff)
|
||||
s.logger.Debugw(
|
||||
s.logger.Infow(
|
||||
"getting reference timestamp",
|
||||
"layer", layer,
|
||||
"referenceLayer", referenceLayer,
|
||||
|
||||
Reference in New Issue
Block a user