add number of lost packets to rtcp receiver reports

This commit is contained in:
aler9
2020-11-21 15:55:04 +01:00
parent 300a57aef1
commit a21bced1dd
2 changed files with 210 additions and 24 deletions

View File

@@ -10,10 +10,20 @@ import (
"github.com/aler9/gortsplib/pkg/base"
)
func TestRtcpReceiver(t *testing.T) {
func TestRtcpReceiverBase(t *testing.T) {
v := uint32(0x65f83afb)
rr := New(&v)
srPkt := rtcp.SenderReport{
SSRC: 0xba9da416,
NTPTime: 0xe363887a17ced916,
RTPTime: 1287981738,
PacketCount: 714,
OctetCount: 859127,
}
byts, _ := srPkt.Marshal()
rr.OnFrame(base.StreamTypeRtcp, byts)
rtpPkt := rtp.Packet{
Header: rtp.Header{
Version: 2,
@@ -25,19 +35,9 @@ func TestRtcpReceiver(t *testing.T) {
},
Payload: []byte("\x00\x00"),
}
byts, _ := rtpPkt.Marshal()
byts, _ = rtpPkt.Marshal()
rr.OnFrame(base.StreamTypeRtp, byts)
srPkt := rtcp.SenderReport{
SSRC: 0xba9da416,
NTPTime: 0xe363887a17ced916,
RTPTime: 1287981738,
PacketCount: 714,
OctetCount: 859127,
}
byts, _ = srPkt.Marshal()
rr.OnFrame(base.StreamTypeRtcp, byts)
res := rr.Report()
expectedPkt := rtcp.ReceiverReport{
@@ -45,20 +45,35 @@ func TestRtcpReceiver(t *testing.T) {
Reports: []rtcp.ReceptionReport{
{
SSRC: 0xba9da416,
LastSequenceNumber: uint32(946),
LastSenderReport: uint32(0x887a17ce),
LastSequenceNumber: 946,
LastSenderReport: 0x887a17ce,
},
},
}
expected, _ := expectedPkt.Marshal()
require.Equal(t, expected, res)
}
rtpPkt = rtp.Packet{
func TestRtcpReceiverSequenceOverflow(t *testing.T) {
v := uint32(0x65f83afb)
rr := New(&v)
srPkt := rtcp.SenderReport{
SSRC: 0xba9da416,
NTPTime: 0xe363887a17ced916,
RTPTime: 1287981738,
PacketCount: 714,
OctetCount: 859127,
}
byts, _ := srPkt.Marshal()
rr.OnFrame(base.StreamTypeRtcp, byts)
rtpPkt := rtp.Packet{
Header: rtp.Header{
Version: 2,
Marker: true,
PayloadType: 96,
SequenceNumber: 945,
SequenceNumber: 0xffff,
Timestamp: 1287987768,
SSRC: 0xba9da416,
},
@@ -67,18 +82,158 @@ func TestRtcpReceiver(t *testing.T) {
byts, _ = rtpPkt.Marshal()
rr.OnFrame(base.StreamTypeRtp, byts)
res = rr.Report()
rtpPkt = rtp.Packet{
Header: rtp.Header{
Version: 2,
Marker: true,
PayloadType: 96,
SequenceNumber: 0x0000,
Timestamp: 1287987768,
SSRC: 0xba9da416,
},
Payload: []byte("\x00\x00"),
}
byts, _ = rtpPkt.Marshal()
rr.OnFrame(base.StreamTypeRtp, byts)
expectedPkt = rtcp.ReceiverReport{
res := rr.Report()
expectedPkt := rtcp.ReceiverReport{
SSRC: 0x65f83afb,
Reports: []rtcp.ReceptionReport{
{
SSRC: 0xba9da416,
LastSequenceNumber: uint32(1<<16 | 945),
LastSenderReport: uint32(0x887a17ce),
LastSequenceNumber: 1<<16 | 0x0000,
LastSenderReport: 0x887a17ce,
},
},
}
expected, _ = expectedPkt.Marshal()
expected, _ := expectedPkt.Marshal()
require.Equal(t, expected, res)
}
func TestRtcpReceiverPacketLost(t *testing.T) {
v := uint32(0x65f83afb)
rr := New(&v)
srPkt := rtcp.SenderReport{
SSRC: 0xba9da416,
NTPTime: 0xe363887a17ced916,
RTPTime: 1287981738,
PacketCount: 714,
OctetCount: 859127,
}
byts, _ := srPkt.Marshal()
rr.OnFrame(base.StreamTypeRtcp, byts)
rtpPkt := rtp.Packet{
Header: rtp.Header{
Version: 2,
Marker: true,
PayloadType: 96,
SequenceNumber: 0x0120,
Timestamp: 1287987768,
SSRC: 0xba9da416,
},
Payload: []byte("\x00\x00"),
}
byts, _ = rtpPkt.Marshal()
rr.OnFrame(base.StreamTypeRtp, byts)
rtpPkt = rtp.Packet{
Header: rtp.Header{
Version: 2,
Marker: true,
PayloadType: 96,
SequenceNumber: 0x0122,
Timestamp: 1287987768,
SSRC: 0xba9da416,
},
Payload: []byte("\x00\x00"),
}
byts, _ = rtpPkt.Marshal()
rr.OnFrame(base.StreamTypeRtp, byts)
res := rr.Report()
expectedPkt := rtcp.ReceiverReport{
SSRC: 0x65f83afb,
Reports: []rtcp.ReceptionReport{
{
SSRC: 0xba9da416,
LastSequenceNumber: 0x0122,
LastSenderReport: 0x887a17ce,
FractionLost: func() uint8 {
v := float64(1) / 3
return uint8(v * 256)
}(),
TotalLost: 1,
},
},
}
expected, _ := expectedPkt.Marshal()
require.Equal(t, expected, res)
}
func TestRtcpReceiverSequenceOverflowPacketLost(t *testing.T) {
v := uint32(0x65f83afb)
rr := New(&v)
srPkt := rtcp.SenderReport{
SSRC: 0xba9da416,
NTPTime: 0xe363887a17ced916,
RTPTime: 1287981738,
PacketCount: 714,
OctetCount: 859127,
}
byts, _ := srPkt.Marshal()
rr.OnFrame(base.StreamTypeRtcp, byts)
rtpPkt := rtp.Packet{
Header: rtp.Header{
Version: 2,
Marker: true,
PayloadType: 96,
SequenceNumber: 0xffff,
Timestamp: 1287987768,
SSRC: 0xba9da416,
},
Payload: []byte("\x00\x00"),
}
byts, _ = rtpPkt.Marshal()
rr.OnFrame(base.StreamTypeRtp, byts)
rtpPkt = rtp.Packet{
Header: rtp.Header{
Version: 2,
Marker: true,
PayloadType: 96,
SequenceNumber: 0x0002,
Timestamp: 1287987768,
SSRC: 0xba9da416,
},
Payload: []byte("\x00\x00"),
}
byts, _ = rtpPkt.Marshal()
rr.OnFrame(base.StreamTypeRtp, byts)
res := rr.Report()
expectedPkt := rtcp.ReceiverReport{
SSRC: 0x65f83afb,
Reports: []rtcp.ReceptionReport{
{
SSRC: 0xba9da416,
LastSequenceNumber: 1<<16 | 0x0002,
LastSenderReport: 0x887a17ce,
FractionLost: func() uint8 {
v := float64(2) / 4
return uint8(v * 256)
}(),
TotalLost: 2,
},
},
}
expected, _ := expectedPkt.Marshal()
require.Equal(t, expected, res)
}