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

fix invalid TID=0 in writeAggregationUnit of rtph265 encoder (#782)

Browse Source 
* fix invalid TID=0 in writeAggregationUnit of rtph265 encoder

* return error in case of invalid NALUs

---------

Co-authored-by: aler9 <46489434+aler9@users.noreply.github.com>
This commit is contained in:
Parallelc
2025-05-22 04:48:45 +08:00
committed by GitHub
parent bd07e2e04f
commit 2694ed941f
2 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
pkg/format/rtph265/encoder.go
View File

@@ -212,13 +212,25 @@ func (e *Encoder) lenAggregationUnit(nalus [][]byte, addNALU []byte) int {
func (e *Encoder) writeAggregationUnit(nalus [][]byte, marker bool) ([]*rtp.Packet, error) {
payload := make([]byte, e.lenAggregationUnit(nalus, nil))
// header
h := uint16(48) << 9
payload[0] = byte(h >> 8)
payload[1] = byte(h)
layerID := byte(0xFF)
temporalID := byte(0xFF)
pos := 2
for _, nalu := range nalus {
if len(nalu) < 2 {
return nil, fmt.Errorf("invalid NALU")
}
// select lowest layerID & temporalID
nalLayerID := ((nalu[0] & 0x01) << 5) | ((nalu[1] >> 3) & 0x1F)
nalTemporalID := nalu[1] & 0x07
if nalLayerID < layerID {
layerID = nalLayerID
}
if nalTemporalID < temporalID {
temporalID = nalTemporalID
}
// size
naluLen := len(nalu)
payload[pos] = uint8(naluLen >> 8)
@@ -230,6 +242,10 @@ func (e *Encoder) writeAggregationUnit(nalus [][]byte, marker bool) ([]*rtp.Pack
pos += naluLen
}
// header
payload[0] = (48 << 1) | (layerID & 0x20)
payload[1] = ((layerID & 0x1F) << 3) | (temporalID & 0x07)
pkt := &rtp.Packet{
Header: rtp.Header{
Version: rtpVersion,