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

rtpaac: make SizeLength, IndexLength, IndexDeltaLength mandatory

Browse Source
This commit is contained in:
aler9
2022-04-15 16:55:06 +02:00
parent 430b594283
commit efe7b064c3
4 changed files with 55 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
pkg/rtpaac/decoder.go
View File

@@ -21,17 +21,14 @@ type Decoder struct {
// sample rate of input packets.
SampleRate int
// The number of bits on which the AU-size field is encoded in the AU-header (optional).
// It defaults to 13.
SizeLength *int
// The number of bits on which the AU-size field is encoded in the AU-header.
SizeLength int
// The number of bits on which the AU-Index is encoded in the first AU-header (optional).
// It defaults to 3.
IndexLength *int
// The number of bits on which the AU-Index is encoded in the first AU-header.
IndexLength int
// The number of bits on which the AU-Index-delta field is encoded in any non-first AU-header (optional).
// It defaults to 3.
IndexDeltaLength *int
// The number of bits on which the AU-Index-delta field is encoded in any non-first AU-header.
IndexDeltaLength int
timeDecoder *rtptimedec.Decoder
fragmentedMode bool
@@ -41,19 +38,6 @@ type Decoder struct {
// Init initializes the decoder
func (d *Decoder) Init() {
if d.SizeLength == nil {
v := 13
d.SizeLength = &v
}
if d.IndexLength == nil {
v := 3
d.IndexLength = &v
}
if d.IndexDeltaLength == nil {
v := 3
d.IndexDeltaLength = &v
}
d.timeDecoder = rtptimedec.New(d.SampleRate)
}
@@ -154,11 +138,11 @@ func (d *Decoder) readAUHeaders(payload []byte, headersLen int) ([]uint64, error
count := 0
for i := 0; i < headersLen; {
if i == 0 {
i += *d.SizeLength
i += *d.IndexLength
i += d.SizeLength
i += d.IndexLength
} else {
i += *d.SizeLength
i += *d.IndexDeltaLength
i += d.SizeLength
i += d.IndexDeltaLength
}
count++
}
@@ -167,31 +151,31 @@ func (d *Decoder) readAUHeaders(payload []byte, headersLen int) ([]uint64, error
i := 0
for headersLen > 0 {
dataLen, err := br.ReadBits(uint8(*d.SizeLength))
dataLen, err := br.ReadBits(uint8(d.SizeLength))
if err != nil {
return nil, err
}
headersLen -= *d.SizeLength
headersLen -= d.SizeLength
if !firstRead {
firstRead = true
if *d.IndexLength > 0 {
auIndex, err := br.ReadBits(uint8(*d.IndexLength))
if d.IndexLength > 0 {
auIndex, err := br.ReadBits(uint8(d.IndexLength))
if err != nil {
return nil, err
}
headersLen -= *d.IndexLength
headersLen -= d.IndexLength
if auIndex != 0 {
return nil, fmt.Errorf("AU-index different than zero is not supported")
}
}
} else if *d.IndexDeltaLength > 0 {
auIndexDelta, err := br.ReadBits(uint8(*d.IndexDeltaLength))
} else if d.IndexDeltaLength > 0 {
auIndexDelta, err := br.ReadBits(uint8(d.IndexDeltaLength))
if err != nil {
return nil, err
}
headersLen -= *d.IndexDeltaLength
headersLen -= d.IndexDeltaLength
if auIndexDelta != 0 {
return nil, fmt.Errorf("AU-index-delta different than zero is not supported")