package/gortsplib
1
0
Fork 0
mirror of https://github.com/aler9/gortsplib synced 2025-10-05 23:26:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

support decoding H264 units without Marker field (bluenviron/mediamtx#3945) (#759)

Browse Source 
(like the ones produced by the FLIR M400)
This commit is contained in:
Alessandro Ros
2025-04-17 09:59:01 +02:00
committed by GitHub
parent fd8b0fc5fa
commit c3b5e0b76a
2 changed files with 124 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

107
pkg/format/rtph264/decoder_test.go
View File

@@ -189,37 +189,86 @@ func TestDecodeAnnexB(t *testing.T) {
}
func TestDecodeAccessUnit(t *testing.T) {
d := &Decoder{}
err := d.Init()
require.NoError(t, err)
nalus, err := d.Decode(&rtp.Packet{
Header: rtp.Header{
Version: 2,
Marker: false,
PayloadType: 96,
SequenceNumber: 17647,
Timestamp: 2289531307,
SSRC: 0x9dbb7812,
for _, ca := range []struct {
name string
pkts []*rtp.Packet
au [][]byte
}{
{
"marker-splitted",
[]*rtp.Packet{
{
Header: rtp.Header{
Version: 2,
Marker: false,
PayloadType: 96,
SequenceNumber: 17647,
Timestamp: 2289531307,
SSRC: 0x9dbb7812,
},
Payload: []byte{1, 2},
},
{
Header: rtp.Header{
Version: 2,
Marker: true,
PayloadType: 96,
SequenceNumber: 17647,
Timestamp: 2289531307,
SSRC: 0x9dbb7812,
},
Payload: []byte{3, 4},
},
},
[][]byte{{1, 2}, {3, 4}},
},
Payload: []byte{0x01, 0x02},
})
require.Equal(t, ErrMorePacketsNeeded, err)
require.Equal(t, [][]byte(nil), nalus)
nalus, err = d.Decode(&rtp.Packet{
Header: rtp.Header{
Version: 2,
Marker: true,
PayloadType: 96,
SequenceNumber: 17647,
Timestamp: 2289531307,
SSRC: 0x9dbb7812,
{
"timestamp-splitted (FLIR M400)",
[]*rtp.Packet{
{
Header: rtp.Header{
Version: 2,
Marker: false,
PayloadType: 96,
SequenceNumber: 17647,
Timestamp: 2289531307,
SSRC: 0x9dbb7812,
},
Payload: []byte{1, 2},
},
{
Header: rtp.Header{
Version: 2,
Marker: false,
PayloadType: 96,
SequenceNumber: 17647,
Timestamp: 2289531308,
SSRC: 0x9dbb7812,
},
Payload: []byte{3, 4},
},
},
[][]byte{{1, 2}},
},
Payload: []byte{0x01, 0x02},
})
require.NoError(t, err)
require.Equal(t, [][]byte{{0x01, 0x02}, {0x01, 0x02}}, nalus)
} {
t.Run(ca.name, func(t *testing.T) {
d := &Decoder{}
err := d.Init()
require.NoError(t, err)
var au [][]byte
for i, pkt := range ca.pkts {
au, err = d.Decode(pkt)
if i != len(ca.pkts)-1 {
require.Equal(t, ErrMorePacketsNeeded, err)
} else {
require.NoError(t, err)
require.Equal(t, ca.au, au)
}
}
})
}
}
func TestDecoderErrorNALUSize(t *testing.T) {