Skip to content

Increment rtx rtp packet sequence number only when trasmitted #285

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
oto313 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Increment rtx rtp packet sequence number only when trasmitted #285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bfd937f
Increment rtx rtp packet sequence number only when trasmitted
Oct 29, 2024
d7734aa
Fix test
Oct 30, 2024
1f03e3f
Fixed tests
Mar 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions internal/rtpbuffer/packet_factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,6 @@ func (m *PacketFactoryCopy) NewPacket(header *rtp.Header, payload []byte, rtxSsr
p.header.SSRC = rtxSsrc
// Rewrite the payload type.
p.header.PayloadType = rtxPayloadType
// Rewrite the sequence number.
p.header.SequenceNumber = m.rtxSequencer.NextSequenceNumber()
Copy link
Member

@aalekseevx aalekseevx May 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

m.rtxSequencer seems unused now, maybe delete it?

// Remove padding if present.
if p.header.Padding && p.payload != nil && len(p.payload) > 0 {
paddingLength := int(p.payload[len(p.payload)-1])
Expand Down
4 changes: 4 additions & 0 deletions pkg/nack/responder_interceptor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ func (r *ResponderInterceptorFactory) NewInterceptor(_ string) (interceptor.Inte
size: 1024,
log: logging.NewDefaultLoggerFactory().NewLogger("nack_responder"),
streams: map[uint32]*localStream{},
rtxSequencer: rtp.NewRandomSequencer(),
}

for _, opt := range r.opts {
Expand Down Expand Up @@ -54,6 +55,8 @@ type ResponderInterceptor struct {

streams map[uint32]*localStream
streamsMu sync.Mutex

rtxSequencer rtp.Sequencer
}

type localStream struct {
Expand Down Expand Up @@ -147,6 +150,7 @@ func (n *ResponderInterceptor) resendPackets(nack *rtcp.TransportLayerNack) {
defer stream.rtpBufferMutex.Unlock()

if p := stream.rtpBuffer.Get(seq); p != nil {
p.Header().SequenceNumber = n.rtxSequencer.NextSequenceNumber()
if _, err := stream.rtpWriter.Write(p.Header(), p.Payload(), interceptor.Attributes{}); err != nil {
n.log.Warnf("failed resending nacked packet: %+v", err)
}
Expand Down
10 changes: 7 additions & 3 deletions pkg/nack/responder_interceptor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,16 @@ func TestResponderInterceptor(t *testing.T) {
},
},
})

expectedSequenceNumber := uint16(0)
// seq number 13 was never sent, so it can't be resent
for _, seqNum := range []uint16{11, 12, 15} {
for range []uint16{11, 12, 15} {
select {
case p := <-stream.WrittenRTP():
require.Equal(t, seqNum, p.SequenceNumber)
if expectedSequenceNumber == 0 {
expectedSequenceNumber = p.SequenceNumber
}
require.Equal(t, expectedSequenceNumber, p.SequenceNumber)
expectedSequenceNumber++
case <-time.After(10 * time.Millisecond):
t.Fatal("written rtp packet not found")
}
Expand Down