Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

improve tests #743

Merged
merged 1 commit into from
Mar 27, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 10 additions & 14 deletions pkg/format/rtpav1/decoder.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,14 @@ func joinFragments(fragments [][]byte, size int) []byte {
return ret
}

func tuSize(tu [][]byte) int {
s := 0
for _, obu := range tu {
s += len(obu)
}
return s
}

// Decoder is a RTP/AV1 decoder.
// Specification: https://aomediacodec.github.io/av1-rtp-spec/
type Decoder struct {
Expand Down Expand Up @@ -107,15 +115,7 @@ func (d *Decoder) decodeOBUs(pkt *rtp.Packet) ([][]byte, error) {
if av1header.Y {
elementCount := len(av1header.OBUElements)

d.fragmentsSize += len(av1header.OBUElements[elementCount-1])

if d.fragmentsSize > av1.MaxTemporalUnitSize {
errSize := d.fragmentsSize
d.resetFragments()
return nil, fmt.Errorf("temporal unit size (%d) is too big, maximum is %d",
errSize, av1.MaxTemporalUnitSize)
}

d.fragmentsSize = len(av1header.OBUElements[elementCount-1])
d.fragments = append(d.fragments, av1header.OBUElements[elementCount-1])
av1header.OBUElements = av1header.OBUElements[:elementCount-1]
d.fragmentNextSeqNum = pkt.SequenceNumber + 1
Expand Down Expand Up @@ -151,11 +151,7 @@ func (d *Decoder) Decode(pkt *rtp.Packet) ([][]byte, error) {
errCount, av1.MaxOBUsPerTemporalUnit)
}

addSize := 0

for _, obu := range obus {
addSize += len(obu)
}
addSize := tuSize(obus)

if (d.frameBufferSize + addSize) > av1.MaxTemporalUnitSize {
errSize := d.frameBufferSize + addSize
Expand Down
43 changes: 43 additions & 0 deletions pkg/format/rtpav1/decoder_test.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package rtpav1

import (
"bytes"
"errors"
"testing"

Expand Down Expand Up @@ -33,6 +34,48 @@ func TestDecode(t *testing.T) {
}
}

func TestDecoderErrorTUSize(t *testing.T) {
d := &Decoder{}
err := d.Init()
require.NoError(t, err)

size := 0
i := uint16(0)

for size < av1.MaxTemporalUnitSize {
var header byte
if i == 0 {
header = 0b01000000
} else {
header = 0b11000000
}

fragmentLenLEB := av1.LEB128(1400)
buf := make([]byte, fragmentLenLEB.MarshalSize())
fragmentLenLEB.MarshalTo(buf)

payload := append([]byte{header}, buf...)
payload = append(payload, bytes.Repeat([]byte{1, 2, 3, 4}, 1400/4)...)

_, err = d.Decode(&rtp.Packet{
Header: rtp.Header{
Version: 2,
Marker: false,
PayloadType: 96,
SequenceNumber: 17645 + i,
Timestamp: 2289527317,
SSRC: 0x9dbb7812,
},
Payload: payload,
})

size += 1400
i++
}

require.EqualError(t, err, "temporal unit size (3145800) is too big, maximum is 3145728")
}

func TestDecoderErrorOBUCount(t *testing.T) {
d := &Decoder{}
err := d.Init()
Expand Down
14 changes: 9 additions & 5 deletions pkg/format/rtph264/decoder.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,14 @@ func isAllZero(buf []byte) bool {
return true
}

func auSize(au [][]byte) int {
s := 0
for _, nalu := range au {
s += len(nalu)
}
return s
}

// Decoder is a RTP/H264 decoder.
// Specification: https://datatracker.ietf.org/doc/html/rfc6184
type Decoder struct {
Expand Down Expand Up @@ -223,11 +231,7 @@ func (d *Decoder) Decode(pkt *rtp.Packet) ([][]byte, error) {
errCount, h264.MaxNALUsPerAccessUnit)
}

addSize := 0

for _, nalu := range nalus {
addSize += len(nalu)
}
addSize := auSize(nalus)

if (d.frameBufferSize + addSize) > h264.MaxAccessUnitSize {
errSize := d.frameBufferSize + addSize
Expand Down
14 changes: 9 additions & 5 deletions pkg/format/rtph265/decoder.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,14 @@ func joinFragments(fragments [][]byte, size int) []byte {
return ret
}

func auSize(au [][]byte) int {
s := 0
for _, nalu := range au {
s += len(nalu)
}
return s
}

// Decoder is a RTP/H265 decoder.
// Specification: https://datatracker.ietf.org/doc/html/rfc7798
type Decoder struct {
Expand Down Expand Up @@ -182,11 +190,7 @@ func (d *Decoder) Decode(pkt *rtp.Packet) ([][]byte, error) {
errCount, h265.MaxNALUsPerAccessUnit)
}

addSize := 0

for _, nalu := range nalus {
addSize += len(nalu)
}
addSize := auSize(nalus)

if (d.frameBufferSize + addSize) > h265.MaxAccessUnitSize {
errSize := d.frameBufferSize + addSize
Expand Down