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

rename Read / Write into Unmarshal / Marshal when needed

Browse Source 
Read() / Write() are used to read / write from streams, while
Unmarshal() / Marshal() are used to decode / encode from / to bytes.
This commit is contained in:
aler9
2022-06-27 17:26:00 +02:00
parent e3c9f0c2e6
commit f3b0fc69b4
44 changed files with 569 additions and 559 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tracks.go
View File

@@ -13,16 +13,15 @@ import (
// Tracks is a list of tracks.
type Tracks []Track
// ReadTracks decodes tracks from the SDP format.
// It returns the tracks and the decoded SDP.
func ReadTracks(byts []byte, skipGenericTracksWithoutClockRate bool) (Tracks, *sdp.SessionDescription, error) {
// Unmarshal decodes tracks from the SDP format. It returns the decoded SDP.
func (ts *Tracks) Unmarshal(byts []byte, skipGenericTracksWithoutClockRate bool) (*sdp.SessionDescription, error) {
var sd sdp.SessionDescription
err := sd.Unmarshal(byts)
if err != nil {
return nil, nil, err
return nil, err
}
var tracks Tracks //nolint:prealloc
*ts = nil
for i, md := range sd.MediaDescriptions {
t, err := newTrackFromMediaDescription(md)
@@ -31,17 +30,17 @@ func ReadTracks(byts []byte, skipGenericTracksWithoutClockRate bool) (Tracks, *s
strings.HasPrefix(err.Error(), "unable to get clock rate") {
continue
}
return nil, nil, fmt.Errorf("unable to parse track %d: %s", i+1, err)
return nil, fmt.Errorf("unable to parse track %d: %s", i+1, err)
}
tracks = append(tracks, t)
*ts = append(*ts, t)
}
if len(tracks) == 0 {
return nil, nil, fmt.Errorf("no valid tracks found")
if *ts == nil {
return nil, fmt.Errorf("no valid tracks found")
}
return tracks, &sd, nil
return &sd, nil
}
func (ts Tracks) clone() Tracks {
@@ -58,8 +57,8 @@ func (ts Tracks) setControls() {
}
}
// Write encodes tracks in the SDP format.
func (ts Tracks) Write(multicast bool) []byte {
// Marshal encodes tracks in the SDP format.
func (ts Tracks) Marshal(multicast bool) []byte {
address := "0.0.0.0"
if multicast {
address = "224.1.0.0"