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

improve AV1 decoder efficiency (#744)

Browse Source
This commit is contained in:
Alessandro Ros
2025-03-27 13:41:18 +01:00
committed by GitHub
parent 3414414c02
commit c9b91e629c
6 changed files with 57 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
pkg/format/rtpav1/decoder.go
View File

@@ -6,7 +6,6 @@ import (
"github.com/bluenviron/mediacommon/v2/pkg/codecs/av1"
"github.com/pion/rtp"
"github.com/pion/rtp/codecs"
)
// ErrMorePacketsNeeded is returned when more packets are needed.
@@ -61,20 +60,35 @@ func (d *Decoder) resetFragments() {
}
func (d *Decoder) decodeOBUs(pkt *rtp.Packet) ([][]byte, error) {
var av1header codecs.AV1Packet
_, err := av1header.Unmarshal(pkt.Payload)
if err != nil {
d.resetFragments()
return nil, fmt.Errorf("invalid header: %w", err)
if len(pkt.Payload) < 2 {
return nil, fmt.Errorf("invalid payload size")
}
for _, obu := range av1header.OBUElements {
if len(obu) == 0 {
return nil, fmt.Errorf("invalid OBU size")
z := (pkt.Payload[0] & 0b10000000) != 0
y := (pkt.Payload[0] & 0b01000000) != 0
payload := pkt.Payload[1:]
var obus [][]byte
for len(payload) > 0 {
var size av1.LEB128
n, err := size.Unmarshal(payload)
if err != nil {
d.resetFragments()
return nil, err
}
payload = payload[n:]
if size == 0 || len(payload) < int(size) {
return nil, fmt.Errorf("invalid fragmented OBU (invalid size)")
}
var obu []byte
obu, payload = payload[:size], payload[size:]
obus = append(obus, obu)
}
if av1header.Z {
// first OBU is continuation of previous one
if z {
if d.fragmentsSize == 0 {
if !d.firstPacketReceived {
return nil, ErrNonStartingPacketAndNoPrevious
@@ -83,12 +97,14 @@ func (d *Decoder) decodeOBUs(pkt *rtp.Packet) ([][]byte, error) {
return nil, fmt.Errorf("received a subsequent fragment without previous fragments")
}
d.firstPacketReceived = true
if pkt.SequenceNumber != d.fragmentNextSeqNum {
d.resetFragments()
return nil, fmt.Errorf("discarding frame since a RTP packet is missing")
}
d.fragmentsSize += len(av1header.OBUElements[0])
d.fragmentsSize += len(obus[0])
if d.fragmentsSize > av1.MaxTemporalUnitSize {
errSize := d.fragmentsSize
@@ -97,38 +113,31 @@ func (d *Decoder) decodeOBUs(pkt *rtp.Packet) ([][]byte, error) {
errSize, av1.MaxTemporalUnitSize)
}
d.fragments = append(d.fragments, av1header.OBUElements[0])
av1header.OBUElements = av1header.OBUElements[1:]
d.fragments = append(d.fragments, obus[0])
d.fragmentNextSeqNum++
}
d.firstPacketReceived = true
var obus [][]byte
if len(av1header.OBUElements) > 0 {
if d.fragmentsSize != 0 {
obus = append(obus, joinFragments(d.fragments, d.fragmentsSize))
d.resetFragments()
if len(obus) == 1 && y {
return nil, ErrMorePacketsNeeded
}
if av1header.Y {
elementCount := len(av1header.OBUElements)
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
}
obus = append(obus, av1header.OBUElements...)
} else if !av1header.Y {
obus = append(obus, joinFragments(d.fragments, d.fragmentsSize))
obus[0] = joinFragments(d.fragments, d.fragmentsSize)
d.resetFragments()
} else {
d.firstPacketReceived = true
}
if len(obus) == 0 {
return nil, ErrMorePacketsNeeded
// last OBU will continue in next packet
if y {
var obu []byte
obu, obus = obus[len(obus)-1], obus[:len(obus)-1]
d.fragmentsSize = len(obu)
d.fragments = append(d.fragments, obu)
d.fragmentNextSeqNum = pkt.SequenceNumber + 1
if len(obus) == 0 {
return nil, ErrMorePacketsNeeded
}
}
return obus, nil