From 82aed5cc6c6cb88a6892a44c576639320a98b64f Mon Sep 17 00:00:00 2001 From: aler9 <46489434+aler9@users.noreply.github.com> Date: Thu, 18 Mar 2021 13:46:36 +0100 Subject: [PATCH] headers: rename RTPInfo's RTPTime into Timestamp --- pkg/headers/rtpinfo.go | 8 ++++---- pkg/headers/rtpinfo_test.go | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkg/headers/rtpinfo.go b/pkg/headers/rtpinfo.go index 1356a02a..148eb9da 100644 --- a/pkg/headers/rtpinfo.go +++ b/pkg/headers/rtpinfo.go @@ -12,7 +12,7 @@ import ( type RTPInfoEntry struct { URL *base.URL SequenceNumber uint16 - RTPTime uint32 + Timestamp uint32 } // RTPInfo is a RTP-Info header. @@ -60,7 +60,7 @@ func ReadRTPInfo(v base.HeaderValue) (*RTPInfo, error) { if err != nil { return nil, err } - e.RTPTime = uint32(vi) + e.Timestamp = uint32(vi) default: return nil, fmt.Errorf("invalid key: %v", k) @@ -80,7 +80,7 @@ func (h RTPInfo) Clone() *RTPInfo { *nh = append(*nh, &RTPInfoEntry{ URL: e.URL, SequenceNumber: e.SequenceNumber, - RTPTime: e.RTPTime, + Timestamp: e.Timestamp, }) } return nh @@ -93,7 +93,7 @@ func (h RTPInfo) Write() base.HeaderValue { for _, e := range h { rets = append(rets, "url="+e.URL.String()+ ";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, ",")} diff --git a/pkg/headers/rtpinfo_test.go b/pkg/headers/rtpinfo_test.go index 4916445d..7eddc91b 100644 --- a/pkg/headers/rtpinfo_test.go +++ b/pkg/headers/rtpinfo_test.go @@ -22,7 +22,7 @@ var casesRTPInfo = []struct { { URL: base.MustParseURL("rtsp://127.0.0.1/test.mkv/track1"), SequenceNumber: 35243, - RTPTime: 717574556, + Timestamp: 717574556, }, }, }, @@ -34,12 +34,12 @@ var casesRTPInfo = []struct { { URL: base.MustParseURL("rtsp://127.0.0.1/test.mkv/track1"), SequenceNumber: 35243, - RTPTime: 717574556, + Timestamp: 717574556, }, { URL: base.MustParseURL("rtsp://127.0.0.1/test.mkv/track2"), SequenceNumber: 13655, - RTPTime: 2848846950, + Timestamp: 2848846950, }, }, },