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

rename OnFrame into ProcessFrame

Browse Source
This commit is contained in:
aler9
2020-11-30 15:09:21 +01:00
parent b77433bc9d
commit 6b4fe73270
7 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
connclientpublish.go
View File

@@ -182,7 +182,7 @@ func (c *ConnClient) WriteFrame(trackId int, streamType StreamType, content []by
now := time.Now() now := time.Now()
c.rtcpSenders[trackId].OnFrame(now, streamType, content) c.rtcpSenders[trackId].ProcessFrame(now, streamType, content)
if *c.streamProtocol == StreamProtocolUDP { if *c.streamProtocol == StreamProtocolUDP {
if streamType == StreamTypeRtp { if streamType == StreamTypeRtp {

2
connclientread.go
View File

@@ -162,7 +162,7 @@ func (c *ConnClient) backgroundPlayTCP(onFrameDone chan error) {
return return
} }
c.rtcpReceivers[frame.TrackId].OnFrame(time.Now(), frame.StreamType, frame.Content) c.rtcpReceivers[frame.TrackId].ProcessFrame(time.Now(), frame.StreamType, frame.Content)
c.readCB(frame.TrackId, frame.StreamType, frame.Content) c.readCB(frame.TrackId, frame.StreamType, frame.Content)
} }

2
connclientudpl.go
View File

@@ -85,7 +85,7 @@ func (l *connClientUDPListener) run() {
now := time.Now() now := time.Now()
atomic.StoreInt64(l.c.udpLastFrameTimes[l.trackId], now.Unix()) atomic.StoreInt64(l.c.udpLastFrameTimes[l.trackId], now.Unix())
l.c.rtcpReceivers[l.trackId].OnFrame(now, l.streamType, buf[:n]) l.c.rtcpReceivers[l.trackId].ProcessFrame(now, l.streamType, buf[:n])
l.c.readCB(l.trackId, l.streamType, buf[:n]) l.c.readCB(l.trackId, l.streamType, buf[:n])
} }

4
pkg/rtcpreceiver/rtcpreceiver.go
View File

@@ -47,8 +47,8 @@ func New(receiverSSRC *uint32, clockRate int) *RtcpReceiver {
} }
} }
// OnFrame extracts the needed data from RTP or RTCP frames. // ProcessFrame extracts the needed data from RTP or RTCP frames.
func (rr *RtcpReceiver) OnFrame(ts time.Time, streamType base.StreamType, buf []byte) { func (rr *RtcpReceiver) ProcessFrame(ts time.Time, streamType base.StreamType, buf []byte) {
rr.mutex.Lock() rr.mutex.Lock()
defer rr.mutex.Unlock() defer rr.mutex.Unlock()

36
pkg/rtcpreceiver/rtcpreceiver_test.go
View File

@@ -24,7 +24,7 @@ func TestRtcpReceiverBase(t *testing.T) {
} }
byts, _ := srPkt.Marshal() byts, _ := srPkt.Marshal()
ts := time.Date(2008, 05, 20, 22, 15, 20, 0, time.UTC) ts := time.Date(2008, 05, 20, 22, 15, 20, 0, time.UTC)
rr.OnFrame(ts, base.StreamTypeRtcp, byts) rr.ProcessFrame(ts, base.StreamTypeRtcp, byts)
rtpPkt := rtp.Packet{ rtpPkt := rtp.Packet{
Header: rtp.Header{ Header: rtp.Header{
@@ -39,7 +39,7 @@ func TestRtcpReceiverBase(t *testing.T) {
} }
byts, _ = rtpPkt.Marshal() byts, _ = rtpPkt.Marshal()
ts = time.Date(2008, 05, 20, 22, 15, 20, 0, time.UTC) ts = time.Date(2008, 05, 20, 22, 15, 20, 0, time.UTC)
rr.OnFrame(ts, base.StreamTypeRtp, byts) rr.ProcessFrame(ts, base.StreamTypeRtp, byts)
rtpPkt = rtp.Packet{ rtpPkt = rtp.Packet{
Header: rtp.Header{ Header: rtp.Header{
@@ -54,7 +54,7 @@ func TestRtcpReceiverBase(t *testing.T) {
} }
byts, _ = rtpPkt.Marshal() byts, _ = rtpPkt.Marshal()
ts = time.Date(2008, 05, 20, 22, 15, 21, 0, time.UTC) ts = time.Date(2008, 05, 20, 22, 15, 21, 0, time.UTC)
rr.OnFrame(ts, base.StreamTypeRtp, byts) rr.ProcessFrame(ts, base.StreamTypeRtp, byts)
expectedPkt := rtcp.ReceiverReport{ expectedPkt := rtcp.ReceiverReport{
SSRC: 0x65f83afb, SSRC: 0x65f83afb,
@@ -85,7 +85,7 @@ func TestRtcpReceiverOverflow(t *testing.T) {
} }
byts, _ := srPkt.Marshal() byts, _ := srPkt.Marshal()
ts := time.Date(2008, 05, 20, 22, 15, 20, 0, time.UTC) ts := time.Date(2008, 05, 20, 22, 15, 20, 0, time.UTC)
rr.OnFrame(ts, base.StreamTypeRtcp, byts) rr.ProcessFrame(ts, base.StreamTypeRtcp, byts)
rtpPkt := rtp.Packet{ rtpPkt := rtp.Packet{
Header: rtp.Header{ Header: rtp.Header{
@@ -100,7 +100,7 @@ func TestRtcpReceiverOverflow(t *testing.T) {
} }
byts, _ = rtpPkt.Marshal() byts, _ = rtpPkt.Marshal()
ts = time.Date(2008, 05, 20, 22, 15, 20, 0, time.UTC) ts = time.Date(2008, 05, 20, 22, 15, 20, 0, time.UTC)
rr.OnFrame(ts, base.StreamTypeRtp, byts) rr.ProcessFrame(ts, base.StreamTypeRtp, byts)
rtpPkt = rtp.Packet{ rtpPkt = rtp.Packet{
Header: rtp.Header{ Header: rtp.Header{
@@ -115,7 +115,7 @@ func TestRtcpReceiverOverflow(t *testing.T) {
} }
byts, _ = rtpPkt.Marshal() byts, _ = rtpPkt.Marshal()
ts = time.Date(2008, 05, 20, 22, 15, 20, 0, time.UTC) ts = time.Date(2008, 05, 20, 22, 15, 20, 0, time.UTC)
rr.OnFrame(ts, base.StreamTypeRtp, byts) rr.ProcessFrame(ts, base.StreamTypeRtp, byts)
expectedPkt := rtcp.ReceiverReport{ expectedPkt := rtcp.ReceiverReport{
SSRC: 0x65f83afb, SSRC: 0x65f83afb,
@@ -146,7 +146,7 @@ func TestRtcpReceiverPacketLost(t *testing.T) {
} }
byts, _ := srPkt.Marshal() byts, _ := srPkt.Marshal()
ts := time.Date(2008, 05, 20, 22, 15, 20, 0, time.UTC) ts := time.Date(2008, 05, 20, 22, 15, 20, 0, time.UTC)
rr.OnFrame(ts, base.StreamTypeRtcp, byts) rr.ProcessFrame(ts, base.StreamTypeRtcp, byts)
rtpPkt := rtp.Packet{ rtpPkt := rtp.Packet{
Header: rtp.Header{ Header: rtp.Header{
@@ -161,7 +161,7 @@ func TestRtcpReceiverPacketLost(t *testing.T) {
} }
byts, _ = rtpPkt.Marshal() byts, _ = rtpPkt.Marshal()
ts = time.Date(2008, 05, 20, 22, 15, 20, 0, time.UTC) ts = time.Date(2008, 05, 20, 22, 15, 20, 0, time.UTC)
rr.OnFrame(ts, base.StreamTypeRtp, byts) rr.ProcessFrame(ts, base.StreamTypeRtp, byts)
rtpPkt = rtp.Packet{ rtpPkt = rtp.Packet{
Header: rtp.Header{ Header: rtp.Header{
@@ -176,7 +176,7 @@ func TestRtcpReceiverPacketLost(t *testing.T) {
} }
byts, _ = rtpPkt.Marshal() byts, _ = rtpPkt.Marshal()
ts = time.Date(2008, 05, 20, 22, 15, 20, 0, time.UTC) ts = time.Date(2008, 05, 20, 22, 15, 20, 0, time.UTC)
rr.OnFrame(ts, base.StreamTypeRtp, byts) rr.ProcessFrame(ts, base.StreamTypeRtp, byts)
expectedPkt := rtcp.ReceiverReport{ expectedPkt := rtcp.ReceiverReport{
SSRC: 0x65f83afb, SSRC: 0x65f83afb,
@@ -212,7 +212,7 @@ func TestRtcpReceiverOverflowPacketLost(t *testing.T) {
} }
byts, _ := srPkt.Marshal() byts, _ := srPkt.Marshal()
ts := time.Date(2008, 05, 20, 22, 15, 20, 0, time.UTC) ts := time.Date(2008, 05, 20, 22, 15, 20, 0, time.UTC)
rr.OnFrame(ts, base.StreamTypeRtcp, byts) rr.ProcessFrame(ts, base.StreamTypeRtcp, byts)
rtpPkt := rtp.Packet{ rtpPkt := rtp.Packet{
Header: rtp.Header{ Header: rtp.Header{
@@ -227,7 +227,7 @@ func TestRtcpReceiverOverflowPacketLost(t *testing.T) {
} }
byts, _ = rtpPkt.Marshal() byts, _ = rtpPkt.Marshal()
ts = time.Date(2008, 05, 20, 22, 15, 20, 0, time.UTC) ts = time.Date(2008, 05, 20, 22, 15, 20, 0, time.UTC)
rr.OnFrame(ts, base.StreamTypeRtp, byts) rr.ProcessFrame(ts, base.StreamTypeRtp, byts)
rtpPkt = rtp.Packet{ rtpPkt = rtp.Packet{
Header: rtp.Header{ Header: rtp.Header{
@@ -242,7 +242,7 @@ func TestRtcpReceiverOverflowPacketLost(t *testing.T) {
} }
byts, _ = rtpPkt.Marshal() byts, _ = rtpPkt.Marshal()
ts = time.Date(2008, 05, 20, 22, 15, 20, 0, time.UTC) ts = time.Date(2008, 05, 20, 22, 15, 20, 0, time.UTC)
rr.OnFrame(ts, base.StreamTypeRtp, byts) rr.ProcessFrame(ts, base.StreamTypeRtp, byts)
expectedPkt := rtcp.ReceiverReport{ expectedPkt := rtcp.ReceiverReport{
SSRC: 0x65f83afb, SSRC: 0x65f83afb,
@@ -278,7 +278,7 @@ func TestRtcpReceiverReorderedPackets(t *testing.T) {
} }
byts, _ := srPkt.Marshal() byts, _ := srPkt.Marshal()
ts := time.Date(2008, 05, 20, 22, 15, 20, 0, time.UTC) ts := time.Date(2008, 05, 20, 22, 15, 20, 0, time.UTC)
rr.OnFrame(ts, base.StreamTypeRtcp, byts) rr.ProcessFrame(ts, base.StreamTypeRtcp, byts)
rtpPkt := rtp.Packet{ rtpPkt := rtp.Packet{
Header: rtp.Header{ Header: rtp.Header{
@@ -293,7 +293,7 @@ func TestRtcpReceiverReorderedPackets(t *testing.T) {
} }
byts, _ = rtpPkt.Marshal() byts, _ = rtpPkt.Marshal()
ts = time.Date(2008, 05, 20, 22, 15, 20, 0, time.UTC) ts = time.Date(2008, 05, 20, 22, 15, 20, 0, time.UTC)
rr.OnFrame(ts, base.StreamTypeRtp, byts) rr.ProcessFrame(ts, base.StreamTypeRtp, byts)
rtpPkt = rtp.Packet{ rtpPkt = rtp.Packet{
Header: rtp.Header{ Header: rtp.Header{
@@ -308,7 +308,7 @@ func TestRtcpReceiverReorderedPackets(t *testing.T) {
} }
byts, _ = rtpPkt.Marshal() byts, _ = rtpPkt.Marshal()
ts = time.Date(2008, 05, 20, 22, 15, 20, 0, time.UTC) ts = time.Date(2008, 05, 20, 22, 15, 20, 0, time.UTC)
rr.OnFrame(ts, base.StreamTypeRtp, byts) rr.ProcessFrame(ts, base.StreamTypeRtp, byts)
expectedPkt := rtcp.ReceiverReport{ expectedPkt := rtcp.ReceiverReport{
SSRC: 0x65f83afb, SSRC: 0x65f83afb,
@@ -339,7 +339,7 @@ func TestRtcpReceiverJitter(t *testing.T) {
} }
byts, _ := srPkt.Marshal() byts, _ := srPkt.Marshal()
ts := time.Date(2008, 05, 20, 22, 15, 20, 0, time.UTC) ts := time.Date(2008, 05, 20, 22, 15, 20, 0, time.UTC)
rr.OnFrame(ts, base.StreamTypeRtcp, byts) rr.ProcessFrame(ts, base.StreamTypeRtcp, byts)
rtpPkt := rtp.Packet{ rtpPkt := rtp.Packet{
Header: rtp.Header{ Header: rtp.Header{
@@ -354,7 +354,7 @@ func TestRtcpReceiverJitter(t *testing.T) {
} }
byts, _ = rtpPkt.Marshal() byts, _ = rtpPkt.Marshal()
ts = time.Date(2008, 05, 20, 22, 15, 20, 0, time.UTC) ts = time.Date(2008, 05, 20, 22, 15, 20, 0, time.UTC)
rr.OnFrame(ts, base.StreamTypeRtp, byts) rr.ProcessFrame(ts, base.StreamTypeRtp, byts)
rtpPkt = rtp.Packet{ rtpPkt = rtp.Packet{
Header: rtp.Header{ Header: rtp.Header{
@@ -369,7 +369,7 @@ func TestRtcpReceiverJitter(t *testing.T) {
} }
byts, _ = rtpPkt.Marshal() byts, _ = rtpPkt.Marshal()
ts = time.Date(2008, 05, 20, 22, 15, 21, 0, time.UTC) ts = time.Date(2008, 05, 20, 22, 15, 21, 0, time.UTC)
rr.OnFrame(ts, base.StreamTypeRtp, byts) rr.ProcessFrame(ts, base.StreamTypeRtp, byts)
expectedPkt := rtcp.ReceiverReport{ expectedPkt := rtcp.ReceiverReport{
SSRC: 0x65f83afb, SSRC: 0x65f83afb,

6
pkg/rtcpsender/rtcpsender.go
View File

@@ -32,8 +32,8 @@ func New(clockRate int) *RtcpSender {
} }
} }
// OnFrame extracts the needed data from RTP or RTCP frames. // ProcessFrame extracts the needed data from RTP or RTCP frames.
func (rs *RtcpSender) OnFrame(ts time.Time, streamType base.StreamType, buf []byte) { func (rs *RtcpSender) ProcessFrame(ts time.Time, streamType base.StreamType, buf []byte) {
rs.mutex.Lock() rs.mutex.Lock()
defer rs.mutex.Unlock() defer rs.mutex.Unlock()
@@ -57,7 +57,7 @@ func (rs *RtcpSender) OnFrame(ts time.Time, streamType base.StreamType, buf []by
} }
// Report generates a RTCP sender report. // Report generates a RTCP sender report.
// It returns nil if no packets has been passed to OnFrame yet. // It returns nil if no packets has been passed to ProcessFrame yet.
func (rs *RtcpSender) Report(ts time.Time) []byte { func (rs *RtcpSender) Report(ts time.Time) []byte {
rs.mutex.Lock() rs.mutex.Lock()
defer rs.mutex.Unlock() defer rs.mutex.Unlock()

4
pkg/rtcpsender/rtcpsender_test.go
View File

@@ -27,7 +27,7 @@ func TestRtcpSender(t *testing.T) {
} }
byts, _ := rtpPkt.Marshal() byts, _ := rtpPkt.Marshal()
ts := time.Date(2008, 05, 20, 22, 15, 20, 0, time.UTC) ts := time.Date(2008, 05, 20, 22, 15, 20, 0, time.UTC)
rs.OnFrame(ts, base.StreamTypeRtp, byts) rs.ProcessFrame(ts, base.StreamTypeRtp, byts)
rtpPkt = rtp.Packet{ rtpPkt = rtp.Packet{
Header: rtp.Header{ Header: rtp.Header{
@@ -42,7 +42,7 @@ func TestRtcpSender(t *testing.T) {
} }
byts, _ = rtpPkt.Marshal() byts, _ = rtpPkt.Marshal()
ts = time.Date(2008, 05, 20, 22, 15, 20, 500000000, time.UTC) ts = time.Date(2008, 05, 20, 22, 15, 20, 500000000, time.UTC)
rs.OnFrame(ts, base.StreamTypeRtp, byts) rs.ProcessFrame(ts, base.StreamTypeRtp, byts)
expectedPkt := rtcp.SenderReport{ expectedPkt := rtcp.SenderReport{
SSRC: 0xba9da416, SSRC: 0xba9da416,