zishuo/rtsp-simple-server
1
0
Fork 0
mirror of https://github.com/aler9/rtsp-simple-server synced 2025-10-23 15:43:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix crash when processing H265 (#2378) (#2381)
Some checks reported warnings
lint / code (push) Has been cancelled
lint / mod-tidy (push) Has been cancelled
lint / apidocs (push) Has been cancelled
test / test64 (push) Has been cancelled
test / test32 (push) Has been cancelled
test / test_highlevel (push) Has been cancelled

Browse Source
This commit is contained in:
Alessandro Ros
2023-09-20 12:32:01 +02:00
committed by GitHub
parent fadfda936d
commit 89cf3bb2fa
3 changed files with 131 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
internal/formatprocessor/h264_test.go
View File

@@ -14,6 +14,8 @@ import (
) )
func TestH264DynamicParams(t *testing.T) { func TestH264DynamicParams(t *testing.T) {
for _, ca := range []string{"standard", "aggregated"} {
t.Run(ca, func(t *testing.T) {
forma := &format.H264{ forma := &format.H264{
PayloadTyp: 96, PayloadTyp: 96,
PacketizationMode: 1, PacketizationMode: 1,
@@ -35,6 +37,7 @@ func TestH264DynamicParams(t *testing.T) {
{byte(h264.NALUTypeIDR)}, {byte(h264.NALUTypeIDR)},
}, data.(*unit.H264).AU) }, data.(*unit.H264).AU)
if ca == "standard" {
pkts, err = enc.Encode([][]byte{{7, 4, 5, 6}}) // SPS pkts, err = enc.Encode([][]byte{{7, 4, 5, 6}}) // SPS
require.NoError(t, err) require.NoError(t, err)
@@ -46,6 +49,16 @@ func TestH264DynamicParams(t *testing.T) {
_, err = p.ProcessRTPPacket(pkts[0], time.Time{}, 0, false) _, err = p.ProcessRTPPacket(pkts[0], time.Time{}, 0, false)
require.NoError(t, err) require.NoError(t, err)
} else {
pkts, err = enc.Encode([][]byte{
{7, 4, 5, 6}, // SPS
{8, 1}, // PPS
})
require.NoError(t, err)
_, err = p.ProcessRTPPacket(pkts[0], time.Time{}, 0, false)
require.NoError(t, err)
}
require.Equal(t, []byte{7, 4, 5, 6}, forma.SPS) require.Equal(t, []byte{7, 4, 5, 6}, forma.SPS)
require.Equal(t, []byte{8, 1}, forma.PPS) require.Equal(t, []byte{8, 1}, forma.PPS)
@@ -61,6 +74,8 @@ func TestH264DynamicParams(t *testing.T) {
{0x08, 1}, {0x08, 1},
{byte(h264.NALUTypeIDR)}, {byte(h264.NALUTypeIDR)},
}, data.(*unit.H264).AU) }, data.(*unit.H264).AU)
})
}
} }
func TestH264OversizedPackets(t *testing.T) { func TestH264OversizedPackets(t *testing.T) {

2
internal/formatprocessor/h265.go
View File

@@ -55,7 +55,7 @@ func rtpH265ExtractVPSSPSPPS(payload []byte) ([]byte, []byte, []byte) {
nalu := payload[:size] nalu := payload[:size]
payload = payload[size:] payload = payload[size:]
typ = h265.NALUType((payload[0] >> 1) & 0b111111) typ = h265.NALUType((nalu[0] >> 1) & 0b111111)
switch typ { switch typ {
case h265.NALUType_VPS_NUT: case h265.NALUType_VPS_NUT:

16
internal/formatprocessor/h265_test.go
View File

@@ -14,6 +14,8 @@ import (
) )
func TestH265DynamicParams(t *testing.T) { func TestH265DynamicParams(t *testing.T) {
for _, ca := range []string{"standard", "aggregated"} {
t.Run(ca, func(t *testing.T) {
forma := &format.H265{ forma := &format.H265{
PayloadTyp: 96, PayloadTyp: 96,
} }
@@ -34,6 +36,7 @@ func TestH265DynamicParams(t *testing.T) {
{byte(h265.NALUType_CRA_NUT) << 1, 0}, {byte(h265.NALUType_CRA_NUT) << 1, 0},
}, data.(*unit.H265).AU) }, data.(*unit.H265).AU)
if ca == "standard" {
pkts, err = enc.Encode([][]byte{{byte(h265.NALUType_VPS_NUT) << 1, 1, 2, 3}}) pkts, err = enc.Encode([][]byte{{byte(h265.NALUType_VPS_NUT) << 1, 1, 2, 3}})
require.NoError(t, err) require.NoError(t, err)
@@ -51,6 +54,17 @@ func TestH265DynamicParams(t *testing.T) {
_, err = p.ProcessRTPPacket(pkts[0], time.Time{}, 0, false) _, err = p.ProcessRTPPacket(pkts[0], time.Time{}, 0, false)
require.NoError(t, err) require.NoError(t, err)
} else {
pkts, err = enc.Encode([][]byte{
{byte(h265.NALUType_VPS_NUT) << 1, 1, 2, 3},
{byte(h265.NALUType_SPS_NUT) << 1, 4, 5, 6},
{byte(h265.NALUType_PPS_NUT) << 1, 7, 8, 9},
})
require.NoError(t, err)
_, err = p.ProcessRTPPacket(pkts[0], time.Time{}, 0, false)
require.NoError(t, err)
}
require.Equal(t, []byte{byte(h265.NALUType_VPS_NUT) << 1, 1, 2, 3}, forma.VPS) require.Equal(t, []byte{byte(h265.NALUType_VPS_NUT) << 1, 1, 2, 3}, forma.VPS)
require.Equal(t, []byte{byte(h265.NALUType_SPS_NUT) << 1, 4, 5, 6}, forma.SPS) require.Equal(t, []byte{byte(h265.NALUType_SPS_NUT) << 1, 4, 5, 6}, forma.SPS)
@@ -68,6 +82,8 @@ func TestH265DynamicParams(t *testing.T) {
{byte(h265.NALUType_PPS_NUT) << 1, 7, 8, 9}, {byte(h265.NALUType_PPS_NUT) << 1, 7, 8, 9},
{byte(h265.NALUType_CRA_NUT) << 1, 0}, {byte(h265.NALUType_CRA_NUT) << 1, 0},
}, data.(*unit.H265).AU) }, data.(*unit.H265).AU)
})
}
} }
func TestH265OversizedPackets(t *testing.T) { func TestH265OversizedPackets(t *testing.T) {