diff --git a/examples/client-play-to-record/main.go b/examples/client-play-to-record/main.go index c2cf6d26..f5ce8294 100644 --- a/examples/client-play-to-record/main.go +++ b/examples/client-play-to-record/main.go @@ -2,7 +2,6 @@ package main import ( - "fmt" "log" "github.com/bluenviron/gortsplib/v4" @@ -60,7 +59,7 @@ func main() { reader.OnPacketRTPAny(func(_ *description.Media, _ format.Format, pkt *rtp.Packet) { err2 := publisher.WritePacketRTP(desc.Medias[0], pkt) if err2 != nil { - fmt.Printf("ERR: %v", err2) + log.Printf("ERR: %v", err2) } }) diff --git a/pkg/format/rtpac3/encoder.go b/pkg/format/rtpac3/encoder.go index 6f4e34a7..c6cf2768 100644 --- a/pkg/format/rtpac3/encoder.go +++ b/pkg/format/rtpac3/encoder.go @@ -10,7 +10,7 @@ import ( const ( rtpVersion = 2 - defaultPayloadMaxSize = 1460 // 1500 (UDP MTU) - 20 (IP header) - 8 (UDP header) - 12 (RTP header) + defaultPayloadMaxSize = 1450 // 1500 (UDP MTU) - 20 (IP header) - 8 (UDP header) - 12 (RTP header) - 10 (SRTP overhead) ) func randUint32() (uint32, error) { @@ -45,7 +45,7 @@ type Encoder struct { InitialSequenceNumber *uint16 // maximum size of packet payloads (optional). - // It defaults to 1460. + // It defaults to 1450. PayloadMaxSize int sequenceNumber uint16 diff --git a/pkg/format/rtpac3/encoder_test.go b/pkg/format/rtpac3/encoder_test.go index 5d07c219..1861c9df 100644 --- a/pkg/format/rtpac3/encoder_test.go +++ b/pkg/format/rtpac3/encoder_test.go @@ -738,40 +738,7 @@ var cases = []struct { 0xf3, 0xe7, 0xcf, 0x9f, 0x3e, 0xae, 0xf9, 0xf3, 0xe7, 0xcf, 0x9f, 0x3e, 0x85, 0x5d, 0xf3, 0xe7, 0xcf, 0x9f, 0x3e, 0x7c, 0xf9, 0xf3, 0xe7, 0xcf, - 0x9f, 0x3f, 0x53, 0x5d, 0xf3, 0xe7, 0xcf, 0x9f, - 0x3e, 0x7c, 0xf9, 0xf3, 0xe7, 0xcf, 0x9f, 0x3e, - 0x7c, 0xf9, 0xf3, 0xe1, 0xcc, 0xa7, 0xc7, 0xf2, - 0xec, 0x37, 0xcf, 0x9f, 0x43, 0x7c, 0xf9, 0xf3, - 0xe7, 0xcf, 0xab, 0xbe, 0x7c, 0xf9, 0xf3, 0xe7, - 0xcf, 0xa1, 0x57, 0x7c, 0xf9, 0xf3, 0xe7, 0xcf, - 0x9f, 0x3e, 0x7c, 0xf9, 0xf3, 0xe7, 0xcf, 0xd4, - 0xd7, 0x7c, 0xf9, 0xf3, 0xe7, 0xcf, 0x9f, 0x3e, - 0x7c, 0xf9, 0xf3, 0xe7, 0xcf, 0x9f, 0x3e, 0x7c, - 0xf8, 0x73, 0x29, 0xf1, 0xfc, 0xbb, 0x0d, 0xf3, - 0xe7, 0xd0, 0xdf, 0x3e, 0x7c, 0xf9, 0xf3, 0xea, - 0xef, 0x9f, 0x3e, 0x7c, 0xf9, 0xf3, 0xe8, 0x55, - 0xdf, 0x3e, 0x7c, 0xf9, 0xf3, 0xe7, 0xcf, 0x9f, - 0x3e, 0x7c, 0xf9, 0xf3, 0xf5, 0x35, 0xdf, 0x3e, - 0x7c, 0xf9, 0xf3, 0xe7, 0xcf, 0x9f, 0x3e, 0x7c, - 0xf9, 0xf3, 0xe7, 0xcf, 0x9f, 0x3e, 0x00, 0x23, - 0x28, 0x26, 0x20, 0x4a, 0x5a, 0xc2, 0x2b, 0x5a, - 0xea, 0x05, 0x57, 0x88, 0x27, 0x47, 0x80, 0x11, - 0x94, 0x13, 0x10, 0x25, 0x2d, 0x61, 0x15, 0xad, - 0x75, 0x02, 0xab, 0xc4, 0x13, 0xa0, 0x8c, 0xa0, - 0x98, 0x81, 0x29, 0x6b, 0x08, 0xad, 0x6b, 0xa8, - 0x15, 0x5e, 0x20, 0x9d, 0x1e, 0x08, 0xca, 0x09, - 0x88, 0x12, 0x96, 0xb0, 0x8a, 0xd6, 0xba, 0x81, - 0x55, 0xe2, 0x09, 0xd0, 0x02, 0x32, 0x82, 0x62, - 0x04, 0xa5, 0xac, 0x22, 0xb5, 0xae, 0xa0, 0x55, - 0x78, 0x82, 0x74, 0x6e, 0x04, 0x85, 0x08, 0x81, - 0x29, 0x6b, 0x08, 0xad, 0x6b, 0xa8, 0x15, 0x03, - 0xe0, 0x00, 0x00, 0x09, 0xcb, 0x70, 0x19, 0xf4, - 0xb7, 0x94, 0x97, 0x60, 0x84, 0xbf, 0x04, 0x1e, - 0x59, 0x02, 0xbc, 0x6c, 0xe5, 0xb8, 0x0c, 0xfa, - 0x5b, 0xca, 0x4b, 0xb0, 0x42, 0x5f, 0x82, 0x0f, - 0x2c, 0x81, 0x67, 0x2d, 0xc0, 0x67, 0xd2, 0xde, - 0x52, 0x5d, 0x82, 0x12, 0xfc, 0x10, 0x79, 0x64, - 0x0a, 0xf2, + 0x9f, 0x3f, 0x53, 0x5d, 0xf3, 0xe7, }, }, { @@ -783,49 +750,81 @@ var cases = []struct { SSRC: 0x9dbb7812, }, Payload: []byte{ - 0x03, 0x02, 0x72, 0xdc, 0x06, 0x7d, 0x2d, 0xe5, - 0x25, 0xd8, 0x21, 0x2f, 0xc1, 0x07, 0x96, 0x40, - 0xac, 0x9c, 0xb7, 0x01, 0x9f, 0x4b, 0x79, 0x49, - 0x76, 0x08, 0x4b, 0xf0, 0x41, 0xe5, 0x90, 0x2b, - 0x7f, 0x3b, 0xee, 0x27, 0xd2, 0xde, 0x52, 0x5d, - 0x82, 0x12, 0xfc, 0x10, 0x1f, 0x01, 0x80, 0x0a, - 0xae, 0xf9, 0xf0, 0x18, 0x0d, 0x8c, 0x57, 0x91, - 0xdb, 0x1d, 0x98, 0x52, 0x45, 0x03, 0xd8, 0x84, - 0x9b, 0x0c, 0xf1, 0xac, 0x06, 0xc6, 0x2b, 0xc8, - 0xed, 0x8e, 0xcc, 0x29, 0x22, 0x81, 0xec, 0x42, - 0x4d, 0x86, 0x60, 0x36, 0x31, 0x5e, 0x47, 0x6c, - 0x76, 0x61, 0x49, 0x14, 0x0f, 0x62, 0x12, 0x6c, - 0x33, 0xc6, 0x03, 0x63, 0x15, 0xe4, 0x76, 0xc7, - 0x66, 0x14, 0x91, 0x40, 0xf6, 0x21, 0x26, 0xc3, - 0x31, 0x80, 0xd8, 0xc5, 0x79, 0x1d, 0xb1, 0xd9, - 0x85, 0x24, 0x50, 0x3d, 0x88, 0x49, 0xb0, 0xcd, - 0xc3, 0x07, 0xb2, 0x5e, 0x47, 0x6c, 0x76, 0x61, - 0x49, 0x14, 0x0f, 0x60, 0x7c, 0x04, 0x00, 0x29, - 0xf3, 0xe7, 0xcf, 0x9f, 0x3e, 0x07, 0xae, 0xa1, - 0x8f, 0xa9, 0x09, 0x79, 0xfa, 0x0f, 0x6a, 0xcf, - 0xf1, 0xdd, 0xff, 0xad, 0x1e, 0x03, 0xd7, 0x50, - 0xc7, 0xd4, 0x84, 0xbc, 0xfd, 0x07, 0xb5, 0x67, - 0xf8, 0xee, 0xff, 0xd6, 0x9e, 0xba, 0x86, 0x3e, - 0xa4, 0x25, 0xe7, 0xe8, 0x3d, 0xab, 0x3f, 0xc7, - 0x77, 0xfe, 0xb4, 0x79, 0xeb, 0xa8, 0x63, 0xea, - 0x42, 0x5e, 0x7e, 0x83, 0xda, 0xb3, 0xfc, 0x77, - 0x7f, 0xeb, 0x40, 0x7a, 0xea, 0x18, 0xfa, 0x90, - 0x97, 0x9f, 0xa0, 0xf6, 0xac, 0xff, 0x1d, 0xdf, - 0xfa, 0xd1, 0xbf, 0xf6, 0x14, 0x5e, 0xa4, 0x25, - 0xe7, 0xe8, 0x3d, 0xab, 0x3f, 0xc6, 0x0f, 0x80, - 0x00, 0x00, 0x2a, 0xec, 0xb0, 0xeb, 0x89, 0xce, - 0x62, 0x9e, 0x03, 0x0d, 0xfc, 0xac, 0xb2, 0xe8, - 0x90, 0xf1, 0xb5, 0x76, 0x58, 0x75, 0xc4, 0xe7, - 0x31, 0x4f, 0x01, 0x86, 0xfe, 0x56, 0x59, 0x74, - 0x48, 0xab, 0xb2, 0xc3, 0xae, 0x27, 0x39, 0x8a, - 0x78, 0x0c, 0x37, 0xf2, 0xb2, 0xcb, 0xa2, 0x43, - 0xca, 0xbb, 0x2c, 0x3a, 0xe2, 0x73, 0x98, 0xa7, - 0x80, 0xc3, 0x7f, 0x2b, 0x2c, 0xba, 0x24, 0x32, - 0xae, 0xcb, 0x0e, 0xb8, 0x9c, 0xe6, 0x29, 0xe0, - 0x30, 0xdf, 0xca, 0xcb, 0x2e, 0x89, 0x0d, 0xfd, - 0x67, 0x96, 0xae, 0x27, 0x39, 0x8a, 0x78, 0x0c, - 0x37, 0xf2, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xe4, 0xa2, + 0x03, 0x02, 0xcf, 0x9f, 0x3e, 0x7c, 0xf9, 0xf3, + 0xe7, 0xcf, 0x9f, 0x3e, 0x7c, 0xf9, 0xf3, 0xe1, + 0xcc, 0xa7, 0xc7, 0xf2, 0xec, 0x37, 0xcf, 0x9f, + 0x43, 0x7c, 0xf9, 0xf3, 0xe7, 0xcf, 0xab, 0xbe, + 0x7c, 0xf9, 0xf3, 0xe7, 0xcf, 0xa1, 0x57, 0x7c, + 0xf9, 0xf3, 0xe7, 0xcf, 0x9f, 0x3e, 0x7c, 0xf9, + 0xf3, 0xe7, 0xcf, 0xd4, 0xd7, 0x7c, 0xf9, 0xf3, + 0xe7, 0xcf, 0x9f, 0x3e, 0x7c, 0xf9, 0xf3, 0xe7, + 0xcf, 0x9f, 0x3e, 0x7c, 0xf8, 0x73, 0x29, 0xf1, + 0xfc, 0xbb, 0x0d, 0xf3, 0xe7, 0xd0, 0xdf, 0x3e, + 0x7c, 0xf9, 0xf3, 0xea, 0xef, 0x9f, 0x3e, 0x7c, + 0xf9, 0xf3, 0xe8, 0x55, 0xdf, 0x3e, 0x7c, 0xf9, + 0xf3, 0xe7, 0xcf, 0x9f, 0x3e, 0x7c, 0xf9, 0xf3, + 0xf5, 0x35, 0xdf, 0x3e, 0x7c, 0xf9, 0xf3, 0xe7, + 0xcf, 0x9f, 0x3e, 0x7c, 0xf9, 0xf3, 0xe7, 0xcf, + 0x9f, 0x3e, 0x00, 0x23, 0x28, 0x26, 0x20, 0x4a, + 0x5a, 0xc2, 0x2b, 0x5a, 0xea, 0x05, 0x57, 0x88, + 0x27, 0x47, 0x80, 0x11, 0x94, 0x13, 0x10, 0x25, + 0x2d, 0x61, 0x15, 0xad, 0x75, 0x02, 0xab, 0xc4, + 0x13, 0xa0, 0x8c, 0xa0, 0x98, 0x81, 0x29, 0x6b, + 0x08, 0xad, 0x6b, 0xa8, 0x15, 0x5e, 0x20, 0x9d, + 0x1e, 0x08, 0xca, 0x09, 0x88, 0x12, 0x96, 0xb0, + 0x8a, 0xd6, 0xba, 0x81, 0x55, 0xe2, 0x09, 0xd0, + 0x02, 0x32, 0x82, 0x62, 0x04, 0xa5, 0xac, 0x22, + 0xb5, 0xae, 0xa0, 0x55, 0x78, 0x82, 0x74, 0x6e, + 0x04, 0x85, 0x08, 0x81, 0x29, 0x6b, 0x08, 0xad, + 0x6b, 0xa8, 0x15, 0x03, 0xe0, 0x00, 0x00, 0x09, + 0xcb, 0x70, 0x19, 0xf4, 0xb7, 0x94, 0x97, 0x60, + 0x84, 0xbf, 0x04, 0x1e, 0x59, 0x02, 0xbc, 0x6c, + 0xe5, 0xb8, 0x0c, 0xfa, 0x5b, 0xca, 0x4b, 0xb0, + 0x42, 0x5f, 0x82, 0x0f, 0x2c, 0x81, 0x67, 0x2d, + 0xc0, 0x67, 0xd2, 0xde, 0x52, 0x5d, 0x82, 0x12, + 0xfc, 0x10, 0x79, 0x64, 0x0a, 0xf2, 0x72, 0xdc, + 0x06, 0x7d, 0x2d, 0xe5, 0x25, 0xd8, 0x21, 0x2f, + 0xc1, 0x07, 0x96, 0x40, 0xac, 0x9c, 0xb7, 0x01, + 0x9f, 0x4b, 0x79, 0x49, 0x76, 0x08, 0x4b, 0xf0, + 0x41, 0xe5, 0x90, 0x2b, 0x7f, 0x3b, 0xee, 0x27, + 0xd2, 0xde, 0x52, 0x5d, 0x82, 0x12, 0xfc, 0x10, + 0x1f, 0x01, 0x80, 0x0a, 0xae, 0xf9, 0xf0, 0x18, + 0x0d, 0x8c, 0x57, 0x91, 0xdb, 0x1d, 0x98, 0x52, + 0x45, 0x03, 0xd8, 0x84, 0x9b, 0x0c, 0xf1, 0xac, + 0x06, 0xc6, 0x2b, 0xc8, 0xed, 0x8e, 0xcc, 0x29, + 0x22, 0x81, 0xec, 0x42, 0x4d, 0x86, 0x60, 0x36, + 0x31, 0x5e, 0x47, 0x6c, 0x76, 0x61, 0x49, 0x14, + 0x0f, 0x62, 0x12, 0x6c, 0x33, 0xc6, 0x03, 0x63, + 0x15, 0xe4, 0x76, 0xc7, 0x66, 0x14, 0x91, 0x40, + 0xf6, 0x21, 0x26, 0xc3, 0x31, 0x80, 0xd8, 0xc5, + 0x79, 0x1d, 0xb1, 0xd9, 0x85, 0x24, 0x50, 0x3d, + 0x88, 0x49, 0xb0, 0xcd, 0xc3, 0x07, 0xb2, 0x5e, + 0x47, 0x6c, 0x76, 0x61, 0x49, 0x14, 0x0f, 0x60, + 0x7c, 0x04, 0x00, 0x29, 0xf3, 0xe7, 0xcf, 0x9f, + 0x3e, 0x07, 0xae, 0xa1, 0x8f, 0xa9, 0x09, 0x79, + 0xfa, 0x0f, 0x6a, 0xcf, 0xf1, 0xdd, 0xff, 0xad, + 0x1e, 0x03, 0xd7, 0x50, 0xc7, 0xd4, 0x84, 0xbc, + 0xfd, 0x07, 0xb5, 0x67, 0xf8, 0xee, 0xff, 0xd6, + 0x9e, 0xba, 0x86, 0x3e, 0xa4, 0x25, 0xe7, 0xe8, + 0x3d, 0xab, 0x3f, 0xc7, 0x77, 0xfe, 0xb4, 0x79, + 0xeb, 0xa8, 0x63, 0xea, 0x42, 0x5e, 0x7e, 0x83, + 0xda, 0xb3, 0xfc, 0x77, 0x7f, 0xeb, 0x40, 0x7a, + 0xea, 0x18, 0xfa, 0x90, 0x97, 0x9f, 0xa0, 0xf6, + 0xac, 0xff, 0x1d, 0xdf, 0xfa, 0xd1, 0xbf, 0xf6, + 0x14, 0x5e, 0xa4, 0x25, 0xe7, 0xe8, 0x3d, 0xab, + 0x3f, 0xc6, 0x0f, 0x80, 0x00, 0x00, 0x2a, 0xec, + 0xb0, 0xeb, 0x89, 0xce, 0x62, 0x9e, 0x03, 0x0d, + 0xfc, 0xac, 0xb2, 0xe8, 0x90, 0xf1, 0xb5, 0x76, + 0x58, 0x75, 0xc4, 0xe7, 0x31, 0x4f, 0x01, 0x86, + 0xfe, 0x56, 0x59, 0x74, 0x48, 0xab, 0xb2, 0xc3, + 0xae, 0x27, 0x39, 0x8a, 0x78, 0x0c, 0x37, 0xf2, + 0xb2, 0xcb, 0xa2, 0x43, 0xca, 0xbb, 0x2c, 0x3a, + 0xe2, 0x73, 0x98, 0xa7, 0x80, 0xc3, 0x7f, 0x2b, + 0x2c, 0xba, 0x24, 0x32, 0xae, 0xcb, 0x0e, 0xb8, + 0x9c, 0xe6, 0x29, 0xe0, 0x30, 0xdf, 0xca, 0xcb, + 0x2e, 0x89, 0x0d, 0xfd, 0x67, 0x96, 0xae, 0x27, + 0x39, 0x8a, 0x78, 0x0c, 0x37, 0xf2, 0xb0, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xe4, 0xa2, }, }, }, @@ -839,6 +838,7 @@ func TestEncode(t *testing.T) { PayloadType: 96, SSRC: uint32Ptr(0x9dbb7812), InitialSequenceNumber: uint16Ptr(0x44ed), + PayloadMaxSize: 1200, } err := e.Init() require.NoError(t, err) diff --git a/pkg/format/rtpav1/encoder.go b/pkg/format/rtpav1/encoder.go index 161616fe..6d32c7cb 100644 --- a/pkg/format/rtpav1/encoder.go +++ b/pkg/format/rtpav1/encoder.go @@ -9,7 +9,7 @@ import ( const ( rtpVersion = 2 - defaultPayloadMaxSize = 1460 // 1500 (UDP MTU) - 20 (IP header) - 8 (UDP header) - 12 (RTP header) + defaultPayloadMaxSize = 1450 // 1500 (UDP MTU) - 20 (IP header) - 8 (UDP header) - 12 (RTP header) - 10 (SRTP overhead) ) func randUint32() (uint32, error) { @@ -36,7 +36,7 @@ type Encoder struct { InitialSequenceNumber *uint16 // maximum size of packet payloads (optional). - // It defaults to 1460. + // It defaults to 1450. PayloadMaxSize int sequenceNumber uint16 diff --git a/pkg/format/rtpav1/encoder_test.go b/pkg/format/rtpav1/encoder_test.go index 946fe18b..da1dd034 100644 --- a/pkg/format/rtpav1/encoder_test.go +++ b/pkg/format/rtpav1/encoder_test.go @@ -392,64 +392,6 @@ var cases = []struct { 0xad, 0x93, 0x70, 0x04, 0xf8, 0x88, 0xa7, 0x67, 0xf0, 0xfe, 0xa9, 0x49, 0x46, 0xbe, 0xab, 0x14, 0x8c, 0x56, 0xea, 0x17, 0x52, 0x1f, 0x35, 0xfa, - 0xd2, 0xd4, 0xa4, 0xf6, 0xb6, 0x72, 0x25, 0x03, - 0xbf, 0xc1, 0x85, 0xe1, 0x3e, 0x3a, 0x19, 0xcb, - 0xe3, 0x7e, 0x15, 0x65, 0xd1, 0x33, 0x40, 0x2a, - 0xd8, 0x3f, 0x2c, 0x86, 0x12, 0x65, 0xe2, 0x60, - 0x80, 0x1b, 0x01, 0x0b, 0xd2, 0xcd, 0x3b, 0x24, - 0x56, 0x73, 0xcd, 0xa9, 0x34, 0xd1, 0x36, 0xd3, - 0x26, 0x6f, 0x49, 0x58, 0xcf, 0xb7, 0x39, 0x92, - 0xa8, 0x15, 0x47, 0x0f, 0x92, 0x68, 0x49, 0xa2, - 0x91, 0xe0, 0x55, 0xc8, 0xd9, 0xf1, 0x84, 0xc4, - 0x41, 0x67, 0xd9, 0x24, 0xf3, 0x0f, 0xdc, 0x3d, - 0x6d, 0x79, 0x4d, 0x0f, 0x35, 0x8b, 0xdf, 0x6d, - 0xcd, 0x66, 0x7e, 0x82, 0x09, 0xa3, 0x72, 0x1d, - 0x3d, 0x4b, 0x0f, 0xad, 0x7c, 0xbe, 0xdd, 0x96, - 0x17, 0x62, 0x26, 0x72, 0xe6, 0x1d, 0xb9, 0xf6, - 0x9a, 0x71, 0x52, 0x5a, 0x76, 0xbb, 0x4e, 0x11, - 0x78, 0xbe, 0x05, 0xe5, 0xf6, 0xaf, 0xf2, 0x66, - 0xd3, 0xe5, 0xdb, 0xfc, 0xd8, 0x96, 0x64, 0x8b, - 0x7a, 0xec, 0x9f, 0x3e, 0x0d, 0x7c, 0xd5, 0x20, - 0xdf, 0x50, 0x52, 0x57, 0x93, 0xa0, 0x03, 0x5a, - 0xed, 0x5c, 0xb4, 0xfa, 0x15, 0xf0, 0xda, 0xc4, - 0x94, 0xbf, 0xcb, 0x25, 0xc7, 0xda, 0x59, 0x5d, - 0xb8, 0x00, 0x00, 0x00, 0x56, 0x76, 0xe4, 0x62, - 0x1c, 0x71, 0x70, 0xf6, 0x7f, 0x20, 0x83, 0xee, - 0x17, 0x23, 0x56, 0x8c, 0x20, 0x9c, 0x65, 0x25, - 0xe9, 0x38, 0xe2, 0xd2, 0x66, 0xae, 0xa1, 0x47, - 0x16, 0xba, 0x5e, 0x87, 0xd4, 0x8b, 0x7e, 0x80, - 0x9f, 0x83, 0x4b, 0x27, 0x46, 0x97, 0x72, 0x2b, - 0x88, 0xd1, 0xf0, 0x92, 0xd4, 0x2a, 0x7e, 0x48, - 0x63, 0x95, 0x33, 0x13, 0x07, 0xf8, 0x79, 0x3a, - 0x6b, 0x67, 0x1c, 0x6f, 0x38, 0x80, 0x3c, 0xc6, - 0xfa, 0xb8, 0x4e, 0xd2, 0x01, 0xaf, 0x79, 0x37, - 0x60, 0xd6, 0x4d, 0x55, 0xcd, 0x1d, 0xf5, 0x15, - 0x0f, 0xb7, 0x8c, 0xa5, 0xec, 0x25, 0xe4, 0x45, - 0xec, 0xe6, 0xf9, 0xc2, 0x35, 0xea, 0xc6, 0x30, - 0xa2, 0x1f, 0x21, 0x13, 0x1f, 0x97, 0x95, 0xee, - 0x69, 0x63, 0xcf, 0x4b, 0xb2, 0xc3, 0xc0, 0x23, - 0xc9, 0x75, 0x2b, 0xd6, 0xac, 0x3c, 0xcb, 0x38, - 0x73, 0xa0, 0x5a, 0xa5, 0x7d, 0x3d, 0x23, 0xb1, - 0x4c, 0xc9, 0x1b, 0x12, 0xc4, 0x83, 0xe1, 0x62, - 0x61, 0xf3, 0x8c, 0x6a, 0x45, 0x95, 0xee, 0x74, - 0x00, 0x2f, 0x84, 0x77, 0xff, 0x16, 0x22, 0x02, - 0xfe, 0x4b, 0xd2, 0x57, 0x65, 0xee, 0x49, 0xcd, - 0x7b, 0xb5, 0xdb, 0x8e, 0x5a, 0xcb, 0x70, 0x7f, - 0x78, 0xbc, 0x35, 0x34, 0x3e, 0xcd, 0xf6, 0x24, - 0x78, 0x8f, 0xe8, 0x9e, 0x5c, 0x9c, 0x22, 0x4a, - 0xf0, 0xbc, 0x89, 0x64, 0x93, 0xcf, 0x20, 0xc8, - 0xfd, 0x27, 0xe2, 0x36, 0x86, 0x00, 0x61, 0xe8, - 0xe2, 0x9c, 0xad, 0x55, 0x98, 0x77, 0x2f, 0xfa, - 0x28, 0xb4, 0xa7, 0xda, 0xa4, 0x14, 0x06, 0x8c, - 0x7a, 0xd5, 0xdf, 0x0d, 0x32, 0x56, 0xcc, 0xd3, - 0x70, 0x71, 0x70, 0xd5, 0xb6, 0x41, 0x0f, 0x45, - 0xb2, 0xf0, 0x24, 0xa5, 0x23, 0x13, 0x70, 0x36, - 0x07, 0xcd, 0xc6, 0x75, 0xd8, 0x62, 0x8c, 0x7f, - 0xa7, 0xb9, 0x76, 0x16, 0xb3, 0x9a, 0x7e, 0x20, - 0x27, 0x27, 0x2d, 0x33, 0x60, 0x70, 0xa5, 0xef, - 0x5c, 0x9c, 0x6e, 0x5f, 0x2f, 0x20, 0x78, 0x58, - 0x59, 0x92, 0x15, 0xfe, 0x13, 0x07, 0x87, 0xc7, - 0x3e, 0x21, 0x04, 0x24, }, }, { @@ -461,30 +403,87 @@ var cases = []struct { SSRC: 0x9dbb7812, }, Payload: []byte{ - 0x90, 0x33, 0x60, 0x15, 0x91, 0xfb, 0xfe, 0xe8, - 0xf8, 0xb9, 0xa6, 0x9a, 0xbf, 0x65, 0xf3, 0x37, - 0x40, 0xb8, 0x52, 0x69, 0x3f, 0x65, 0x27, 0x36, - 0x01, 0x92, 0xe8, 0xef, 0x51, 0x3e, 0xcd, 0xf5, - 0xcc, 0x4f, 0x8b, 0x4f, 0x7b, 0x38, 0x3e, 0x43, - 0x4d, 0xc0, 0xa4, 0xc6, 0x84, 0x79, 0x8e, 0xf4, - 0x4a, 0xe1, 0xa9, 0x2b, 0xd5, 0x34, 0x00, 0x30, - 0x94, 0x6a, 0x91, 0xa2, 0xd5, 0xc0, 0xbf, 0xb5, - 0x66, 0x59, 0x38, 0xc2, 0xa4, 0x75, 0x96, 0x5b, - 0x7a, 0xac, 0x9c, 0x05, 0x67, 0x99, 0x2e, 0xba, - 0x21, 0x1e, 0xac, 0x50, 0x01, 0x68, 0x71, 0xac, - 0x68, 0x6d, 0xc1, 0xf2, 0x2c, 0x51, 0x1e, 0xb6, - 0x64, 0x97, 0x3d, 0x9b, 0x2b, 0x89, 0x66, 0xbd, - 0x50, 0x4f, 0x5c, 0xec, 0x7c, 0xc8, 0x51, 0x61, - 0x74, 0xbd, 0x86, 0xb4, 0x6e, 0x71, 0x59, 0x24, - 0x59, 0xaf, 0x66, 0x54, 0x82, 0xdb, 0xe2, 0x11, - 0x6f, 0x87, 0x92, 0xf3, 0x63, 0xd4, 0x4b, 0xd6, - 0x26, 0x42, 0xf1, 0x2a, 0x66, 0x63, 0x79, 0x5e, - 0x7e, 0xfb, 0x3f, 0x85, 0xa7, 0x24, 0xac, 0x53, - 0xe2, 0x57, 0x56, 0xdd, 0xef, 0x7a, 0xdf, 0xb6, - 0x27, 0xaf, 0x25, 0x6a, 0x89, 0x4a, 0x4c, 0xc3, - 0xe6, 0x2e, 0xbe, 0x2b, 0x38, 0x07, 0xe0, 0x96, - 0x98, 0xaf, 0x85, 0xf4, 0x86, 0x7d, 0xf4, 0xee, - 0xe5, 0x78, + 0x90, 0xd2, 0xd4, 0xa4, 0xf6, 0xb6, 0x72, 0x25, + 0x03, 0xbf, 0xc1, 0x85, 0xe1, 0x3e, 0x3a, 0x19, + 0xcb, 0xe3, 0x7e, 0x15, 0x65, 0xd1, 0x33, 0x40, + 0x2a, 0xd8, 0x3f, 0x2c, 0x86, 0x12, 0x65, 0xe2, + 0x60, 0x80, 0x1b, 0x01, 0x0b, 0xd2, 0xcd, 0x3b, + 0x24, 0x56, 0x73, 0xcd, 0xa9, 0x34, 0xd1, 0x36, + 0xd3, 0x26, 0x6f, 0x49, 0x58, 0xcf, 0xb7, 0x39, + 0x92, 0xa8, 0x15, 0x47, 0x0f, 0x92, 0x68, 0x49, + 0xa2, 0x91, 0xe0, 0x55, 0xc8, 0xd9, 0xf1, 0x84, + 0xc4, 0x41, 0x67, 0xd9, 0x24, 0xf3, 0x0f, 0xdc, + 0x3d, 0x6d, 0x79, 0x4d, 0x0f, 0x35, 0x8b, 0xdf, + 0x6d, 0xcd, 0x66, 0x7e, 0x82, 0x09, 0xa3, 0x72, + 0x1d, 0x3d, 0x4b, 0x0f, 0xad, 0x7c, 0xbe, 0xdd, + 0x96, 0x17, 0x62, 0x26, 0x72, 0xe6, 0x1d, 0xb9, + 0xf6, 0x9a, 0x71, 0x52, 0x5a, 0x76, 0xbb, 0x4e, + 0x11, 0x78, 0xbe, 0x05, 0xe5, 0xf6, 0xaf, 0xf2, + 0x66, 0xd3, 0xe5, 0xdb, 0xfc, 0xd8, 0x96, 0x64, + 0x8b, 0x7a, 0xec, 0x9f, 0x3e, 0x0d, 0x7c, 0xd5, + 0x20, 0xdf, 0x50, 0x52, 0x57, 0x93, 0xa0, 0x03, + 0x5a, 0xed, 0x5c, 0xb4, 0xfa, 0x15, 0xf0, 0xda, + 0xc4, 0x94, 0xbf, 0xcb, 0x25, 0xc7, 0xda, 0x59, + 0x5d, 0xb8, 0x00, 0x00, 0x00, 0x56, 0x76, 0xe4, + 0x62, 0x1c, 0x71, 0x70, 0xf6, 0x7f, 0x20, 0x83, + 0xee, 0x17, 0x23, 0x56, 0x8c, 0x20, 0x9c, 0x65, + 0x25, 0xe9, 0x38, 0xe2, 0xd2, 0x66, 0xae, 0xa1, + 0x47, 0x16, 0xba, 0x5e, 0x87, 0xd4, 0x8b, 0x7e, + 0x80, 0x9f, 0x83, 0x4b, 0x27, 0x46, 0x97, 0x72, + 0x2b, 0x88, 0xd1, 0xf0, 0x92, 0xd4, 0x2a, 0x7e, + 0x48, 0x63, 0x95, 0x33, 0x13, 0x07, 0xf8, 0x79, + 0x3a, 0x6b, 0x67, 0x1c, 0x6f, 0x38, 0x80, 0x3c, + 0xc6, 0xfa, 0xb8, 0x4e, 0xd2, 0x01, 0xaf, 0x79, + 0x37, 0x60, 0xd6, 0x4d, 0x55, 0xcd, 0x1d, 0xf5, + 0x15, 0x0f, 0xb7, 0x8c, 0xa5, 0xec, 0x25, 0xe4, + 0x45, 0xec, 0xe6, 0xf9, 0xc2, 0x35, 0xea, 0xc6, + 0x30, 0xa2, 0x1f, 0x21, 0x13, 0x1f, 0x97, 0x95, + 0xee, 0x69, 0x63, 0xcf, 0x4b, 0xb2, 0xc3, 0xc0, + 0x23, 0xc9, 0x75, 0x2b, 0xd6, 0xac, 0x3c, 0xcb, + 0x38, 0x73, 0xa0, 0x5a, 0xa5, 0x7d, 0x3d, 0x23, + 0xb1, 0x4c, 0xc9, 0x1b, 0x12, 0xc4, 0x83, 0xe1, + 0x62, 0x61, 0xf3, 0x8c, 0x6a, 0x45, 0x95, 0xee, + 0x74, 0x00, 0x2f, 0x84, 0x77, 0xff, 0x16, 0x22, + 0x02, 0xfe, 0x4b, 0xd2, 0x57, 0x65, 0xee, 0x49, + 0xcd, 0x7b, 0xb5, 0xdb, 0x8e, 0x5a, 0xcb, 0x70, + 0x7f, 0x78, 0xbc, 0x35, 0x34, 0x3e, 0xcd, 0xf6, + 0x24, 0x78, 0x8f, 0xe8, 0x9e, 0x5c, 0x9c, 0x22, + 0x4a, 0xf0, 0xbc, 0x89, 0x64, 0x93, 0xcf, 0x20, + 0xc8, 0xfd, 0x27, 0xe2, 0x36, 0x86, 0x00, 0x61, + 0xe8, 0xe2, 0x9c, 0xad, 0x55, 0x98, 0x77, 0x2f, + 0xfa, 0x28, 0xb4, 0xa7, 0xda, 0xa4, 0x14, 0x06, + 0x8c, 0x7a, 0xd5, 0xdf, 0x0d, 0x32, 0x56, 0xcc, + 0xd3, 0x70, 0x71, 0x70, 0xd5, 0xb6, 0x41, 0x0f, + 0x45, 0xb2, 0xf0, 0x24, 0xa5, 0x23, 0x13, 0x70, + 0x36, 0x07, 0xcd, 0xc6, 0x75, 0xd8, 0x62, 0x8c, + 0x7f, 0xa7, 0xb9, 0x76, 0x16, 0xb3, 0x9a, 0x7e, + 0x20, 0x27, 0x27, 0x2d, 0x33, 0x60, 0x70, 0xa5, + 0xef, 0x5c, 0x9c, 0x6e, 0x5f, 0x2f, 0x20, 0x78, + 0x58, 0x59, 0x92, 0x15, 0xfe, 0x13, 0x07, 0x87, + 0xc7, 0x3e, 0x21, 0x04, 0x24, 0x33, 0x60, 0x15, + 0x91, 0xfb, 0xfe, 0xe8, 0xf8, 0xb9, 0xa6, 0x9a, + 0xbf, 0x65, 0xf3, 0x37, 0x40, 0xb8, 0x52, 0x69, + 0x3f, 0x65, 0x27, 0x36, 0x01, 0x92, 0xe8, 0xef, + 0x51, 0x3e, 0xcd, 0xf5, 0xcc, 0x4f, 0x8b, 0x4f, + 0x7b, 0x38, 0x3e, 0x43, 0x4d, 0xc0, 0xa4, 0xc6, + 0x84, 0x79, 0x8e, 0xf4, 0x4a, 0xe1, 0xa9, 0x2b, + 0xd5, 0x34, 0x00, 0x30, 0x94, 0x6a, 0x91, 0xa2, + 0xd5, 0xc0, 0xbf, 0xb5, 0x66, 0x59, 0x38, 0xc2, + 0xa4, 0x75, 0x96, 0x5b, 0x7a, 0xac, 0x9c, 0x05, + 0x67, 0x99, 0x2e, 0xba, 0x21, 0x1e, 0xac, 0x50, + 0x01, 0x68, 0x71, 0xac, 0x68, 0x6d, 0xc1, 0xf2, + 0x2c, 0x51, 0x1e, 0xb6, 0x64, 0x97, 0x3d, 0x9b, + 0x2b, 0x89, 0x66, 0xbd, 0x50, 0x4f, 0x5c, 0xec, + 0x7c, 0xc8, 0x51, 0x61, 0x74, 0xbd, 0x86, 0xb4, + 0x6e, 0x71, 0x59, 0x24, 0x59, 0xaf, 0x66, 0x54, + 0x82, 0xdb, 0xe2, 0x11, 0x6f, 0x87, 0x92, 0xf3, + 0x63, 0xd4, 0x4b, 0xd6, 0x26, 0x42, 0xf1, 0x2a, + 0x66, 0x63, 0x79, 0x5e, 0x7e, 0xfb, 0x3f, 0x85, + 0xa7, 0x24, 0xac, 0x53, 0xe2, 0x57, 0x56, 0xdd, + 0xef, 0x7a, 0xdf, 0xb6, 0x27, 0xaf, 0x25, 0x6a, + 0x89, 0x4a, 0x4c, 0xc3, 0xe6, 0x2e, 0xbe, 0x2b, + 0x38, 0x07, 0xe0, 0x96, 0x98, 0xaf, 0x85, 0xf4, + 0x86, 0x7d, 0xf4, 0xee, 0xe5, 0x78, }, }, }, @@ -526,7 +525,7 @@ var cases = []struct { Payload: []byte{ //nolint:dupl 0x48, 0x10, 0x0a, 0x0e, 0x00, 0x00, 0x00, 0x4a, 0xab, 0xbf, 0xc3, 0x77, 0x6b, 0xe4, 0x40, 0x40, - 0x40, 0x41, 0xa0, 0x0b, 0x30, 0x30, 0xca, 0x08, + 0x40, 0x41, 0xd4, 0x07, 0x30, 0x30, 0xca, 0x08, 0x12, 0xfd, 0xfd, 0x78, 0x89, 0xe5, 0x3e, 0xa3, 0x80, 0x08, 0x20, 0x82, 0x08, 0x54, 0x50, 0x00, 0x30, 0x00, 0x00, 0x66, 0x00, 0xeb, 0xcd, 0xc5, @@ -649,64 +648,6 @@ var cases = []struct { 0x31, 0x08, 0x27, 0xd1, 0x83, 0xcd, 0x03, 0x4d, 0xd9, 0xf0, 0x0a, 0x69, 0x8e, 0x8b, 0x88, 0x14, 0x98, 0x37, 0x8c, 0xad, 0x93, 0x70, 0x04, 0xf8, - 0x88, 0xa7, 0x67, 0xf0, 0xfe, 0xa9, 0x49, 0x46, - 0xbe, 0xab, 0x14, 0x8c, 0x56, 0xea, 0x17, 0x52, - 0x1f, 0x35, 0xfa, 0xd2, 0xd4, 0xa4, 0xf6, 0xb6, - 0x72, 0x25, 0x03, 0xbf, 0xc1, 0x85, 0xe1, 0x3e, - 0x3a, 0x19, 0xcb, 0xe3, 0x7e, 0x15, 0x65, 0xd1, - 0x33, 0x40, 0x2a, 0xd8, 0x3f, 0x2c, 0x86, 0x12, - 0x65, 0xe2, 0x60, 0x80, 0x1b, 0x01, 0x0b, 0xd2, - 0xcd, 0x3b, 0x24, 0x56, 0x73, 0xcd, 0xa9, 0x34, - 0xd1, 0x36, 0xd3, 0x26, 0x6f, 0x49, 0x58, 0xcf, - 0xb7, 0x39, 0x92, 0xa8, 0x15, 0x47, 0x0f, 0x92, - 0x68, 0x49, 0xa2, 0x91, 0xe0, 0x55, 0xc8, 0xd9, - 0xf1, 0x84, 0xc4, 0x41, 0x67, 0xd9, 0x24, 0xf3, - 0x0f, 0xdc, 0x3d, 0x6d, 0x79, 0x4d, 0x0f, 0x35, - 0x8b, 0xdf, 0x6d, 0xcd, 0x66, 0x7e, 0x82, 0x09, - 0xa3, 0x72, 0x1d, 0x3d, 0x4b, 0x0f, 0xad, 0x7c, - 0xbe, 0xdd, 0x96, 0x17, 0x62, 0x26, 0x72, 0xe6, - 0x1d, 0xb9, 0xf6, 0x9a, 0x71, 0x52, 0x5a, 0x76, - 0xbb, 0x4e, 0x11, 0x78, 0xbe, 0x05, 0xe5, 0xf6, - 0xaf, 0xf2, 0x66, 0xd3, 0xe5, 0xdb, 0xfc, 0xd8, - 0x96, 0x64, 0x8b, 0x7a, 0xec, 0x9f, 0x3e, 0x0d, - 0x7c, 0xd5, 0x20, 0xdf, 0x50, 0x52, 0x57, 0x93, - 0xa0, 0x03, 0x5a, 0xed, 0x5c, 0xb4, 0xfa, 0x15, - 0xf0, 0xda, 0xc4, 0x94, 0xbf, 0xcb, 0x25, 0xc7, - 0xda, 0x59, 0x5d, 0xb8, 0x00, 0x00, 0x00, 0x56, - 0x76, 0xe4, 0x62, 0x1c, 0x71, 0x70, 0xf6, 0x7f, - 0x20, 0x83, 0xee, 0x17, 0x23, 0x56, 0x8c, 0x20, - 0x9c, 0x65, 0x25, 0xe9, 0x38, 0xe2, 0xd2, 0x66, - 0xae, 0xa1, 0x47, 0x16, 0xba, 0x5e, 0x87, 0xd4, - 0x8b, 0x7e, 0x80, 0x9f, 0x83, 0x4b, 0x27, 0x46, - 0x97, 0x72, 0x2b, 0x88, 0xd1, 0xf0, 0x92, 0xd4, - 0x2a, 0x7e, 0x48, 0x63, 0x95, 0x33, 0x13, 0x07, - 0xf8, 0x79, 0x3a, 0x6b, 0x67, 0x1c, 0x6f, 0x38, - 0x80, 0x3c, 0xc6, 0xfa, 0xb8, 0x4e, 0xd2, 0x01, - 0xaf, 0x79, 0x37, 0x60, 0xd6, 0x4d, 0x55, 0xcd, - 0x1d, 0xf5, 0x15, 0x0f, 0xb7, 0x8c, 0xa5, 0xec, - 0x25, 0xe4, 0x45, 0xec, 0xe6, 0xf9, 0xc2, 0x35, - 0xea, 0xc6, 0x30, 0xa2, 0x1f, 0x21, 0x13, 0x1f, - 0x97, 0x95, 0xee, 0x69, 0x63, 0xcf, 0x4b, 0xb2, - 0xc3, 0xc0, 0x23, 0xc9, 0x75, 0x2b, 0xd6, 0xac, - 0x3c, 0xcb, 0x38, 0x73, 0xa0, 0x5a, 0xa5, 0x7d, - 0x3d, 0x23, 0xb1, 0x4c, 0xc9, 0x1b, 0x12, 0xc4, - 0x83, 0xe1, 0x62, 0x61, 0xf3, 0x8c, 0x6a, 0x45, - 0x95, 0xee, 0x74, 0x00, 0x2f, 0x84, 0x77, 0xff, - 0x16, 0x22, 0x02, 0xfe, 0x4b, 0xd2, 0x57, 0x65, - 0xee, 0x49, 0xcd, 0x7b, 0xb5, 0xdb, 0x8e, 0x5a, - 0xcb, 0x70, 0x7f, 0x78, 0xbc, 0x35, 0x34, 0x3e, - 0xcd, 0xf6, 0x24, 0x78, 0x8f, 0xe8, 0x9e, 0x5c, - 0x9c, 0x22, 0x4a, 0xf0, 0xbc, 0x89, 0x64, 0x93, - 0xcf, 0x20, 0xc8, 0xfd, 0x27, 0xe2, 0x36, 0x86, - 0x00, 0x61, 0xe8, 0xe2, 0x9c, 0xad, 0x55, 0x98, - 0x77, 0x2f, 0xfa, 0x28, 0xb4, 0xa7, 0xda, 0xa4, - 0x14, 0x06, 0x8c, 0x7a, 0xd5, 0xdf, 0x0d, 0x32, - 0x56, 0xcc, 0xd3, 0x70, 0x71, 0x70, 0xd5, 0xb6, - 0x41, 0x0f, 0x45, 0xb2, 0xf0, 0x24, 0xa5, 0x23, - 0x13, 0x70, 0x36, 0x07, 0xcd, 0xc6, 0x75, 0xd8, - 0x62, 0x8c, 0x7f, 0xa7, 0xb9, 0x76, 0x16, 0xb3, - 0x9a, 0x7e, 0x20, 0x27, 0x27, 0x2d, 0x33, 0x60, - 0x70, 0xa5, 0xef, 0x5c, }, }, { //nolint:dupl @@ -718,201 +659,258 @@ var cases = []struct { SSRC: 0x9dbb7812, }, Payload: []byte{ //nolint:dupl - 0xc0, 0xcc, 0x01, 0x9c, 0x6e, 0x5f, 0x2f, 0x20, - 0x78, 0x58, 0x59, 0x92, 0x15, 0xfe, 0x13, 0x07, - 0x87, 0xc7, 0x3e, 0x21, 0x04, 0x24, 0x33, 0x60, - 0x15, 0x91, 0xfb, 0xfe, 0xe8, 0xf8, 0xb9, 0xa6, - 0x9a, 0xbf, 0x65, 0xf3, 0x37, 0x40, 0xb8, 0x52, - 0x69, 0x3f, 0x65, 0x27, 0x36, 0x01, 0x92, 0xe8, - 0xef, 0x51, 0x3e, 0xcd, 0xf5, 0xcc, 0x4f, 0x8b, - 0x4f, 0x7b, 0x38, 0x3e, 0x43, 0x4d, 0xc0, 0xa4, - 0xc6, 0x84, 0x79, 0x8e, 0xf4, 0x4a, 0xe1, 0xa9, - 0x2b, 0xd5, 0x34, 0x00, 0x30, 0x94, 0x6a, 0x91, - 0xa2, 0xd5, 0xc0, 0xbf, 0xb5, 0x66, 0x59, 0x38, - 0xc2, 0xa4, 0x75, 0x96, 0x5b, 0x7a, 0xac, 0x9c, - 0x05, 0x67, 0x99, 0x2e, 0xba, 0x21, 0x1e, 0xac, - 0x50, 0x01, 0x68, 0x71, 0xac, 0x68, 0x6d, 0xc1, - 0xf2, 0x2c, 0x51, 0x1e, 0xb6, 0x64, 0x97, 0x3d, - 0x9b, 0x2b, 0x89, 0x66, 0xbd, 0x50, 0x4f, 0x5c, - 0xec, 0x7c, 0xc8, 0x51, 0x61, 0x74, 0xbd, 0x86, - 0xb4, 0x6e, 0x71, 0x59, 0x24, 0x59, 0xaf, 0x66, - 0x54, 0x82, 0xdb, 0xe2, 0x11, 0x6f, 0x87, 0x92, - 0xf3, 0x63, 0xd4, 0x4b, 0xd6, 0x26, 0x42, 0xf1, - 0x2a, 0x66, 0x63, 0x79, 0x5e, 0x7e, 0xfb, 0x3f, - 0x85, 0xa7, 0x24, 0xac, 0x53, 0xe2, 0x57, 0x56, - 0xdd, 0xef, 0x7a, 0xdf, 0xb6, 0x27, 0xaf, 0x25, - 0x6a, 0x89, 0x4a, 0x4c, 0xc3, 0xe6, 0x2e, 0xbe, - 0x2b, 0x38, 0x07, 0xe0, 0x96, 0x98, 0xaf, 0x85, - 0xf4, 0x86, 0x7d, 0xf4, 0xee, 0xe5, 0x78, 0x10, - 0x0a, 0x0e, 0x00, 0x00, 0x00, 0x4a, 0xab, 0xbf, - 0xc3, 0x77, 0x6b, 0xe4, 0x40, 0x40, 0x40, 0x41, - 0x10, 0x0a, 0x0e, 0x00, 0x00, 0x00, 0x4a, 0xab, - 0xbf, 0xc3, 0x77, 0x6b, 0xe4, 0x40, 0x40, 0x40, - 0x41, 0xc1, 0x09, 0x30, 0x30, 0xca, 0x08, 0x12, - 0xfd, 0xfd, 0x78, 0x89, 0xe5, 0x3e, 0xa3, 0x80, - 0x08, 0x20, 0x82, 0x08, 0x54, 0x50, 0x00, 0x30, - 0x00, 0x00, 0x66, 0x00, 0xeb, 0xcd, 0xc5, 0x72, - 0x25, 0x5a, 0x0a, 0xc3, 0x4a, 0x43, 0x15, 0x59, - 0x13, 0x5f, 0xb9, 0x39, 0x19, 0xf1, 0xca, 0x26, - 0xc7, 0x59, 0xa7, 0x66, 0xe4, 0xa5, 0xff, 0x3a, - 0xba, 0x3f, 0x62, 0xfc, 0x58, 0x07, 0xd0, 0x18, - 0xd6, 0xb2, 0x90, 0x72, 0xf4, 0x57, 0xbd, 0x5d, - 0x72, 0x92, 0x8c, 0x71, 0x48, 0x17, 0x89, 0x65, - 0xa9, 0x9e, 0xa2, 0x81, 0x9a, 0x83, 0x66, 0x11, - 0xd7, 0xe7, 0x41, 0x35, 0xb7, 0x8a, 0xb3, 0xd0, - 0x90, 0x54, 0x2a, 0x48, 0xea, 0x65, 0xd1, 0xb0, - 0x83, 0xda, 0xbb, 0x61, 0xff, 0xc4, 0xd0, 0x06, - 0x78, 0x35, 0xc2, 0xf7, 0x15, 0x16, 0xe5, 0xc3, - 0xf0, 0x9f, 0x7f, 0x1a, 0xd6, 0xad, 0xd4, 0x41, - 0xa4, 0xf4, 0x40, 0x41, 0x00, 0x78, 0x5c, 0x14, - 0x08, 0x57, 0x3d, 0x96, 0xc2, 0x0b, 0xb5, 0x03, - 0xce, 0x7d, 0xe6, 0x50, 0xd1, 0xbc, 0x3e, 0x1e, - 0x84, 0x62, 0x1a, 0xd1, 0xfe, 0x52, 0x9e, 0x79, - 0x26, 0x51, 0xc8, 0x14, 0x54, 0xf2, 0x77, 0xe6, - 0x25, 0x0f, 0x5f, 0xec, 0x66, 0x33, 0xdb, 0xd0, - 0x9f, 0x5a, 0xf9, 0xbc, 0xc4, 0x9b, 0x31, 0x8c, - 0x6f, 0xe6, 0x2a, 0x50, 0x65, 0x1d, 0x45, 0xaf, - 0x19, 0xd4, 0xde, 0xf8, 0x33, 0x43, 0x48, 0x57, - 0x00, 0x80, 0x5b, 0xaa, 0x3e, 0x1b, 0xf7, 0x21, - 0xc1, 0x56, 0x5e, 0xfb, 0xdb, 0x43, 0xa8, 0x7b, - 0xde, 0x82, 0xc1, 0x45, 0x5a, 0x36, 0x04, 0x20, - 0xa8, 0xa3, 0x0b, 0xa9, 0xa8, 0x6d, 0xe1, 0xfd, - 0x13, 0x0d, 0x38, 0xef, 0x00, 0xd5, 0x00, 0xe5, - 0x2d, 0x69, 0x67, 0x17, 0x59, 0xd9, 0xda, 0x61, - 0x95, 0xac, 0x55, 0x3a, 0xc5, 0x77, 0x1e, 0xbe, - 0xa5, 0x58, 0x7a, 0xbb, 0x09, 0xbd, 0x46, 0xab, - 0x82, 0x60, 0x13, 0x8f, 0x8b, 0xfb, 0x29, 0xe0, - 0x7f, 0xa5, 0xca, 0x25, 0xfa, 0x77, 0x07, 0x88, - 0x51, 0xdb, 0xc2, 0x99, 0x5f, 0xad, 0xe1, 0x45, - 0x28, 0x0e, 0x00, 0x86, 0x79, 0x60, 0xe2, 0x36, - 0x9a, 0x41, 0x21, 0x01, 0xdf, 0x3d, 0x0c, 0x31, - 0x37, 0xa4, 0x0b, 0x00, 0xe6, 0x43, 0xfb, 0x28, - 0x05, 0x2c, 0xff, 0x40, 0x1c, 0x23, 0x6d, 0x4f, - 0x58, 0x00, 0xe1, 0xc4, 0xb2, 0x05, 0x3a, 0x03, - 0xa4, 0xde, 0xf4, 0x13, 0x5e, 0x8c, 0x45, 0xc2, - 0x3b, 0xf0, 0x2c, 0x00, 0x28, 0x0b, 0xe2, 0x7d, - 0xa4, 0x27, 0x78, 0xf0, 0xfa, 0x3f, 0x0a, 0xa9, - 0xac, 0x20, 0xa0, 0xe2, 0x33, 0xe8, 0xc6, 0xa7, - 0x69, 0x6f, 0x4c, 0xec, 0x67, 0x06, 0x79, 0x27, - 0x1d, 0x69, 0xe3, 0xa6, 0xad, 0x6e, 0x63, 0x97, - 0xd2, 0xe3, 0xaa, 0xd4, 0xc5, 0x6d, 0xaa, 0x29, - 0xfa, 0xc3, 0x4b, 0x23, 0xec, 0xe7, 0x5f, 0xdd, - 0xf8, 0x45, 0x55, 0x62, 0xec, 0x3c, 0xe8, 0x73, - 0xf0, 0x63, 0x04, 0x6f, 0x88, 0xa7, 0x4d, 0x7c, - 0x28, 0xef, 0x20, 0x0d, 0x00, 0xf9, 0xba, 0xe5, - 0x09, 0x5d, 0xc2, 0x8d, 0x7d, 0x18, 0x2c, 0x2f, - 0xff, 0x93, 0x88, 0x2d, 0x00, 0xf9, 0xaf, 0x22, - 0x68, 0x70, 0x72, 0xe4, 0x36, 0x22, 0x15, 0x5f, - 0x7a, 0xef, 0xd9, 0x03, 0x25, 0xf5, 0x17, 0x68, - 0x30, 0xee, 0x2b, 0xed, 0xe8, 0x0c, 0x1a, 0x32, - 0x72, 0x62, 0xd4, 0x74, 0x69, 0xf1, 0x9a, 0xcf, - 0x9b, 0x52, 0xfc, 0x56, 0xe3, 0xda, 0x73, 0x09, - 0x33, 0x95, 0x08, 0x77, 0x00, 0x09, 0x17, 0x4d, - 0xb7, 0xc4, 0x32, 0xcd, 0xf9, 0x33, 0x7f, 0x78, - 0x44, 0x33, 0xf3, 0x94, 0x5d, 0x74, 0x14, 0x53, - 0x3e, 0xc1, 0xa6, 0x62, 0x3a, 0x94, 0x41, 0xc9, - 0x4d, 0x05, 0x87, 0x7d, 0x92, 0xd9, 0x12, 0xb4, - 0x9a, 0x1f, 0x43, 0xf4, 0x54, 0x0c, 0xb4, 0x6c, - 0xd0, 0x16, 0xd7, 0x46, 0xe2, 0x5e, 0xdc, 0x56, - 0xff, 0x42, 0x72, 0xe4, 0x97, 0x8f, 0xdb, 0x2f, - 0x27, 0xbd, 0x4c, 0xa3, 0x4e, 0x43, 0x4a, 0x0b, - 0x46, 0x45, 0x36, 0x80, 0x0d, 0xd4, 0x87, 0xc7, - 0x1a, 0xf8, 0x5f, 0x9c, 0xf4, 0x10, 0x82, 0xa8, - 0x28, 0xa7, 0xd1, 0xbf, 0xc1, 0x61, 0x5a, 0x73, - 0xbd, 0xe9, 0x44, 0x66, 0x5a, 0x2b, 0x14, 0x4c, - 0xa5, 0x5d, 0x3d, 0x38, 0xfb, 0xd4, 0xa8, 0x24, - 0xbe, 0xe4, 0x99, 0xa1, 0x98, 0x90, 0x72, 0x67, - 0x1f, 0x3b, 0x96, 0xae, 0x60, 0x7a, 0x00, 0xf2, - 0x11, 0x13, 0x9f, 0xc4, 0xb5, 0x63, 0xd7, 0x63, - 0xb6, 0x64, 0xe3, 0xbb, 0xf1, 0x96, 0x9e, 0x77, - 0xab, 0xc4, 0xa8, 0x39, 0xd5, 0x22, 0xe9, 0xee, - 0xad, 0x1f, 0x91, 0xff, 0x56, 0x3e, 0x68, 0x89, - 0x63, 0x11, 0xc8, 0x98, 0xa1, 0x7e, 0xd9, 0x37, - 0xb2, 0x94, 0x23, 0xfb, 0x67, 0xb7, 0xa0, 0xaa, - 0x0f, 0xe7, 0xb6, 0xe1, 0xb8, 0xc3, 0x73, 0xe3, - 0xae, 0x07, 0xe6, 0xf7, 0xc8, 0x35, 0x03, 0xc5, - 0x7a, 0xfc, 0x48, 0xd4, 0xe2, 0x61, 0x7a, 0x22, - 0xdd, 0x78, 0x4b, 0xef, 0xa4, 0xde, 0x27, 0x62, - 0xdd, 0xa1, 0x76, 0xe5, 0xeb, 0x83, 0xa3, 0x18, - 0xde, 0xe9, 0x99, 0x37, 0x66, 0x34, 0x20, 0xaf, - 0x67, 0x2b, 0xdd, 0xa4, 0x69, 0xeb, 0x7d, 0x71, - 0x0f, 0x24, 0xef, 0x88, 0x49, 0x8c, 0xe5, 0x33, - 0xfa, 0xf3, 0x3e, 0xff, 0x46, 0x10, 0x5d, 0x25, - 0x97, 0x7f, 0x8e, 0x00, 0xe2, 0x08, 0x0e, 0x39, - 0x65, 0x4c, 0xa5, 0x1b, 0x5f, 0x5a, 0xa8, 0xab, - 0xb1, 0x4a, 0x55, 0xf0, 0x41, 0x9e, 0xf5, 0xcd, - 0x2c, 0x34, 0x56, 0x11, 0xda, 0x96, 0x68, 0xe4, - 0x39, 0x8d, 0xfe, 0x40, 0xb0, 0x0b, 0x05, 0x5d, - 0xf4, 0xba, 0x27, 0x1a, 0x3b, 0xed, 0xee, 0x88, - 0x07, 0x59, 0x40, 0xf6, 0x6f, 0x44, 0x1a, 0x5f, - 0x3d, 0x42, 0xb2, 0xa7, 0x5d, 0x07, 0xd5, 0x7e, - 0x95, 0x36, 0xc9, 0xa3, 0xd3, 0x45, 0x56, 0x70, - 0x92, 0x79, 0xc9, 0xd7, 0xfd, 0x88, 0xa4, 0x89, - 0x9a, 0x94, 0xbd, 0x9d, 0x49, 0xec, 0x32, 0xc4, - 0xee, 0x87, 0xd7, 0x0a, 0xf8, 0xab, 0x23, 0x70, - 0x3b, 0xbd, 0xd6, 0x34, 0x86, 0x3a, 0x05, 0x68, - 0x95, 0x31, 0x81, 0x2d, 0x6d, 0xde, 0x54, 0xfe, - 0x0b, 0xa9, 0x72, 0x3c, 0x78, 0xb7, 0xf5, 0x84, - 0x67, 0x39, 0x4f, 0x2d, 0xbb, 0xcb, 0x22, 0x2d, - 0xed, 0xf2, 0xc1, 0x56, 0xf8, 0x11, 0xf9, 0xee, - 0x81, 0xd8, 0x64, 0x07, 0xbf, 0xb4, 0x69, 0xdb, - 0xda, 0x0c, 0xf5, 0x20, 0x00, 0xf8, 0x26, 0x7b, - 0x31, 0x54, 0x09, 0x24, 0xbf, 0x7c, 0xf5, 0xad, - 0x76, 0xbb, 0xcc, 0x89, 0xee, 0x5b, 0x2a, 0x23, - 0x12, 0x1c, 0x69, 0x50, 0xdd, 0x03, 0x0d, 0xe4, - 0xca, 0xb8, 0x59, 0x7c, 0x91, 0xa0, 0x82, 0x00, - 0x01, 0x9e, 0x1e, 0x4d, 0x87, 0xf7, 0xab, 0x3d, - 0x06, 0x6c, 0x95, 0x90, 0x63, 0x57, 0x0f, 0x44, - 0x4c, 0x49, 0x21, 0x2e, 0x85, 0x47, 0x61, 0x02, - 0x67, 0x57, 0xdc, 0xde, 0x67, 0x92, 0x11, 0x34, - 0x85, 0x05, 0x9e, 0x25, 0xe4, 0x1b, 0x8e, 0xaa, - 0xca, 0xd9, 0x4c, 0x2c, 0x84, 0x30, 0xf1, 0xdc, - 0x4a, 0x9b, 0x02, 0xdd, 0x69, 0x5e, 0xcd, 0x31, - 0x08, 0x27, 0xd1, 0x83, 0xcd, 0x03, 0x4d, 0xd9, - 0xf0, 0x0a, 0x69, 0x8e, 0x8b, 0x88, 0x14, 0x98, - 0x37, 0x8c, 0xad, 0x93, 0x70, 0x04, 0xf8, 0x88, - 0xa7, 0x67, 0xf0, 0xfe, 0xa9, 0x49, 0x46, 0xbe, - 0xab, 0x14, 0x8c, 0x56, 0xea, 0x17, 0x52, 0x1f, - 0x35, 0xfa, 0xd2, 0xd4, 0xa4, 0xf6, 0xb6, 0x72, - 0x25, 0x03, 0xbf, 0xc1, 0x85, 0xe1, 0x3e, 0x3a, - 0x19, 0xcb, 0xe3, 0x7e, 0x15, 0x65, 0xd1, 0x33, - 0x40, 0x2a, 0xd8, 0x3f, 0x2c, 0x86, 0x12, 0x65, - 0xe2, 0x60, 0x80, 0x1b, 0x01, 0x0b, 0xd2, 0xcd, - 0x3b, 0x24, 0x56, 0x73, 0xcd, 0xa9, 0x34, 0xd1, - 0x36, 0xd3, 0x26, 0x6f, 0x49, 0x58, 0xcf, 0xb7, - 0x39, 0x92, 0xa8, 0x15, 0x47, 0x0f, 0x92, 0x68, - 0x49, 0xa2, 0x91, 0xe0, 0x55, 0xc8, 0xd9, 0xf1, - 0x84, 0xc4, 0x41, 0x67, 0xd9, 0x24, 0xf3, 0x0f, - 0xdc, 0x3d, 0x6d, 0x79, 0x4d, 0x0f, 0x35, 0x8b, - 0xdf, 0x6d, 0xcd, 0x66, 0x7e, 0x82, 0x09, 0xa3, - 0x72, 0x1d, 0x3d, 0x4b, 0x0f, 0xad, 0x7c, 0xbe, - 0xdd, 0x96, 0x17, 0x62, 0x26, 0x72, 0xe6, 0x1d, - 0xb9, 0xf6, 0x9a, 0x71, 0x52, 0x5a, 0x76, 0xbb, - 0x4e, 0x11, 0x78, 0xbe, 0x05, 0xe5, 0xf6, 0xaf, - 0xf2, 0x66, 0xd3, 0xe5, 0xdb, 0xfc, 0xd8, 0x96, - 0x64, 0x8b, 0x7a, 0xec, 0x9f, 0x3e, 0x0d, 0x7c, - 0xd5, 0x20, 0xdf, 0x50, 0x52, 0x57, 0x93, 0xa0, - 0x03, 0x5a, 0xed, 0x5c, 0xb4, 0xfa, 0x15, 0xf0, - 0xda, 0xc4, 0x94, 0xbf, 0xcb, 0x25, 0xc7, 0xda, - 0x59, 0x5d, 0xb8, 0x00, 0x00, 0x00, 0x56, 0x76, - 0xe4, 0x62, 0x1c, 0x71, 0x70, 0xf6, 0x7f, 0x20, - 0x83, 0xee, 0x17, 0x23, 0x56, 0x8c, 0x20, 0x9c, - 0x65, 0x25, 0xe9, 0x38, 0xe2, 0xd2, 0x66, 0xae, - 0xa1, 0x47, 0x16, 0xba, 0x5e, 0x87, 0xd4, 0x8b, - 0x7e, 0x80, 0x9f, 0x83, 0x4b, 0x27, 0x46, 0x97, - 0x72, 0x2b, 0x88, 0xd1, + 0xc0, 0x98, 0x05, 0x88, 0xa7, 0x67, 0xf0, 0xfe, + 0xa9, 0x49, 0x46, 0xbe, 0xab, 0x14, 0x8c, 0x56, + 0xea, 0x17, 0x52, 0x1f, 0x35, 0xfa, 0xd2, 0xd4, + 0xa4, 0xf6, 0xb6, 0x72, 0x25, 0x03, 0xbf, 0xc1, + 0x85, 0xe1, 0x3e, 0x3a, 0x19, 0xcb, 0xe3, 0x7e, + 0x15, 0x65, 0xd1, 0x33, 0x40, 0x2a, 0xd8, 0x3f, + 0x2c, 0x86, 0x12, 0x65, 0xe2, 0x60, 0x80, 0x1b, + 0x01, 0x0b, 0xd2, 0xcd, 0x3b, 0x24, 0x56, 0x73, + 0xcd, 0xa9, 0x34, 0xd1, 0x36, 0xd3, 0x26, 0x6f, + 0x49, 0x58, 0xcf, 0xb7, 0x39, 0x92, 0xa8, 0x15, + 0x47, 0x0f, 0x92, 0x68, 0x49, 0xa2, 0x91, 0xe0, + 0x55, 0xc8, 0xd9, 0xf1, 0x84, 0xc4, 0x41, 0x67, + 0xd9, 0x24, 0xf3, 0x0f, 0xdc, 0x3d, 0x6d, 0x79, + 0x4d, 0x0f, 0x35, 0x8b, 0xdf, 0x6d, 0xcd, 0x66, + 0x7e, 0x82, 0x09, 0xa3, 0x72, 0x1d, 0x3d, 0x4b, + 0x0f, 0xad, 0x7c, 0xbe, 0xdd, 0x96, 0x17, 0x62, + 0x26, 0x72, 0xe6, 0x1d, 0xb9, 0xf6, 0x9a, 0x71, + 0x52, 0x5a, 0x76, 0xbb, 0x4e, 0x11, 0x78, 0xbe, + 0x05, 0xe5, 0xf6, 0xaf, 0xf2, 0x66, 0xd3, 0xe5, + 0xdb, 0xfc, 0xd8, 0x96, 0x64, 0x8b, 0x7a, 0xec, + 0x9f, 0x3e, 0x0d, 0x7c, 0xd5, 0x20, 0xdf, 0x50, + 0x52, 0x57, 0x93, 0xa0, 0x03, 0x5a, 0xed, 0x5c, + 0xb4, 0xfa, 0x15, 0xf0, 0xda, 0xc4, 0x94, 0xbf, + 0xcb, 0x25, 0xc7, 0xda, 0x59, 0x5d, 0xb8, 0x00, + 0x00, 0x00, 0x56, 0x76, 0xe4, 0x62, 0x1c, 0x71, + 0x70, 0xf6, 0x7f, 0x20, 0x83, 0xee, 0x17, 0x23, + 0x56, 0x8c, 0x20, 0x9c, 0x65, 0x25, 0xe9, 0x38, + 0xe2, 0xd2, 0x66, 0xae, 0xa1, 0x47, 0x16, 0xba, + 0x5e, 0x87, 0xd4, 0x8b, 0x7e, 0x80, 0x9f, 0x83, + 0x4b, 0x27, 0x46, 0x97, 0x72, 0x2b, 0x88, 0xd1, + 0xf0, 0x92, 0xd4, 0x2a, 0x7e, 0x48, 0x63, 0x95, + 0x33, 0x13, 0x07, 0xf8, 0x79, 0x3a, 0x6b, 0x67, + 0x1c, 0x6f, 0x38, 0x80, 0x3c, 0xc6, 0xfa, 0xb8, + 0x4e, 0xd2, 0x01, 0xaf, 0x79, 0x37, 0x60, 0xd6, + 0x4d, 0x55, 0xcd, 0x1d, 0xf5, 0x15, 0x0f, 0xb7, + 0x8c, 0xa5, 0xec, 0x25, 0xe4, 0x45, 0xec, 0xe6, + 0xf9, 0xc2, 0x35, 0xea, 0xc6, 0x30, 0xa2, 0x1f, + 0x21, 0x13, 0x1f, 0x97, 0x95, 0xee, 0x69, 0x63, + 0xcf, 0x4b, 0xb2, 0xc3, 0xc0, 0x23, 0xc9, 0x75, + 0x2b, 0xd6, 0xac, 0x3c, 0xcb, 0x38, 0x73, 0xa0, + 0x5a, 0xa5, 0x7d, 0x3d, 0x23, 0xb1, 0x4c, 0xc9, + 0x1b, 0x12, 0xc4, 0x83, 0xe1, 0x62, 0x61, 0xf3, + 0x8c, 0x6a, 0x45, 0x95, 0xee, 0x74, 0x00, 0x2f, + 0x84, 0x77, 0xff, 0x16, 0x22, 0x02, 0xfe, 0x4b, + 0xd2, 0x57, 0x65, 0xee, 0x49, 0xcd, 0x7b, 0xb5, + 0xdb, 0x8e, 0x5a, 0xcb, 0x70, 0x7f, 0x78, 0xbc, + 0x35, 0x34, 0x3e, 0xcd, 0xf6, 0x24, 0x78, 0x8f, + 0xe8, 0x9e, 0x5c, 0x9c, 0x22, 0x4a, 0xf0, 0xbc, + 0x89, 0x64, 0x93, 0xcf, 0x20, 0xc8, 0xfd, 0x27, + 0xe2, 0x36, 0x86, 0x00, 0x61, 0xe8, 0xe2, 0x9c, + 0xad, 0x55, 0x98, 0x77, 0x2f, 0xfa, 0x28, 0xb4, + 0xa7, 0xda, 0xa4, 0x14, 0x06, 0x8c, 0x7a, 0xd5, + 0xdf, 0x0d, 0x32, 0x56, 0xcc, 0xd3, 0x70, 0x71, + 0x70, 0xd5, 0xb6, 0x41, 0x0f, 0x45, 0xb2, 0xf0, + 0x24, 0xa5, 0x23, 0x13, 0x70, 0x36, 0x07, 0xcd, + 0xc6, 0x75, 0xd8, 0x62, 0x8c, 0x7f, 0xa7, 0xb9, + 0x76, 0x16, 0xb3, 0x9a, 0x7e, 0x20, 0x27, 0x27, + 0x2d, 0x33, 0x60, 0x70, 0xa5, 0xef, 0x5c, 0x9c, + 0x6e, 0x5f, 0x2f, 0x20, 0x78, 0x58, 0x59, 0x92, + 0x15, 0xfe, 0x13, 0x07, 0x87, 0xc7, 0x3e, 0x21, + 0x04, 0x24, 0x33, 0x60, 0x15, 0x91, 0xfb, 0xfe, + 0xe8, 0xf8, 0xb9, 0xa6, 0x9a, 0xbf, 0x65, 0xf3, + 0x37, 0x40, 0xb8, 0x52, 0x69, 0x3f, 0x65, 0x27, + 0x36, 0x01, 0x92, 0xe8, 0xef, 0x51, 0x3e, 0xcd, + 0xf5, 0xcc, 0x4f, 0x8b, 0x4f, 0x7b, 0x38, 0x3e, + 0x43, 0x4d, 0xc0, 0xa4, 0xc6, 0x84, 0x79, 0x8e, + 0xf4, 0x4a, 0xe1, 0xa9, 0x2b, 0xd5, 0x34, 0x00, + 0x30, 0x94, 0x6a, 0x91, 0xa2, 0xd5, 0xc0, 0xbf, + 0xb5, 0x66, 0x59, 0x38, 0xc2, 0xa4, 0x75, 0x96, + 0x5b, 0x7a, 0xac, 0x9c, 0x05, 0x67, 0x99, 0x2e, + 0xba, 0x21, 0x1e, 0xac, 0x50, 0x01, 0x68, 0x71, + 0xac, 0x68, 0x6d, 0xc1, 0xf2, 0x2c, 0x51, 0x1e, + 0xb6, 0x64, 0x97, 0x3d, 0x9b, 0x2b, 0x89, 0x66, + 0xbd, 0x50, 0x4f, 0x5c, 0xec, 0x7c, 0xc8, 0x51, + 0x61, 0x74, 0xbd, 0x86, 0xb4, 0x6e, 0x71, 0x59, + 0x24, 0x59, 0xaf, 0x66, 0x54, 0x82, 0xdb, 0xe2, + 0x11, 0x6f, 0x87, 0x92, 0xf3, 0x63, 0xd4, 0x4b, + 0xd6, 0x26, 0x42, 0xf1, 0x2a, 0x66, 0x63, 0x79, + 0x5e, 0x7e, 0xfb, 0x3f, 0x85, 0xa7, 0x24, 0xac, + 0x53, 0xe2, 0x57, 0x56, 0xdd, 0xef, 0x7a, 0xdf, + 0xb6, 0x27, 0xaf, 0x25, 0x6a, 0x89, 0x4a, 0x4c, + 0xc3, 0xe6, 0x2e, 0xbe, 0x2b, 0x38, 0x07, 0xe0, + 0x96, 0x98, 0xaf, 0x85, 0xf4, 0x86, 0x7d, 0xf4, + 0xee, 0xe5, 0x78, 0x10, 0x0a, 0x0e, 0x00, 0x00, + 0x00, 0x4a, 0xab, 0xbf, 0xc3, 0x77, 0x6b, 0xe4, + 0x40, 0x40, 0x40, 0x41, 0x10, 0x0a, 0x0e, 0x00, + 0x00, 0x00, 0x4a, 0xab, 0xbf, 0xc3, 0x77, 0x6b, + 0xe4, 0x40, 0x40, 0x40, 0x41, 0xa9, 0x02, 0x30, + 0x30, 0xca, 0x08, 0x12, 0xfd, 0xfd, 0x78, 0x89, + 0xe5, 0x3e, 0xa3, 0x80, 0x08, 0x20, 0x82, 0x08, + 0x54, 0x50, 0x00, 0x30, 0x00, 0x00, 0x66, 0x00, + 0xeb, 0xcd, 0xc5, 0x72, 0x25, 0x5a, 0x0a, 0xc3, + 0x4a, 0x43, 0x15, 0x59, 0x13, 0x5f, 0xb9, 0x39, + 0x19, 0xf1, 0xca, 0x26, 0xc7, 0x59, 0xa7, 0x66, + 0xe4, 0xa5, 0xff, 0x3a, 0xba, 0x3f, 0x62, 0xfc, + 0x58, 0x07, 0xd0, 0x18, 0xd6, 0xb2, 0x90, 0x72, + 0xf4, 0x57, 0xbd, 0x5d, 0x72, 0x92, 0x8c, 0x71, + 0x48, 0x17, 0x89, 0x65, 0xa9, 0x9e, 0xa2, 0x81, + 0x9a, 0x83, 0x66, 0x11, 0xd7, 0xe7, 0x41, 0x35, + 0xb7, 0x8a, 0xb3, 0xd0, 0x90, 0x54, 0x2a, 0x48, + 0xea, 0x65, 0xd1, 0xb0, 0x83, 0xda, 0xbb, 0x61, + 0xff, 0xc4, 0xd0, 0x06, 0x78, 0x35, 0xc2, 0xf7, + 0x15, 0x16, 0xe5, 0xc3, 0xf0, 0x9f, 0x7f, 0x1a, + 0xd6, 0xad, 0xd4, 0x41, 0xa4, 0xf4, 0x40, 0x41, + 0x00, 0x78, 0x5c, 0x14, 0x08, 0x57, 0x3d, 0x96, + 0xc2, 0x0b, 0xb5, 0x03, 0xce, 0x7d, 0xe6, 0x50, + 0xd1, 0xbc, 0x3e, 0x1e, 0x84, 0x62, 0x1a, 0xd1, + 0xfe, 0x52, 0x9e, 0x79, 0x26, 0x51, 0xc8, 0x14, + 0x54, 0xf2, 0x77, 0xe6, 0x25, 0x0f, 0x5f, 0xec, + 0x66, 0x33, 0xdb, 0xd0, 0x9f, 0x5a, 0xf9, 0xbc, + 0xc4, 0x9b, 0x31, 0x8c, 0x6f, 0xe6, 0x2a, 0x50, + 0x65, 0x1d, 0x45, 0xaf, 0x19, 0xd4, 0xde, 0xf8, + 0x33, 0x43, 0x48, 0x57, 0x00, 0x80, 0x5b, 0xaa, + 0x3e, 0x1b, 0xf7, 0x21, 0xc1, 0x56, 0x5e, 0xfb, + 0xdb, 0x43, 0xa8, 0x7b, 0xde, 0x82, 0xc1, 0x45, + 0x5a, 0x36, 0x04, 0x20, 0xa8, 0xa3, 0x0b, 0xa9, + 0xa8, 0x6d, 0xe1, 0xfd, 0x13, 0x0d, 0x38, 0xef, + 0x00, 0xd5, 0x00, 0xe5, 0x2d, 0x69, 0x67, 0x17, + 0x59, 0xd9, 0xda, 0x61, 0x95, 0xac, 0x55, 0x3a, + 0xc5, 0x77, 0x1e, 0xbe, 0xa5, 0x58, 0x7a, 0xbb, + 0x09, 0xbd, 0x46, 0xab, 0x82, 0x60, 0x13, 0x8f, + 0x8b, 0xfb, 0x29, 0xe0, 0x7f, 0xa5, 0xca, 0x25, + 0xfa, 0x77, 0x07, 0x88, 0x51, 0xdb, 0xc2, 0x99, + 0x5f, 0xad, 0xe1, 0x45, 0x28, 0x0e, 0x00, 0x86, + 0x79, 0x60, 0xe2, 0x36, 0x9a, 0x41, 0x21, 0x01, }, }, - { + { //nolint:dupl Header: rtp.Header{ Version: 2, - Marker: true, + Marker: false, PayloadType: 96, SequenceNumber: 17647, SSRC: 0x9dbb7812, }, Payload: []byte{ - 0xa0, 0xab, 0x03, 0xf0, 0x92, 0xd4, 0x2a, 0x7e, + 0xc0, 0xe5, 0x07, 0xdf, 0x3d, 0x0c, 0x31, 0x37, + 0xa4, 0x0b, 0x00, 0xe6, 0x43, 0xfb, 0x28, 0x05, + 0x2c, 0xff, 0x40, 0x1c, 0x23, 0x6d, 0x4f, 0x58, + 0x00, 0xe1, 0xc4, 0xb2, 0x05, 0x3a, 0x03, 0xa4, + 0xde, 0xf4, 0x13, 0x5e, 0x8c, 0x45, 0xc2, 0x3b, + 0xf0, 0x2c, 0x00, 0x28, 0x0b, 0xe2, 0x7d, 0xa4, + 0x27, 0x78, 0xf0, 0xfa, 0x3f, 0x0a, 0xa9, 0xac, + 0x20, 0xa0, 0xe2, 0x33, 0xe8, 0xc6, 0xa7, 0x69, + 0x6f, 0x4c, 0xec, 0x67, 0x06, 0x79, 0x27, 0x1d, + 0x69, 0xe3, 0xa6, 0xad, 0x6e, 0x63, 0x97, 0xd2, + 0xe3, 0xaa, 0xd4, 0xc5, 0x6d, 0xaa, 0x29, 0xfa, + 0xc3, 0x4b, 0x23, 0xec, 0xe7, 0x5f, 0xdd, 0xf8, + 0x45, 0x55, 0x62, 0xec, 0x3c, 0xe8, 0x73, 0xf0, + 0x63, 0x04, 0x6f, 0x88, 0xa7, 0x4d, 0x7c, 0x28, + 0xef, 0x20, 0x0d, 0x00, 0xf9, 0xba, 0xe5, 0x09, + 0x5d, 0xc2, 0x8d, 0x7d, 0x18, 0x2c, 0x2f, 0xff, + 0x93, 0x88, 0x2d, 0x00, 0xf9, 0xaf, 0x22, 0x68, + 0x70, 0x72, 0xe4, 0x36, 0x22, 0x15, 0x5f, 0x7a, + 0xef, 0xd9, 0x03, 0x25, 0xf5, 0x17, 0x68, 0x30, + 0xee, 0x2b, 0xed, 0xe8, 0x0c, 0x1a, 0x32, 0x72, + 0x62, 0xd4, 0x74, 0x69, 0xf1, 0x9a, 0xcf, 0x9b, + 0x52, 0xfc, 0x56, 0xe3, 0xda, 0x73, 0x09, 0x33, + 0x95, 0x08, 0x77, 0x00, 0x09, 0x17, 0x4d, 0xb7, + 0xc4, 0x32, 0xcd, 0xf9, 0x33, 0x7f, 0x78, 0x44, + 0x33, 0xf3, 0x94, 0x5d, 0x74, 0x14, 0x53, 0x3e, + 0xc1, 0xa6, 0x62, 0x3a, 0x94, 0x41, 0xc9, 0x4d, + 0x05, 0x87, 0x7d, 0x92, 0xd9, 0x12, 0xb4, 0x9a, + 0x1f, 0x43, 0xf4, 0x54, 0x0c, 0xb4, 0x6c, 0xd0, + 0x16, 0xd7, 0x46, 0xe2, 0x5e, 0xdc, 0x56, 0xff, + 0x42, 0x72, 0xe4, 0x97, 0x8f, 0xdb, 0x2f, 0x27, + 0xbd, 0x4c, 0xa3, 0x4e, 0x43, 0x4a, 0x0b, 0x46, + 0x45, 0x36, 0x80, 0x0d, 0xd4, 0x87, 0xc7, 0x1a, + 0xf8, 0x5f, 0x9c, 0xf4, 0x10, 0x82, 0xa8, 0x28, + 0xa7, 0xd1, 0xbf, 0xc1, 0x61, 0x5a, 0x73, 0xbd, + 0xe9, 0x44, 0x66, 0x5a, 0x2b, 0x14, 0x4c, 0xa5, + 0x5d, 0x3d, 0x38, 0xfb, 0xd4, 0xa8, 0x24, 0xbe, + 0xe4, 0x99, 0xa1, 0x98, 0x90, 0x72, 0x67, 0x1f, + 0x3b, 0x96, 0xae, 0x60, 0x7a, 0x00, 0xf2, 0x11, + 0x13, 0x9f, 0xc4, 0xb5, 0x63, 0xd7, 0x63, 0xb6, + 0x64, 0xe3, 0xbb, 0xf1, 0x96, 0x9e, 0x77, 0xab, + 0xc4, 0xa8, 0x39, 0xd5, 0x22, 0xe9, 0xee, 0xad, + 0x1f, 0x91, 0xff, 0x56, 0x3e, 0x68, 0x89, 0x63, + 0x11, 0xc8, 0x98, 0xa1, 0x7e, 0xd9, 0x37, 0xb2, + 0x94, 0x23, 0xfb, 0x67, 0xb7, 0xa0, 0xaa, 0x0f, + 0xe7, 0xb6, 0xe1, 0xb8, 0xc3, 0x73, 0xe3, 0xae, + 0x07, 0xe6, 0xf7, 0xc8, 0x35, 0x03, 0xc5, 0x7a, + 0xfc, 0x48, 0xd4, 0xe2, 0x61, 0x7a, 0x22, 0xdd, + 0x78, 0x4b, 0xef, 0xa4, 0xde, 0x27, 0x62, 0xdd, + 0xa1, 0x76, 0xe5, 0xeb, 0x83, 0xa3, 0x18, 0xde, + 0xe9, 0x99, 0x37, 0x66, 0x34, 0x20, 0xaf, 0x67, + 0x2b, 0xdd, 0xa4, 0x69, 0xeb, 0x7d, 0x71, 0x0f, + 0x24, 0xef, 0x88, 0x49, 0x8c, 0xe5, 0x33, 0xfa, + 0xf3, 0x3e, 0xff, 0x46, 0x10, 0x5d, 0x25, 0x97, + 0x7f, 0x8e, 0x00, 0xe2, 0x08, 0x0e, 0x39, 0x65, + 0x4c, 0xa5, 0x1b, 0x5f, 0x5a, 0xa8, 0xab, 0xb1, + 0x4a, 0x55, 0xf0, 0x41, 0x9e, 0xf5, 0xcd, 0x2c, + 0x34, 0x56, 0x11, 0xda, 0x96, 0x68, 0xe4, 0x39, + 0x8d, 0xfe, 0x40, 0xb0, 0x0b, 0x05, 0x5d, 0xf4, + 0xba, 0x27, 0x1a, 0x3b, 0xed, 0xee, 0x88, 0x07, + 0x59, 0x40, 0xf6, 0x6f, 0x44, 0x1a, 0x5f, 0x3d, + 0x42, 0xb2, 0xa7, 0x5d, 0x07, 0xd5, 0x7e, 0x95, + 0x36, 0xc9, 0xa3, 0xd3, 0x45, 0x56, 0x70, 0x92, + 0x79, 0xc9, 0xd7, 0xfd, 0x88, 0xa4, 0x89, 0x9a, + 0x94, 0xbd, 0x9d, 0x49, 0xec, 0x32, 0xc4, 0xee, + 0x87, 0xd7, 0x0a, 0xf8, 0xab, 0x23, 0x70, 0x3b, + 0xbd, 0xd6, 0x34, 0x86, 0x3a, 0x05, 0x68, 0x95, + 0x31, 0x81, 0x2d, 0x6d, 0xde, 0x54, 0xfe, 0x0b, + 0xa9, 0x72, 0x3c, 0x78, 0xb7, 0xf5, 0x84, 0x67, + 0x39, 0x4f, 0x2d, 0xbb, 0xcb, 0x22, 0x2d, 0xed, + 0xf2, 0xc1, 0x56, 0xf8, 0x11, 0xf9, 0xee, 0x81, + 0xd8, 0x64, 0x07, 0xbf, 0xb4, 0x69, 0xdb, 0xda, + 0x0c, 0xf5, 0x20, 0x00, 0xf8, 0x26, 0x7b, 0x31, + 0x54, 0x09, 0x24, 0xbf, 0x7c, 0xf5, 0xad, 0x76, + 0xbb, 0xcc, 0x89, 0xee, 0x5b, 0x2a, 0x23, 0x12, + 0x1c, 0x69, 0x50, 0xdd, 0x03, 0x0d, 0xe4, 0xca, + 0xb8, 0x59, 0x7c, 0x91, 0xa0, 0x82, 0x00, 0x01, + 0x9e, 0x1e, 0x4d, 0x87, 0xf7, 0xab, 0x3d, 0x06, + 0x6c, 0x95, 0x90, 0x63, 0x57, 0x0f, 0x44, 0x4c, + 0x49, 0x21, 0x2e, 0x85, 0x47, 0x61, 0x02, 0x67, + 0x57, 0xdc, 0xde, 0x67, 0x92, 0x11, 0x34, 0x85, + 0x05, 0x9e, 0x25, 0xe4, 0x1b, 0x8e, 0xaa, 0xca, + 0xd9, 0x4c, 0x2c, 0x84, 0x30, 0xf1, 0xdc, 0x4a, + 0x9b, 0x02, 0xdd, 0x69, 0x5e, 0xcd, 0x31, 0x08, + 0x27, 0xd1, 0x83, 0xcd, 0x03, 0x4d, 0xd9, 0xf0, + 0x0a, 0x69, 0x8e, 0x8b, 0x88, 0x14, 0x98, 0x37, + 0x8c, 0xad, 0x93, 0x70, 0x04, 0xf8, 0x88, 0xa7, + 0x67, 0xf0, 0xfe, 0xa9, 0x49, 0x46, 0xbe, 0xab, + 0x14, 0x8c, 0x56, 0xea, 0x17, 0x52, 0x1f, 0x35, + 0xfa, 0xd2, 0xd4, 0xa4, 0xf6, 0xb6, 0x72, 0x25, + 0x03, 0xbf, 0xc1, 0x85, 0xe1, 0x3e, 0x3a, 0x19, + 0xcb, 0xe3, 0x7e, 0x15, 0x65, 0xd1, 0x33, 0x40, + 0x2a, 0xd8, 0x3f, 0x2c, 0x86, 0x12, 0x65, 0xe2, + 0x60, 0x80, 0x1b, 0x01, 0x0b, 0xd2, 0xcd, 0x3b, + 0x24, 0x56, 0x73, 0xcd, 0xa9, 0x34, 0xd1, 0x36, + 0xd3, 0x26, 0x6f, 0x49, 0x58, 0xcf, 0xb7, 0x39, + 0x92, 0xa8, 0x15, 0x47, 0x0f, 0x92, 0x68, 0x49, + 0xa2, 0x91, 0xe0, 0x55, 0xc8, 0xd9, 0xf1, 0x84, + 0xc4, 0x41, 0x67, 0xd9, 0x24, 0xf3, 0x0f, 0xdc, + 0x3d, 0x6d, 0x79, 0x4d, 0x0f, 0x35, 0x8b, 0xdf, + 0x6d, 0xcd, 0x66, 0x7e, 0x82, 0x09, 0xa3, 0x72, + 0x1d, 0x3d, 0x4b, 0x0f, 0xad, 0x7c, 0xbe, 0xdd, + 0x96, 0x17, 0x62, 0x26, 0x72, 0xe6, 0x1d, 0xb9, + 0xf6, 0x9a, 0x71, 0x52, 0x5a, 0x76, 0xbb, 0x4e, + 0x11, 0x78, 0xbe, 0x05, 0xe5, 0xf6, 0xaf, 0xf2, + 0x66, 0xd3, 0xe5, 0xdb, 0xfc, 0xd8, 0x96, 0x64, + 0x8b, 0x7a, 0xec, 0x9f, 0x3e, 0x0d, 0x7c, 0xd5, + 0x20, 0xdf, 0x50, 0x52, 0x57, 0x93, 0xa0, 0x03, + 0x5a, 0xed, 0x5c, 0xb4, 0xfa, 0x15, 0xf0, 0xda, + 0xc4, 0x94, 0xbf, 0xcb, 0x25, 0xc7, 0xda, 0x59, + 0x5d, 0xb8, 0x00, 0x00, 0x00, 0x56, 0x76, 0xe4, + 0x62, 0x1c, 0x71, 0x70, 0xf6, 0x7f, 0x20, 0x83, + 0xee, 0x17, 0x23, 0x56, 0x8c, 0x20, 0x9c, 0x65, + 0x25, 0xe9, 0x38, 0xe2, 0xd2, 0x66, 0xae, 0xa1, + 0x47, 0x16, 0xba, 0x5e, 0x87, 0xd4, 0x8b, 0x7e, + 0x80, 0x9f, 0x83, 0x4b, 0x27, 0x46, 0x97, 0x72, + 0x2b, 0x88, 0xd1, 0xf0, 0x92, 0xd4, 0x2a, 0x7e, 0x48, 0x63, 0x95, 0x33, 0x13, 0x07, 0xf8, 0x79, 0x3a, 0x6b, 0x67, 0x1c, 0x6f, 0x38, 0x80, 0x3c, 0xc6, 0xfa, 0xb8, 0x4e, 0xd2, 0x01, 0xaf, 0x79, @@ -922,52 +920,64 @@ var cases = []struct { 0x30, 0xa2, 0x1f, 0x21, 0x13, 0x1f, 0x97, 0x95, 0xee, 0x69, 0x63, 0xcf, 0x4b, 0xb2, 0xc3, 0xc0, 0x23, 0xc9, 0x75, 0x2b, 0xd6, 0xac, 0x3c, 0xcb, - 0x38, 0x73, 0xa0, 0x5a, 0xa5, 0x7d, 0x3d, 0x23, - 0xb1, 0x4c, 0xc9, 0x1b, 0x12, 0xc4, 0x83, 0xe1, - 0x62, 0x61, 0xf3, 0x8c, 0x6a, 0x45, 0x95, 0xee, - 0x74, 0x00, 0x2f, 0x84, 0x77, 0xff, 0x16, 0x22, - 0x02, 0xfe, 0x4b, 0xd2, 0x57, 0x65, 0xee, 0x49, - 0xcd, 0x7b, 0xb5, 0xdb, 0x8e, 0x5a, 0xcb, 0x70, - 0x7f, 0x78, 0xbc, 0x35, 0x34, 0x3e, 0xcd, 0xf6, - 0x24, 0x78, 0x8f, 0xe8, 0x9e, 0x5c, 0x9c, 0x22, - 0x4a, 0xf0, 0xbc, 0x89, 0x64, 0x93, 0xcf, 0x20, - 0xc8, 0xfd, 0x27, 0xe2, 0x36, 0x86, 0x00, 0x61, - 0xe8, 0xe2, 0x9c, 0xad, 0x55, 0x98, 0x77, 0x2f, - 0xfa, 0x28, 0xb4, 0xa7, 0xda, 0xa4, 0x14, 0x06, - 0x8c, 0x7a, 0xd5, 0xdf, 0x0d, 0x32, 0x56, 0xcc, - 0xd3, 0x70, 0x71, 0x70, 0xd5, 0xb6, 0x41, 0x0f, - 0x45, 0xb2, 0xf0, 0x24, 0xa5, 0x23, 0x13, 0x70, - 0x36, 0x07, 0xcd, 0xc6, 0x75, 0xd8, 0x62, 0x8c, - 0x7f, 0xa7, 0xb9, 0x76, 0x16, 0xb3, 0x9a, 0x7e, - 0x20, 0x27, 0x27, 0x2d, 0x33, 0x60, 0x70, 0xa5, - 0xef, 0x5c, 0x9c, 0x6e, 0x5f, 0x2f, 0x20, 0x78, - 0x58, 0x59, 0x92, 0x15, 0xfe, 0x13, 0x07, 0x87, - 0xc7, 0x3e, 0x21, 0x04, 0x24, 0x33, 0x60, 0x15, - 0x91, 0xfb, 0xfe, 0xe8, 0xf8, 0xb9, 0xa6, 0x9a, - 0xbf, 0x65, 0xf3, 0x37, 0x40, 0xb8, 0x52, 0x69, - 0x3f, 0x65, 0x27, 0x36, 0x01, 0x92, 0xe8, 0xef, - 0x51, 0x3e, 0xcd, 0xf5, 0xcc, 0x4f, 0x8b, 0x4f, - 0x7b, 0x38, 0x3e, 0x43, 0x4d, 0xc0, 0xa4, 0xc6, - 0x84, 0x79, 0x8e, 0xf4, 0x4a, 0xe1, 0xa9, 0x2b, - 0xd5, 0x34, 0x00, 0x30, 0x94, 0x6a, 0x91, 0xa2, - 0xd5, 0xc0, 0xbf, 0xb5, 0x66, 0x59, 0x38, 0xc2, - 0xa4, 0x75, 0x96, 0x5b, 0x7a, 0xac, 0x9c, 0x05, - 0x67, 0x99, 0x2e, 0xba, 0x21, 0x1e, 0xac, 0x50, - 0x01, 0x68, 0x71, 0xac, 0x68, 0x6d, 0xc1, 0xf2, - 0x2c, 0x51, 0x1e, 0xb6, 0x64, 0x97, 0x3d, 0x9b, - 0x2b, 0x89, 0x66, 0xbd, 0x50, 0x4f, 0x5c, 0xec, - 0x7c, 0xc8, 0x51, 0x61, 0x74, 0xbd, 0x86, 0xb4, - 0x6e, 0x71, 0x59, 0x24, 0x59, 0xaf, 0x66, 0x54, - 0x82, 0xdb, 0xe2, 0x11, 0x6f, 0x87, 0x92, 0xf3, - 0x63, 0xd4, 0x4b, 0xd6, 0x26, 0x42, 0xf1, 0x2a, - 0x66, 0x63, 0x79, 0x5e, 0x7e, 0xfb, 0x3f, 0x85, - 0xa7, 0x24, 0xac, 0x53, 0xe2, 0x57, 0x56, 0xdd, - 0xef, 0x7a, 0xdf, 0xb6, 0x27, 0xaf, 0x25, 0x6a, - 0x89, 0x4a, 0x4c, 0xc3, 0xe6, 0x2e, 0xbe, 0x2b, - 0x38, 0x07, 0xe0, 0x96, 0x98, 0xaf, 0x85, 0xf4, - 0x86, 0x7d, 0xf4, 0xee, 0xe5, 0x78, 0x0a, 0x0e, - 0x00, 0x00, 0x00, 0x4a, 0xab, 0xbf, 0xc3, 0x77, - 0x6b, 0xe4, 0x40, 0x40, 0x40, 0x41, + }, + }, + { + Header: rtp.Header{ + Version: 2, + Marker: true, + PayloadType: 96, + SequenceNumber: 17648, + SSRC: 0x9dbb7812, + }, + Payload: []byte{ + 0xa0, 0xde, 0x02, 0x38, 0x73, 0xa0, 0x5a, 0xa5, + 0x7d, 0x3d, 0x23, 0xb1, 0x4c, 0xc9, 0x1b, 0x12, + 0xc4, 0x83, 0xe1, 0x62, 0x61, 0xf3, 0x8c, 0x6a, + 0x45, 0x95, 0xee, 0x74, 0x00, 0x2f, 0x84, 0x77, + 0xff, 0x16, 0x22, 0x02, 0xfe, 0x4b, 0xd2, 0x57, + 0x65, 0xee, 0x49, 0xcd, 0x7b, 0xb5, 0xdb, 0x8e, + 0x5a, 0xcb, 0x70, 0x7f, 0x78, 0xbc, 0x35, 0x34, + 0x3e, 0xcd, 0xf6, 0x24, 0x78, 0x8f, 0xe8, 0x9e, + 0x5c, 0x9c, 0x22, 0x4a, 0xf0, 0xbc, 0x89, 0x64, + 0x93, 0xcf, 0x20, 0xc8, 0xfd, 0x27, 0xe2, 0x36, + 0x86, 0x00, 0x61, 0xe8, 0xe2, 0x9c, 0xad, 0x55, + 0x98, 0x77, 0x2f, 0xfa, 0x28, 0xb4, 0xa7, 0xda, + 0xa4, 0x14, 0x06, 0x8c, 0x7a, 0xd5, 0xdf, 0x0d, + 0x32, 0x56, 0xcc, 0xd3, 0x70, 0x71, 0x70, 0xd5, + 0xb6, 0x41, 0x0f, 0x45, 0xb2, 0xf0, 0x24, 0xa5, + 0x23, 0x13, 0x70, 0x36, 0x07, 0xcd, 0xc6, 0x75, + 0xd8, 0x62, 0x8c, 0x7f, 0xa7, 0xb9, 0x76, 0x16, + 0xb3, 0x9a, 0x7e, 0x20, 0x27, 0x27, 0x2d, 0x33, + 0x60, 0x70, 0xa5, 0xef, 0x5c, 0x9c, 0x6e, 0x5f, + 0x2f, 0x20, 0x78, 0x58, 0x59, 0x92, 0x15, 0xfe, + 0x13, 0x07, 0x87, 0xc7, 0x3e, 0x21, 0x04, 0x24, + 0x33, 0x60, 0x15, 0x91, 0xfb, 0xfe, 0xe8, 0xf8, + 0xb9, 0xa6, 0x9a, 0xbf, 0x65, 0xf3, 0x37, 0x40, + 0xb8, 0x52, 0x69, 0x3f, 0x65, 0x27, 0x36, 0x01, + 0x92, 0xe8, 0xef, 0x51, 0x3e, 0xcd, 0xf5, 0xcc, + 0x4f, 0x8b, 0x4f, 0x7b, 0x38, 0x3e, 0x43, 0x4d, + 0xc0, 0xa4, 0xc6, 0x84, 0x79, 0x8e, 0xf4, 0x4a, + 0xe1, 0xa9, 0x2b, 0xd5, 0x34, 0x00, 0x30, 0x94, + 0x6a, 0x91, 0xa2, 0xd5, 0xc0, 0xbf, 0xb5, 0x66, + 0x59, 0x38, 0xc2, 0xa4, 0x75, 0x96, 0x5b, 0x7a, + 0xac, 0x9c, 0x05, 0x67, 0x99, 0x2e, 0xba, 0x21, + 0x1e, 0xac, 0x50, 0x01, 0x68, 0x71, 0xac, 0x68, + 0x6d, 0xc1, 0xf2, 0x2c, 0x51, 0x1e, 0xb6, 0x64, + 0x97, 0x3d, 0x9b, 0x2b, 0x89, 0x66, 0xbd, 0x50, + 0x4f, 0x5c, 0xec, 0x7c, 0xc8, 0x51, 0x61, 0x74, + 0xbd, 0x86, 0xb4, 0x6e, 0x71, 0x59, 0x24, 0x59, + 0xaf, 0x66, 0x54, 0x82, 0xdb, 0xe2, 0x11, 0x6f, + 0x87, 0x92, 0xf3, 0x63, 0xd4, 0x4b, 0xd6, 0x26, + 0x42, 0xf1, 0x2a, 0x66, 0x63, 0x79, 0x5e, 0x7e, + 0xfb, 0x3f, 0x85, 0xa7, 0x24, 0xac, 0x53, 0xe2, + 0x57, 0x56, 0xdd, 0xef, 0x7a, 0xdf, 0xb6, 0x27, + 0xaf, 0x25, 0x6a, 0x89, 0x4a, 0x4c, 0xc3, 0xe6, + 0x2e, 0xbe, 0x2b, 0x38, 0x07, 0xe0, 0x96, 0x98, + 0xaf, 0x85, 0xf4, 0x86, 0x7d, 0xf4, 0xee, 0xe5, + 0x78, 0x0a, 0x0e, 0x00, 0x00, 0x00, 0x4a, 0xab, + 0xbf, 0xc3, 0x77, 0x6b, 0xe4, 0x40, 0x40, 0x40, + 0x41, }, }, }, @@ -981,6 +991,7 @@ func TestEncode(t *testing.T) { PayloadType: 96, SSRC: uint32Ptr(0x9dbb7812), InitialSequenceNumber: uint16Ptr(0x44ed), + PayloadMaxSize: 1000, } err := e.Init() require.NoError(t, err) diff --git a/pkg/format/rtph264/encoder.go b/pkg/format/rtph264/encoder.go index 55938ea2..72714935 100644 --- a/pkg/format/rtph264/encoder.go +++ b/pkg/format/rtph264/encoder.go @@ -11,7 +11,7 @@ import ( const ( rtpVersion = 2 - defaultPayloadMaxSize = 1460 // 1500 (UDP MTU) - 20 (IP header) - 8 (UDP header) - 12 (RTP header) + defaultPayloadMaxSize = 1450 // 1500 (UDP MTU) - 20 (IP header) - 8 (UDP header) - 12 (RTP header) - 10 (SRTP overhead) ) func randUint32() (uint32, error) { @@ -62,7 +62,7 @@ type Encoder struct { InitialSequenceNumber *uint16 // maximum size of packet payloads (optional). - // It defaults to 1460. + // It defaults to 1450. PayloadMaxSize int PacketizationMode int diff --git a/pkg/format/rtph264/encoder_test.go b/pkg/format/rtph264/encoder_test.go index 9f63f80a..3131f440 100644 --- a/pkg/format/rtph264/encoder_test.go +++ b/pkg/format/rtph264/encoder_test.go @@ -42,7 +42,7 @@ var cases = []struct { [][]byte{ mergeBytes( []byte{0x05}, - bytes.Repeat([]byte{0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07}, 8), + bytes.Repeat([]byte{0, 1, 2, 3, 4, 5, 6, 7}, 8), ), }, []*rtp.Packet{ @@ -56,7 +56,7 @@ var cases = []struct { }, Payload: mergeBytes( []byte{0x05}, - bytes.Repeat([]byte{0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07}, 8), + bytes.Repeat([]byte{0, 1, 2, 3, 4, 5, 6, 7}, 8), ), }, }, @@ -66,7 +66,7 @@ var cases = []struct { [][]byte{ mergeBytes( []byte{0x05}, - bytes.Repeat([]byte{0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07}, 512), + bytes.Repeat([]byte{0, 1, 2, 3, 4, 5, 6, 7}, 187), ), }, []*rtp.Packet{ @@ -80,23 +80,8 @@ var cases = []struct { }, Payload: mergeBytes( []byte{0x1c, 0x85}, - bytes.Repeat([]byte{0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07}, 182), - []byte{0x00, 0x01}, - ), - }, - { - Header: rtp.Header{ - Version: 2, - Marker: false, - PayloadType: 96, - SequenceNumber: 17646, - SSRC: 0x9dbb7812, - }, - Payload: mergeBytes( - []byte{0x1c, 0x05}, - []byte{0x02, 0x03, 0x04, 0x05, 0x06, 0x07}, - bytes.Repeat([]byte{0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07}, 181), - []byte{0x00, 0x01, 0x02, 0x03}, + bytes.Repeat([]byte{0, 1, 2, 3, 4, 5, 6, 7}, 124), + []byte{0, 1, 2, 3, 4, 5}, ), }, { @@ -104,20 +89,20 @@ var cases = []struct { Version: 2, Marker: true, PayloadType: 96, - SequenceNumber: 17647, + SequenceNumber: 17646, SSRC: 0x9dbb7812, }, Payload: mergeBytes( []byte{0x1c, 0x45}, - []byte{0x04, 0x05, 0x06, 0x07}, - bytes.Repeat([]byte{0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07}, 147), + []byte{6, 7}, + bytes.Repeat([]byte{0, 1, 2, 3, 4, 5, 6, 7}, 62), ), }, }, }, { "fragmented to the limit", - [][]byte{bytes.Repeat([]byte{1}, 2917)}, + [][]byte{bytes.Repeat([]byte{1}, 1997)}, []*rtp.Packet{ { Header: rtp.Header{ @@ -129,7 +114,7 @@ var cases = []struct { }, Payload: mergeBytes( []byte{0x1c, 0x81}, - bytes.Repeat([]byte{1}, 1458), + bytes.Repeat([]byte{1}, 998), ), }, { @@ -142,7 +127,7 @@ var cases = []struct { }, Payload: mergeBytes( []byte{0x1c, 0x41}, - bytes.Repeat([]byte{1}, 1458), + bytes.Repeat([]byte{1}, 998), ), }, }, @@ -204,7 +189,7 @@ var cases = []struct { }, mergeBytes( []byte{0x08}, - bytes.Repeat([]byte{0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07}, 175), + bytes.Repeat([]byte{0, 1, 2, 3, 4, 5, 6, 7}, 120), ), }, []*rtp.Packet{ @@ -239,7 +224,7 @@ var cases = []struct { }, Payload: mergeBytes( []byte{0x08}, - bytes.Repeat([]byte{0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07}, 175), + bytes.Repeat([]byte{0, 1, 2, 3, 4, 5, 6, 7}, 120), ), }, }, @@ -249,7 +234,7 @@ var cases = []struct { [][]byte{ mergeBytes( []byte{0x05}, - bytes.Repeat([]byte{0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07}, 256), + bytes.Repeat([]byte{0, 1, 2, 3, 4, 5, 6, 7}, 187), ), {0x09, 0xF0}, {0x09, 0xF0}, @@ -265,8 +250,8 @@ var cases = []struct { }, Payload: mergeBytes( []byte{0x1c, 0x85}, - bytes.Repeat([]byte{0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07}, 182), - []byte{0x00, 0x01}, + bytes.Repeat([]byte{0, 1, 2, 3, 4, 5, 6, 7}, 124), + []byte{0, 1, 2, 3, 4, 5}, ), }, { @@ -279,8 +264,8 @@ var cases = []struct { }, Payload: mergeBytes( []byte{0x1c, 0x45}, - []byte{0x02, 0x03, 0x04, 0x05, 0x06, 0x07}, - bytes.Repeat([]byte{0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07}, 73), + []byte{6, 7}, + bytes.Repeat([]byte{0, 1, 2, 3, 4, 5, 6, 7}, 62), ), }, { @@ -307,6 +292,7 @@ func TestEncode(t *testing.T) { PayloadType: 96, SSRC: uint32Ptr(0x9dbb7812), InitialSequenceNumber: uint16Ptr(0x44ed), + PayloadMaxSize: 1000, } err := e.Init() require.NoError(t, err) diff --git a/pkg/format/rtph265/encoder.go b/pkg/format/rtph265/encoder.go index 8984e805..a3e288ca 100644 --- a/pkg/format/rtph265/encoder.go +++ b/pkg/format/rtph265/encoder.go @@ -9,7 +9,7 @@ import ( const ( rtpVersion = 2 - defaultPayloadMaxSize = 1460 // 1500 (UDP MTU) - 20 (IP header) - 8 (UDP header) - 12 (RTP header) + defaultPayloadMaxSize = 1450 // 1500 (UDP MTU) - 20 (IP header) - 8 (UDP header) - 12 (RTP header) - 10 (SRTP overhead) ) func randUint32() (uint32, error) { @@ -44,7 +44,7 @@ type Encoder struct { InitialSequenceNumber *uint16 // maximum size of packet payloads (optional). - // It defaults to 1460. + // It defaults to 1450. PayloadMaxSize int // indicates that NALUs have an additional field that specifies the decoding order. diff --git a/pkg/format/rtph265/encoder_test.go b/pkg/format/rtph265/encoder_test.go index 8a3d7e30..0bc11756 100644 --- a/pkg/format/rtph265/encoder_test.go +++ b/pkg/format/rtph265/encoder_test.go @@ -79,7 +79,7 @@ var cases = []struct { { "fragmented", [][]byte{ - bytes.Repeat([]byte{0x01, 0x02, 0x03, 0x04}, 1024), + bytes.Repeat([]byte{0x01, 0x02, 0x03, 0x04}, 375), }, []*rtp.Packet{ { @@ -92,41 +92,28 @@ var cases = []struct { }, Payload: mergeBytes( []byte{0x63, 0x02, 0x80, 0x03, 0x04}, - bytes.Repeat([]byte{0x01, 0x02, 0x03, 0x04}, 363), + bytes.Repeat([]byte{0x01, 0x02, 0x03, 0x04}, 248), []byte{0x01, 0x02, 0x03}, ), }, - { - Header: rtp.Header{ - Version: 2, - Marker: false, - PayloadType: 96, - SequenceNumber: 17646, - SSRC: 0x9dbb7812, - }, - Payload: mergeBytes( - []byte{0x63, 0x02, 0x00, 0x04}, - bytes.Repeat([]byte{0x01, 0x02, 0x03, 0x04}, 364), - ), - }, { Header: rtp.Header{ Version: 2, Marker: true, PayloadType: 96, - SequenceNumber: 17647, + SequenceNumber: 17646, SSRC: 0x9dbb7812, }, Payload: mergeBytes( - []byte{0x63, 0x02, 0x40}, - bytes.Repeat([]byte{0x01, 0x02, 0x03, 0x04}, 295), + []byte{0x63, 0x02, 0x40, 0x04}, + bytes.Repeat([]byte{0x01, 0x02, 0x03, 0x04}, 125), ), }, }, }, { "fragmented to the limit", - [][]byte{bytes.Repeat([]byte{1}, 2916)}, + [][]byte{bytes.Repeat([]byte{1}, 1996)}, []*rtp.Packet{ { Header: rtp.Header{ @@ -138,7 +125,7 @@ var cases = []struct { }, Payload: mergeBytes( []byte{0x63, 0x01, 0x80}, - bytes.Repeat([]byte{1}, 1457), + bytes.Repeat([]byte{1}, 997), ), }, { @@ -151,7 +138,7 @@ var cases = []struct { }, Payload: mergeBytes( []byte{0x63, 0x01, 0x40}, - bytes.Repeat([]byte{1}, 1457), + bytes.Repeat([]byte{1}, 997), ), }, }, @@ -165,6 +152,7 @@ func TestEncode(t *testing.T) { PayloadType: 96, SSRC: uint32Ptr(0x9dbb7812), InitialSequenceNumber: uint16Ptr(0x44ed), + PayloadMaxSize: 1000, } err := e.Init() require.NoError(t, err) diff --git a/pkg/format/rtplpcm/encoder.go b/pkg/format/rtplpcm/encoder.go index 099fa57d..00b40ad3 100644 --- a/pkg/format/rtplpcm/encoder.go +++ b/pkg/format/rtplpcm/encoder.go @@ -9,7 +9,7 @@ import ( const ( rtpVersion = 2 - defaultPayloadMaxSize = 1460 // 1500 (UDP MTU) - 20 (IP header) - 8 (UDP header) - 12 (RTP header) + defaultPayloadMaxSize = 1450 // 1500 (UDP MTU) - 20 (IP header) - 8 (UDP header) - 12 (RTP header) - 10 (SRTP overhead) ) func randUint32() (uint32, error) { @@ -42,7 +42,7 @@ type Encoder struct { InitialSequenceNumber *uint16 // maximum size of packet payloads (optional). - // It defaults to 1460. + // It defaults to 1450. PayloadMaxSize int sequenceNumber uint16 diff --git a/pkg/format/rtplpcm/encoder_test.go b/pkg/format/rtplpcm/encoder_test.go index 3711c37f..1dfcd313 100644 --- a/pkg/format/rtplpcm/encoder_test.go +++ b/pkg/format/rtplpcm/encoder_test.go @@ -39,7 +39,7 @@ var cases = []struct { }, { "splitted", - bytes.Repeat([]byte{0x41, 0x42, 0x43}, 680), + bytes.Repeat([]byte{0x41, 0x42, 0x43}, 400), []*rtp.Packet{ { Header: rtp.Header{ @@ -49,7 +49,7 @@ var cases = []struct { SequenceNumber: 17645, SSRC: 0x9dbb7812, }, - Payload: bytes.Repeat([]byte{0x41, 0x42, 0x43}, 486), + Payload: bytes.Repeat([]byte{0x41, 0x42, 0x43}, 332), }, { Header: rtp.Header{ @@ -57,10 +57,10 @@ var cases = []struct { Marker: false, PayloadType: 96, SequenceNumber: 17646, - Timestamp: 243, + Timestamp: 166, SSRC: 0x9dbb7812, }, - Payload: bytes.Repeat([]byte{0x41, 0x42, 0x43}, 194), + Payload: bytes.Repeat([]byte{0x41, 0x42, 0x43}, 68), }, }, }, @@ -75,6 +75,7 @@ func TestEncode(t *testing.T) { InitialSequenceNumber: uint16Ptr(0x44ed), BitDepth: 24, ChannelCount: 2, + PayloadMaxSize: 1000, } err := e.Init() require.NoError(t, err) diff --git a/pkg/format/rtpmjpeg/encoder.go b/pkg/format/rtpmjpeg/encoder.go index a6787471..5bf1d34c 100644 --- a/pkg/format/rtpmjpeg/encoder.go +++ b/pkg/format/rtpmjpeg/encoder.go @@ -12,7 +12,7 @@ import ( const ( rtpVersion = 2 - defaultPayloadMaxSize = 1460 // 1500 (UDP MTU) - 20 (IP header) - 8 (UDP header) - 12 (RTP header) + defaultPayloadMaxSize = 1450 // 1500 (UDP MTU) - 20 (IP header) - 8 (UDP header) - 12 (RTP header) - 10 (SRTP overhead) ) func randUint32() (uint32, error) { @@ -36,7 +36,7 @@ type Encoder struct { InitialSequenceNumber *uint16 // maximum size of packet payloads (optional). - // It defaults to 1460. + // It defaults to 1450. PayloadMaxSize int sequenceNumber uint16 diff --git a/pkg/format/rtpmjpeg/encoder_test.go b/pkg/format/rtpmjpeg/encoder_test.go index 00a1a935..45e81802 100644 --- a/pkg/format/rtpmjpeg/encoder_test.go +++ b/pkg/format/rtpmjpeg/encoder_test.go @@ -417,6 +417,18 @@ var cases = []struct { 0x94, 0x52, 0xd1, 0x40, 0x09, 0x45, 0x2d, 0x14, 0x00, 0x94, 0x52, 0xd1, 0x40, 0x05, 0x14, 0xb4, 0x94, 0x0c, 0x28, 0xa2, 0x8a, 0x04, 0x14, 0x51, + }, + }, + { + Header: rtp.Header{ + Version: 2, + Marker: true, + PayloadType: 26, + SequenceNumber: 17646, + SSRC: 0x9dbb7812, + }, + Payload: []byte{ + 0x00, 0x00, 0x03, 0x5c, 0x01, 0xff, 0xf0, 0x87, 0x45, 0x00, 0x14, 0x51, 0x45, 0x00, 0x14, 0x51, 0x45, 0x00, 0x14, 0x51, 0x45, 0x00, 0x14, 0x52, 0xd1, 0x40, 0xc4, 0xa2, 0x96, 0x8a, 0x04, 0x25, @@ -474,37 +486,25 @@ var cases = []struct { 0x49, 0xf2, 0x7f, 0xe5, 0xb5, 0x62, 0x5a, 0x5f, 0xcb, 0x6b, 0xfe, 0xa3, 0xfe, 0x5a, 0xd1, 0xe5, 0x45, 0xff, 0x00, 0x2c, 0x29, 0x0f, 0xd9, 0x97, - 0xff, 0x00, 0xb6, 0x65, - }, - }, - { - Header: rtp.Header{ - Version: 2, - Marker: true, - PayloadType: 26, - SequenceNumber: 17646, - SSRC: 0x9dbb7812, - }, - Payload: []byte{ - 0x00, 0x00, 0x05, 0x28, 0x01, 0xff, 0xf0, 0x87, - 0xba, 0x82, 0x5f, 0xb7, 0x4d, 0xe6, 0xcd, 0xff, - 0x00, 0x2c, 0xe2, 0xae, 0xa7, 0x49, 0xd5, 0x3f, - 0xe2, 0x9a, 0xf3, 0xa7, 0xff, 0x00, 0x5d, 0x15, - 0x70, 0xb4, 0x43, 0xfb, 0xdf, 0xf5, 0xf3, 0x4b, - 0xff, 0x00, 0x5c, 0xe8, 0xf6, 0x83, 0xf6, 0x67, - 0xa1, 0x68, 0x7a, 0xcc, 0x5a, 0xcf, 0xfd, 0x32, - 0x9b, 0xfe, 0x79, 0xd5, 0xeb, 0xbb, 0xab, 0x4b, - 0x08, 0x3f, 0xd3, 0xab, 0xcd, 0x66, 0xba, 0xfb, - 0x57, 0xfd, 0x32, 0x9a, 0x2a, 0x96, 0xd2, 0xff, - 0x00, 0xcd, 0xbf, 0xf3, 0xb5, 0x49, 0xbc, 0xdf, - 0x2b, 0xfe, 0x59, 0xd3, 0x27, 0xd9, 0x9a, 0x30, - 0xdd, 0x7d, 0xab, 0x5e, 0xfb, 0x1d, 0x8c, 0xde, - 0x55, 0x9c, 0xb2, 0x79, 0x95, 0xd3, 0x6a, 0x3a, - 0xa7, 0xd9, 0x75, 0xdb, 0x5b, 0x39, 0xff, 0x00, - 0xd4, 0xcb, 0xff, 0x00, 0x2d, 0x2b, 0xcf, 0xbe, - 0xdf, 0xe5, 0x6a, 0xdf, 0x6c, 0x83, 0xfe, 0x59, - 0x54, 0xda, 0xb6, 0xb3, 0x2e, 0xb3, 0x7f, 0xe7, - 0x7f, 0xaa, 0xff, 0xff, 0xd9, + 0xff, 0x00, 0xb6, 0x65, 0xba, 0x82, 0x5f, 0xb7, + 0x4d, 0xe6, 0xcd, 0xff, 0x00, 0x2c, 0xe2, 0xae, + 0xa7, 0x49, 0xd5, 0x3f, 0xe2, 0x9a, 0xf3, 0xa7, + 0xff, 0x00, 0x5d, 0x15, 0x70, 0xb4, 0x43, 0xfb, + 0xdf, 0xf5, 0xf3, 0x4b, 0xff, 0x00, 0x5c, 0xe8, + 0xf6, 0x83, 0xf6, 0x67, 0xa1, 0x68, 0x7a, 0xcc, + 0x5a, 0xcf, 0xfd, 0x32, 0x9b, 0xfe, 0x79, 0xd5, + 0xeb, 0xbb, 0xab, 0x4b, 0x08, 0x3f, 0xd3, 0xab, + 0xcd, 0x66, 0xba, 0xfb, 0x57, 0xfd, 0x32, 0x9a, + 0x2a, 0x96, 0xd2, 0xff, 0x00, 0xcd, 0xbf, 0xf3, + 0xb5, 0x49, 0xbc, 0xdf, 0x2b, 0xfe, 0x59, 0xd3, + 0x27, 0xd9, 0x9a, 0x30, 0xdd, 0x7d, 0xab, 0x5e, + 0xfb, 0x1d, 0x8c, 0xde, 0x55, 0x9c, 0xb2, 0x79, + 0x95, 0xd3, 0x6a, 0x3a, 0xa7, 0xd9, 0x75, 0xdb, + 0x5b, 0x39, 0xff, 0x00, 0xd4, 0xcb, 0xff, 0x00, + 0x2d, 0x2b, 0xcf, 0xbe, 0xdf, 0xe5, 0x6a, 0xdf, + 0x6c, 0x83, 0xfe, 0x59, 0x54, 0xda, 0xb6, 0xb3, + 0x2e, 0xb3, 0x7f, 0xe7, 0x7f, 0xaa, 0xff, 0xff, + 0xd9, }, }, }, @@ -517,6 +517,7 @@ func TestEncode(t *testing.T) { e := &Encoder{ SSRC: uint32Ptr(0x9dbb7812), InitialSequenceNumber: uint16Ptr(0x44ed), + PayloadMaxSize: 1000, } err := e.Init() require.NoError(t, err) @@ -527,3 +528,11 @@ func TestEncode(t *testing.T) { }) } } + +func TestEncodeRandomInitialState(t *testing.T) { + e := &Encoder{} + err := e.Init() + require.NoError(t, err) + require.NotEqual(t, nil, e.SSRC) + require.NotEqual(t, nil, e.InitialSequenceNumber) +} diff --git a/pkg/format/rtpmpeg1audio/encoder.go b/pkg/format/rtpmpeg1audio/encoder.go index 4aa12172..edf9e8a2 100644 --- a/pkg/format/rtpmpeg1audio/encoder.go +++ b/pkg/format/rtpmpeg1audio/encoder.go @@ -9,7 +9,7 @@ import ( const ( rtpVersion = 2 - defaultPayloadMaxSize = 1460 // 1500 (UDP MTU) - 20 (IP header) - 8 (UDP header) - 12 (RTP header) + defaultPayloadMaxSize = 1450 // 1500 (UDP MTU) - 20 (IP header) - 8 (UDP header) - 12 (RTP header) - 10 (SRTP overhead) ) func randUint32() (uint32, error) { @@ -49,7 +49,7 @@ type Encoder struct { InitialSequenceNumber *uint16 // maximum size of packet payloads (optional). - // It defaults to 1460. + // It defaults to 1450. PayloadMaxSize int sequenceNumber uint16 diff --git a/pkg/format/rtpmpeg1video/encoder.go b/pkg/format/rtpmpeg1video/encoder.go index d0e838be..b6e1a98b 100644 --- a/pkg/format/rtpmpeg1video/encoder.go +++ b/pkg/format/rtpmpeg1video/encoder.go @@ -9,7 +9,7 @@ import ( const ( rtpVersion = 2 - defaultPayloadMaxSize = 1460 // 1500 (UDP MTU) - 20 (IP header) - 8 (UDP header) - 12 (RTP header) + defaultPayloadMaxSize = 1450 // 1500 (UDP MTU) - 20 (IP header) - 8 (UDP header) - 12 (RTP header) - 10 (SRTP overhead) ) func randUint32() (uint32, error) { @@ -49,7 +49,7 @@ type Encoder struct { InitialSequenceNumber *uint16 // maximum size of packet payloads (optional). - // It defaults to 1460. + // It defaults to 1450. PayloadMaxSize int sequenceNumber uint16 diff --git a/pkg/format/rtpmpeg1video/encoder_test.go b/pkg/format/rtpmpeg1video/encoder_test.go index cb486ac9..ac9aedea 100644 --- a/pkg/format/rtpmpeg1video/encoder_test.go +++ b/pkg/format/rtpmpeg1video/encoder_test.go @@ -83,7 +83,7 @@ var cases = []struct { "fragmented", mergeBytes( []byte{0, 0, 1}, - bytes.Repeat([]byte{1}, 2000), + bytes.Repeat([]byte{2}, 1500), ), []*rtp.Packet{ { @@ -97,7 +97,7 @@ var cases = []struct { Payload: mergeBytes( []byte{0, 0, 0x10, 0}, []byte{0, 0, 1}, - bytes.Repeat([]byte{1}, 1453), + bytes.Repeat([]byte{2}, 993), ), }, { @@ -110,7 +110,7 @@ var cases = []struct { }, Payload: mergeBytes( []byte{0, 0, 0x08, 0}, - bytes.Repeat([]byte{1}, 547), + bytes.Repeat([]byte{2}, 507), ), }, }, @@ -119,7 +119,7 @@ var cases = []struct { "fragmented to the limit", mergeBytes( []byte{0, 0, 1}, - bytes.Repeat([]byte{1}, 2909), + bytes.Repeat([]byte{2}, 1989), ), []*rtp.Packet{ { @@ -133,7 +133,7 @@ var cases = []struct { Payload: mergeBytes( []byte{0, 0, 0x10, 0}, []byte{0, 0, 1}, - bytes.Repeat([]byte{1}, 1453), + bytes.Repeat([]byte{2}, 993), ), }, { @@ -146,7 +146,7 @@ var cases = []struct { }, Payload: mergeBytes( []byte{0, 0, 0x08, 0}, - bytes.Repeat([]byte{1}, 1456), + bytes.Repeat([]byte{2}, 996), ), }, }, @@ -159,6 +159,7 @@ func TestEncode(t *testing.T) { e := &Encoder{ SSRC: uint32Ptr(0x9dbb7812), InitialSequenceNumber: uint16Ptr(0x44ed), + PayloadMaxSize: 1000, } err := e.Init() require.NoError(t, err) diff --git a/pkg/format/rtpmpeg4audio/encoder.go b/pkg/format/rtpmpeg4audio/encoder.go index 9558033a..9571ad1f 100644 --- a/pkg/format/rtpmpeg4audio/encoder.go +++ b/pkg/format/rtpmpeg4audio/encoder.go @@ -8,7 +8,7 @@ import ( const ( rtpVersion = 2 - defaultPayloadMaxSize = 1460 // 1500 (UDP MTU) - 20 (IP header) - 8 (UDP header) - 12 (RTP header) + defaultPayloadMaxSize = 1450 // 1500 (UDP MTU) - 20 (IP header) - 8 (UDP header) - 12 (RTP header) - 10 (SRTP overhead) ) func randUint32() (uint32, error) { @@ -48,7 +48,7 @@ type Encoder struct { InitialSequenceNumber *uint16 // maximum size of packet payloads (optional). - // It defaults to 1460. + // It defaults to 1450. PayloadMaxSize int sequenceNumber uint16 diff --git a/pkg/format/rtpmpeg4audio/encoder_generic_test.go b/pkg/format/rtpmpeg4audio/encoder_generic_test.go index c7a1af00..0b1c35c3 100644 --- a/pkg/format/rtpmpeg4audio/encoder_generic_test.go +++ b/pkg/format/rtpmpeg4audio/encoder_generic_test.go @@ -185,7 +185,7 @@ var casesGeneric = []struct { 3, 3, [][]byte{ - bytes.Repeat([]byte{0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07}, 512), + bytes.Repeat([]byte{0, 1, 2, 3, 4, 5, 6, 7}, 187), }, []*rtp.Packet{ //nolint:dupl { @@ -197,21 +197,9 @@ var casesGeneric = []struct { SSRC: 0x9dbb7812, }, Payload: mergeBytes( - []byte{0x0, 0x10, 0x2d, 0x80}, - bytes.Repeat([]byte{0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07}, 182), - ), - }, - { - Header: rtp.Header{ - Version: 2, - Marker: false, - PayloadType: 96, - SequenceNumber: 17646, - SSRC: 0x9dbb7812, - }, - Payload: mergeBytes( - []byte{0x00, 0x10, 0x2d, 0x80}, - bytes.Repeat([]byte{0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07}, 182), + []byte{0x0, 0x10, 0x1f, 0x20}, + bytes.Repeat([]byte{0, 1, 2, 3, 4, 5, 6, 7}, 124), + []byte{0, 1, 2, 3}, ), }, { @@ -219,12 +207,13 @@ var casesGeneric = []struct { Version: 2, Marker: true, PayloadType: 96, - SequenceNumber: 17647, + SequenceNumber: 17646, SSRC: 0x9dbb7812, }, Payload: mergeBytes( - []byte{0x00, 0x10, 0x25, 0x00}, - bytes.Repeat([]byte{0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07}, 148), + []byte{0x00, 0x10, 0x0f, 0xa0}, + []byte{4, 5, 6, 7}, + bytes.Repeat([]byte{0, 1, 2, 3, 4, 5, 6, 7}, 62), ), }, }, @@ -234,7 +223,7 @@ var casesGeneric = []struct { 13, 3, 3, - [][]byte{bytes.Repeat([]byte{1}, 2912)}, + [][]byte{bytes.Repeat([]byte{1}, 1992)}, []*rtp.Packet{ { Header: rtp.Header{ @@ -245,8 +234,8 @@ var casesGeneric = []struct { SSRC: 0x9dbb7812, }, Payload: mergeBytes( - []byte{0x0, 0x10, 0x2d, 0x80}, - bytes.Repeat([]byte{1}, 1456), + []byte{0x0, 0x10, 0x1f, 0x20}, + bytes.Repeat([]byte{1}, 996), ), }, { @@ -258,8 +247,8 @@ var casesGeneric = []struct { SSRC: 0x9dbb7812, }, Payload: mergeBytes( - []byte{0x0, 0x10, 0x2d, 0x80}, - bytes.Repeat([]byte{1}, 1456), + []byte{0x0, 0x10, 0x1f, 0x20}, + bytes.Repeat([]byte{1}, 996), ), }, }, @@ -273,7 +262,7 @@ var casesGeneric = []struct { {0x00, 0x01, 0x02, 0x03}, {0x04, 0x05, 0x06, 0x07}, {0x08, 0x09, 0x0A, 0x0B}, - bytes.Repeat([]byte{0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07}, 256), + bytes.Repeat([]byte{0, 1, 2, 3, 4, 5, 6, 7}, 187), }, []*rtp.Packet{ { @@ -300,8 +289,9 @@ var casesGeneric = []struct { SSRC: 0x9dbb7812, }, Payload: mergeBytes( - []byte{0x0, 0x10, 0x2d, 0x80}, - bytes.Repeat([]byte{0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07}, 182), + []byte{0x0, 0x10, 0x1f, 0x20}, + bytes.Repeat([]byte{0, 1, 2, 3, 4, 5, 6, 7}, 124), + []byte{0, 1, 2, 3}, ), }, { @@ -314,8 +304,9 @@ var casesGeneric = []struct { SSRC: 0x9dbb7812, }, Payload: mergeBytes( - []byte{0x00, 0x10, 0x12, 0x80}, - bytes.Repeat([]byte{0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07}, 74), + []byte{0x00, 0x10, 0x0f, 0xa0}, + []byte{4, 5, 6, 7}, + bytes.Repeat([]byte{0, 1, 2, 3, 4, 5, 6, 7}, 62), ), }, }, @@ -400,7 +391,7 @@ var casesGeneric = []struct { 3, 3, [][]byte{ - bytes.Repeat([]byte{0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07}, 512), + bytes.Repeat([]byte{0, 1, 2, 3, 4, 5, 6, 7}, 187), }, []*rtp.Packet{ { @@ -412,23 +403,9 @@ var casesGeneric = []struct { SSRC: 0x9dbb7812, }, Payload: mergeBytes( - []byte{0x0, 0x18, 0x00, 0x2d, 0x78}, - bytes.Repeat([]byte{0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07}, 181), - []byte{0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06}, - ), - }, - { - Header: rtp.Header{ - Version: 2, - Marker: false, - PayloadType: 96, - SequenceNumber: 17646, - SSRC: 0x9dbb7812, - }, - Payload: mergeBytes( - []byte{0x00, 0x18, 0x00, 0x2d, 0x78, 0x07}, - bytes.Repeat([]byte{0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07}, 181), - []byte{0x00, 0x01, 0x02, 0x03, 0x04, 0x05}, + []byte{0x0, 0x18, 0x00, 0x1f, 0x18}, + bytes.Repeat([]byte{0, 1, 2, 3, 4, 5, 6, 7}, 124), + []byte{0, 1, 2}, ), }, { @@ -436,12 +413,13 @@ var casesGeneric = []struct { Version: 2, Marker: true, PayloadType: 96, - SequenceNumber: 17647, + SequenceNumber: 17646, SSRC: 0x9dbb7812, }, Payload: mergeBytes( - []byte{0x00, 0x18, 0x00, 0x25, 0x10, 0x06, 0x07}, - bytes.Repeat([]byte{0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07}, 148), + []byte{0x00, 0x18, 0x00, 0x0f, 0xa8}, + []byte{3, 4, 5, 6, 7}, + bytes.Repeat([]byte{0, 1, 2, 3, 4, 5, 6, 7}, 62), ), }, }, @@ -452,7 +430,7 @@ var casesGeneric = []struct { 0, 0, [][]byte{ - bytes.Repeat([]byte{0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F}, 512), + bytes.Repeat([]byte{0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F}, 187), }, []*rtp.Packet{ //nolint:dupl { @@ -464,21 +442,9 @@ var casesGeneric = []struct { SSRC: 0x9dbb7812, }, Payload: mergeBytes( - []byte{0x0, 0x0d, 0x2d, 0x80}, - bytes.Repeat([]byte{0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F}, 182), - ), - }, - { - Header: rtp.Header{ - Version: 2, - Marker: false, - PayloadType: 96, - SequenceNumber: 17646, - SSRC: 0x9dbb7812, - }, - Payload: mergeBytes( - []byte{0x0, 0x0d, 0x2d, 0x80}, - bytes.Repeat([]byte{0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F}, 182), + []byte{0x0, 0x0d, 0x1f, 0x20}, + bytes.Repeat([]byte{0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F}, 124), + []byte{0x08, 0x09, 0x0A, 0x0B}, ), }, { @@ -486,12 +452,13 @@ var casesGeneric = []struct { Version: 2, Marker: true, PayloadType: 96, - SequenceNumber: 17647, + SequenceNumber: 17646, SSRC: 0x9dbb7812, }, Payload: mergeBytes( - []byte{0x00, 0x0d, 0x25, 0x00}, - bytes.Repeat([]byte{0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F}, 148), + []byte{0x0, 0x0d, 0x0f, 0xa0}, + []byte{0x0C, 0x0D, 0x0E, 0x0F}, + bytes.Repeat([]byte{0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F}, 62), ), }, }, @@ -508,6 +475,7 @@ func TestEncodeGeneric(t *testing.T) { SizeLength: ca.sizeLength, IndexLength: ca.indexLength, IndexDeltaLength: ca.indexDeltaLength, + PayloadMaxSize: 1000, } err := e.Init() require.NoError(t, err) diff --git a/pkg/format/rtpmpeg4audio/encoder_latm_test.go b/pkg/format/rtpmpeg4audio/encoder_latm_test.go index 4434beff..a2cb2102 100644 --- a/pkg/format/rtpmpeg4audio/encoder_latm_test.go +++ b/pkg/format/rtpmpeg4audio/encoder_latm_test.go @@ -33,7 +33,7 @@ var casesLATM = []struct { }, { "fragmented", - bytes.Repeat([]byte{0, 1, 2, 3, 4, 5, 6, 7}, 512), + bytes.Repeat([]byte{0, 1, 2, 3, 4, 5, 6, 7}, 187), []*rtp.Packet{ { Header: rtp.Header{ @@ -44,24 +44,10 @@ var casesLATM = []struct { SSRC: 2646308882, }, Payload: mergeBytes( - bytes.Repeat([]byte{0xff}, 16), - []byte{0x10}, - bytes.Repeat([]byte{0, 1, 2, 3, 4, 5, 6, 7}, 180), - []byte{0, 1, 2}, - ), - }, - { - Header: rtp.Header{ - Version: 2, - Marker: false, - PayloadType: 96, - SequenceNumber: 17646, - SSRC: 2646308882, - }, - Payload: mergeBytes( - []byte{3, 4, 5, 6, 7}, - bytes.Repeat([]byte{0, 1, 2, 3, 4, 5, 6, 7}, 181), - []byte{0, 1, 2, 3, 4, 5, 6}, + bytes.Repeat([]byte{0xff}, 5), + []byte{0xdd}, + bytes.Repeat([]byte{0, 1, 2, 3, 4, 5, 6, 7}, 124), + []byte{0, 1}, ), }, { @@ -69,19 +55,19 @@ var casesLATM = []struct { Version: 2, Marker: true, PayloadType: 96, - SequenceNumber: 17647, + SequenceNumber: 17646, SSRC: 2646308882, }, Payload: mergeBytes( - []byte{7}, - bytes.Repeat([]byte{0, 1, 2, 3, 4, 5, 6, 7}, 149), + []byte{2, 3, 4, 5, 6, 7}, + bytes.Repeat([]byte{0, 1, 2, 3, 4, 5, 6, 7}, 62), ), }, }, }, { "fragmented to the limit", - bytes.Repeat([]byte{1}, 2908), + bytes.Repeat([]byte{1}, 1992), []*rtp.Packet{ { Header: rtp.Header{ @@ -92,9 +78,9 @@ var casesLATM = []struct { SSRC: 2646308882, }, Payload: mergeBytes( - bytes.Repeat([]byte{0xff}, 11), - []byte{0x67}, - bytes.Repeat([]byte{1}, 1448), + bytes.Repeat([]byte{0xff}, 7), + []byte{0xcf}, + bytes.Repeat([]byte{1}, 992), ), }, { @@ -106,7 +92,7 @@ var casesLATM = []struct { SSRC: 2646308882, }, Payload: mergeBytes( - bytes.Repeat([]byte{1}, 1460), + bytes.Repeat([]byte{1}, 1000), ), }, }, @@ -121,6 +107,7 @@ func TestEncodeLATM(t *testing.T) { PayloadType: 96, SSRC: uint32Ptr(0x9dbb7812), InitialSequenceNumber: uint16Ptr(0x44ed), + PayloadMaxSize: 1000, } err := e.Init() require.NoError(t, err) diff --git a/pkg/format/rtpmpeg4audio/testdata/fuzz/FuzzDecoderGeneric/56dbd5d5f1e56ebb b/pkg/format/rtpmpeg4audio/testdata/fuzz/FuzzDecoderGeneric/56dbd5d5f1e56ebb new file mode 100644 index 00000000..06581577 --- /dev/null +++ b/pkg/format/rtpmpeg4audio/testdata/fuzz/FuzzDecoderGeneric/56dbd5d5f1e56ebb @@ -0,0 +1,5 @@ +go test fuzz v1 +[]byte("\x00\x10\x00\x1000") +bool(false) +[]byte("\x00\x1000") +bool(true) diff --git a/pkg/format/rtpmpeg4audio/testdata/fuzz/FuzzDecoderGeneric/e5a5ce29f6ff8be9 b/pkg/format/rtpmpeg4audio/testdata/fuzz/FuzzDecoderGeneric/e5a5ce29f6ff8be9 new file mode 100644 index 00000000..abca6e9a --- /dev/null +++ b/pkg/format/rtpmpeg4audio/testdata/fuzz/FuzzDecoderGeneric/e5a5ce29f6ff8be9 @@ -0,0 +1,5 @@ +go test fuzz v1 +[]byte("\x00\x10\x00\x1000") +bool(false) +[]byte("\x00\x10\x00\x1000") +bool(false) diff --git a/pkg/format/rtpmpeg4audio/testdata/fuzz/FuzzDecoderLATM/5c3924785d154da4 b/pkg/format/rtpmpeg4audio/testdata/fuzz/FuzzDecoderLATM/5c3924785d154da4 new file mode 100644 index 00000000..832547f1 --- /dev/null +++ b/pkg/format/rtpmpeg4audio/testdata/fuzz/FuzzDecoderLATM/5c3924785d154da4 @@ -0,0 +1,5 @@ +go test fuzz v1 +[]byte("0") +bool(false) +[]byte("") +bool(false) diff --git a/pkg/format/rtpmpeg4video/encoder.go b/pkg/format/rtpmpeg4video/encoder.go index bf3fa0d2..7172c558 100644 --- a/pkg/format/rtpmpeg4video/encoder.go +++ b/pkg/format/rtpmpeg4video/encoder.go @@ -8,7 +8,7 @@ import ( const ( rtpVersion = 2 - defaultPayloadMaxSize = 1460 // 1500 (UDP MTU) - 20 (IP header) - 8 (UDP header) - 12 (RTP header) + defaultPayloadMaxSize = 1450 // 1500 (UDP MTU) - 20 (IP header) - 8 (UDP header) - 12 (RTP header) - 10 (SRTP overhead) ) func randUint32() (uint32, error) { @@ -43,7 +43,7 @@ type Encoder struct { InitialSequenceNumber *uint16 // maximum size of packet payloads (optional). - // It defaults to 1460. + // It defaults to 1450. PayloadMaxSize int sequenceNumber uint16 diff --git a/pkg/format/rtpsimpleaudio/encoder.go b/pkg/format/rtpsimpleaudio/encoder.go index 0270285b..dbbd7461 100644 --- a/pkg/format/rtpsimpleaudio/encoder.go +++ b/pkg/format/rtpsimpleaudio/encoder.go @@ -9,7 +9,7 @@ import ( const ( rtpVersion = 2 - defaultPayloadMaxSize = 1460 // 1500 (UDP MTU) - 20 (IP header) - 8 (UDP header) - 12 (RTP header) + defaultPayloadMaxSize = 1450 // 1500 (UDP MTU) - 20 (IP header) - 8 (UDP header) - 12 (RTP header) - 10 (SRTP overhead) ) func randUint32() (uint32, error) { @@ -35,7 +35,7 @@ type Encoder struct { InitialSequenceNumber *uint16 // maximum size of packet payloads (optional). - // It defaults to 1460. + // It defaults to 1450. PayloadMaxSize int sequenceNumber uint16 diff --git a/pkg/format/rtpsimpleaudio/encoder_test.go b/pkg/format/rtpsimpleaudio/encoder_test.go index f97e8183..5125ab21 100644 --- a/pkg/format/rtpsimpleaudio/encoder_test.go +++ b/pkg/format/rtpsimpleaudio/encoder_test.go @@ -43,6 +43,7 @@ func TestEncode(t *testing.T) { PayloadType: 0, SSRC: uint32Ptr(0x9dbb7812), InitialSequenceNumber: uint16Ptr(0x44ed), + PayloadMaxSize: 1000, } err := e.Init() require.NoError(t, err) diff --git a/pkg/format/rtpvp8/encoder.go b/pkg/format/rtpvp8/encoder.go index eb2c2304..32ad6238 100644 --- a/pkg/format/rtpvp8/encoder.go +++ b/pkg/format/rtpvp8/encoder.go @@ -10,7 +10,7 @@ import ( const ( rtpVersion = 2 - defaultPayloadMaxSize = 1460 // 1500 (UDP MTU) - 20 (IP header) - 8 (UDP header) - 12 (RTP header) + defaultPayloadMaxSize = 1450 // 1500 (UDP MTU) - 20 (IP header) - 8 (UDP header) - 12 (RTP header) - 10 (SRTP overhead) ) func randUint32() (uint32, error) { @@ -37,7 +37,7 @@ type Encoder struct { InitialSequenceNumber *uint16 // maximum size of packet payloads (optional). - // It defaults to 1460. + // It defaults to 1450. PayloadMaxSize int sequenceNumber uint16 diff --git a/pkg/format/rtpvp8/encoder_test.go b/pkg/format/rtpvp8/encoder_test.go index 22585d8d..b3c756f6 100644 --- a/pkg/format/rtpvp8/encoder_test.go +++ b/pkg/format/rtpvp8/encoder_test.go @@ -39,7 +39,7 @@ var cases = []struct { }{ { "single", - []byte{0x01, 0x02, 0x03, 0x04}, + []byte{1, 2, 3, 4}, []*rtp.Packet{ { Header: rtp.Header{ @@ -49,13 +49,13 @@ var cases = []struct { SequenceNumber: 17645, SSRC: 0x9dbb7812, }, - Payload: []byte{0x10, 0x01, 0x02, 0x03, 0x04}, + Payload: []byte{0x10, 1, 2, 3, 4}, }, }, }, { "fragmented", - bytes.Repeat([]byte{0x01, 0x02, 0x03, 0x04}, 4096/4), + bytes.Repeat([]byte{1, 2, 3, 4}, 350), []*rtp.Packet{ { Header: rtp.Header{ @@ -65,7 +65,7 @@ var cases = []struct { SequenceNumber: 17645, SSRC: 0x9dbb7812, }, - Payload: mergeBytes([]byte{0x10}, bytes.Repeat([]byte{0x01, 0x02, 0x03, 0x04}, 364), []byte{0x01, 0x02, 0x03}), + Payload: mergeBytes([]byte{0x10}, bytes.Repeat([]byte{1, 2, 3, 4}, 124), []byte{1, 2, 3}), }, { Header: rtp.Header{ @@ -75,7 +75,7 @@ var cases = []struct { SequenceNumber: 17646, SSRC: 0x9dbb7812, }, - Payload: mergeBytes([]byte{0x00, 0x04}, bytes.Repeat([]byte{0x01, 0x02, 0x03, 0x04}, 364), []byte{0x01, 0x02}), + Payload: mergeBytes([]byte{0x00, 0x04}, bytes.Repeat([]byte{1, 2, 3, 4}, 124), []byte{1, 2}), }, { Header: rtp.Header{ @@ -85,7 +85,7 @@ var cases = []struct { SequenceNumber: 17647, SSRC: 0x9dbb7812, }, - Payload: mergeBytes([]byte{0x00, 0x03, 0x04}, bytes.Repeat([]byte{0x01, 0x02, 0x03, 0x04}, 294)), + Payload: mergeBytes([]byte{0, 3, 4}, bytes.Repeat([]byte{1, 2, 3, 4}, 100)), }, }, }, @@ -98,6 +98,7 @@ func TestEncode(t *testing.T) { PayloadType: 96, SSRC: uint32Ptr(0x9dbb7812), InitialSequenceNumber: uint16Ptr(0x44ed), + PayloadMaxSize: 500, } err := e.Init() require.NoError(t, err) diff --git a/pkg/format/rtpvp9/encoder.go b/pkg/format/rtpvp9/encoder.go index f222e0c0..0b78cbba 100644 --- a/pkg/format/rtpvp9/encoder.go +++ b/pkg/format/rtpvp9/encoder.go @@ -10,7 +10,7 @@ import ( const ( rtpVersion = 2 - defaultPayloadMaxSize = 1460 // 1500 (UDP MTU) - 20 (IP header) - 8 (UDP header) - 12 (RTP header) + defaultPayloadMaxSize = 1450 // 1500 (UDP MTU) - 20 (IP header) - 8 (UDP header) - 12 (RTP header) - 10 (SRTP overhead) ) func randUint32() (uint32, error) { @@ -37,7 +37,7 @@ type Encoder struct { InitialSequenceNumber *uint16 // maximum size of packet payloads (optional). - // It defaults to 1460. + // It defaults to 1450. PayloadMaxSize int // initial picture ID of frames (optional). diff --git a/pkg/format/rtpvp9/encoder_test.go b/pkg/format/rtpvp9/encoder_test.go index 6745b0e8..55dc2af7 100644 --- a/pkg/format/rtpvp9/encoder_test.go +++ b/pkg/format/rtpvp9/encoder_test.go @@ -61,7 +61,7 @@ var cases = []struct { "fragmented", mergeBytes( []byte{0x82, 0x49, 0x83, 0x42, 0x0, 0x77, 0xf0, 0x32, 0x34}, - bytes.Repeat([]byte{1, 2, 3, 4}, 4096/4), + bytes.Repeat([]byte{1, 2, 3, 4}, 350), ), []*rtp.Packet{ { @@ -78,7 +78,7 @@ var cases = []struct { 0x01, 0x14, 0x01, 0x82, 0x49, 0x83, 0x42, 0x00, 0x77, 0xf0, 0x32, 0x34, }, - bytes.Repeat([]byte{1, 2, 3, 4}, 360)), + bytes.Repeat([]byte{1, 2, 3, 4}, 120)), }, { Header: rtp.Header{ @@ -90,7 +90,9 @@ var cases = []struct { }, Payload: mergeBytes( []byte{0x81, 0xb5, 0xaf}, - bytes.Repeat([]byte{1, 2, 3, 4}, 364), []byte{1}), + bytes.Repeat([]byte{1, 2, 3, 4}, 124), + []byte{1}, + ), }, { Header: rtp.Header{ @@ -101,8 +103,9 @@ var cases = []struct { SSRC: 0x9dbb7812, }, Payload: mergeBytes( - []byte{0x85, 0xb5, 0xaf, 2, 3, 4}, - bytes.Repeat([]byte{1, 2, 3, 4}, 299)), + []byte{0x85, 0xb5, 0xaf}, + []byte{2, 3, 4}, + bytes.Repeat([]byte{1, 2, 3, 4}, 105)), }, }, }, @@ -116,6 +119,7 @@ func TestEncode(t *testing.T) { SSRC: uint32Ptr(0x9dbb7812), InitialSequenceNumber: uint16Ptr(0x44ed), InitialPictureID: uint16Ptr(0x35af), + PayloadMaxSize: 500, } err := e.Init() require.NoError(t, err)