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

headers: rename RTPInfo's RTPTime into Timestamp

Browse Source
This commit is contained in:
aler9
2021-03-18 13:46:36 +01:00
parent c2de28c185
commit 82aed5cc6c
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/headers/rtpinfo.go
View File

@@ -12,7 +12,7 @@ import (
type RTPInfoEntry struct { type RTPInfoEntry struct {
URL *base.URL URL *base.URL
SequenceNumber uint16 SequenceNumber uint16
RTPTime uint32 Timestamp uint32
} }
// RTPInfo is a RTP-Info header. // RTPInfo is a RTP-Info header.
@@ -60,7 +60,7 @@ func ReadRTPInfo(v base.HeaderValue) (*RTPInfo, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
e.RTPTime = uint32(vi) e.Timestamp = uint32(vi)
default: default:
return nil, fmt.Errorf("invalid key: %v", k) return nil, fmt.Errorf("invalid key: %v", k)
@@ -80,7 +80,7 @@ func (h RTPInfo) Clone() *RTPInfo {
*nh = append(*nh, &RTPInfoEntry{ *nh = append(*nh, &RTPInfoEntry{
URL: e.URL, URL: e.URL,
SequenceNumber: e.SequenceNumber, SequenceNumber: e.SequenceNumber,
RTPTime: e.RTPTime, Timestamp: e.Timestamp,
}) })
} }
return nh return nh
@@ -93,7 +93,7 @@ func (h RTPInfo) Write() base.HeaderValue {
for _, e := range h { for _, e := range h {
rets = append(rets, "url="+e.URL.String()+ rets = append(rets, "url="+e.URL.String()+
";seq="+strconv.FormatUint(uint64(e.SequenceNumber), 10)+ ";seq="+strconv.FormatUint(uint64(e.SequenceNumber), 10)+
";rtptime="+strconv.FormatUint(uint64(e.RTPTime), 10)) ";rtptime="+strconv.FormatUint(uint64(e.Timestamp), 10))
} }
return base.HeaderValue{strings.Join(rets, ",")} return base.HeaderValue{strings.Join(rets, ",")}

6
pkg/headers/rtpinfo_test.go
View File

@@ -22,7 +22,7 @@ var casesRTPInfo = []struct {
{ {
URL: base.MustParseURL("rtsp://127.0.0.1/test.mkv/track1"), URL: base.MustParseURL("rtsp://127.0.0.1/test.mkv/track1"),
SequenceNumber: 35243, SequenceNumber: 35243,
RTPTime: 717574556, Timestamp: 717574556,
}, },
}, },
}, },
@@ -34,12 +34,12 @@ var casesRTPInfo = []struct {
{ {
URL: base.MustParseURL("rtsp://127.0.0.1/test.mkv/track1"), URL: base.MustParseURL("rtsp://127.0.0.1/test.mkv/track1"),
SequenceNumber: 35243, SequenceNumber: 35243,
RTPTime: 717574556, Timestamp: 717574556,
}, },
{ {
URL: base.MustParseURL("rtsp://127.0.0.1/test.mkv/track2"), URL: base.MustParseURL("rtsp://127.0.0.1/test.mkv/track2"),
SequenceNumber: 13655, SequenceNumber: 13655,
RTPTime: 2848846950, Timestamp: 2848846950,
}, },
}, },
}, },