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

deprecate rtpav1.Decoder.Decode, rtph264.Decoder.Decode, rtph265.Decoder.Decode

Browse Source
This commit is contained in:
aler9
2023-08-14 13:22:26 +02:00
committed by Alessandro Ros
parent 482b047999
commit 8857e25353
13 changed files with 46 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/formats/rtph265/decoder.go
View File

@@ -58,7 +58,13 @@ func (d *Decoder) Init() error {
}
// Decode decodes NALUs from a RTP packet.
//
// Deprecated: this method returns incomplete access units.
func (d *Decoder) Decode(pkt *rtp.Packet) ([][]byte, time.Duration, error) {
return d.decodeNALUs(pkt)
}
func (d *Decoder) decodeNALUs(pkt *rtp.Packet) ([][]byte, time.Duration, error) {
if len(pkt.Payload) < 2 {
d.fragments = d.fragments[:0] // discard pending fragments
return nil, 0, fmt.Errorf("payload is too short")
@@ -161,11 +167,9 @@ func (d *Decoder) Decode(pkt *rtp.Packet) ([][]byte, time.Duration, error) {
return nalus, d.timeDecoder.Decode(pkt.Timestamp), nil
}
// DecodeUntilMarker decodes NALUs from a RTP packet and puts them in a buffer.
// When a packet has the marker flag (meaning that all the NALUs with the same PTS have
// been received), the buffer is returned.
// DecodeUntilMarker decodes an access unit from a RTP packet.
func (d *Decoder) DecodeUntilMarker(pkt *rtp.Packet) ([][]byte, time.Duration, error) {
nalus, pts, err := d.Decode(pkt)
nalus, pts, err := d.decodeNALUs(pkt)
if err != nil {
return nil, 0, err
}

6
pkg/formats/rtph265/decoder_test.go
View File

@@ -20,7 +20,7 @@ func TestDecode(t *testing.T) {
for _, pkt := range ca.pkts {
clone := pkt.Clone()
addNALUs, _, err := d.Decode(pkt)
addNALUs, _, err := d.DecodeUntilMarker(pkt)
// test input integrity
require.Equal(t, clone, pkt)
@@ -65,7 +65,7 @@ func FuzzDecoder(f *testing.F) {
d := &Decoder{}
d.Init() //nolint:errcheck
d.Decode(&rtp.Packet{ //nolint:errcheck
d.DecodeUntilMarker(&rtp.Packet{ //nolint:errcheck
Header: rtp.Header{
Version: 2,
Marker: false,
@@ -77,7 +77,7 @@ func FuzzDecoder(f *testing.F) {
Payload: a,
})
d.Decode(&rtp.Packet{ //nolint:errcheck
d.DecodeUntilMarker(&rtp.Packet{ //nolint:errcheck
Header: rtp.Header{
Version: 2,
Marker: false,