diff --git a/connclientpublish.go b/connclientpublish.go index b08ded56..4c3361e1 100644 --- a/connclientpublish.go +++ b/connclientpublish.go @@ -182,7 +182,7 @@ func (c *ConnClient) WriteFrame(trackId int, streamType StreamType, content []by now := time.Now() - c.rtcpSenders[trackId].OnFrame(now, streamType, content) + c.rtcpSenders[trackId].ProcessFrame(now, streamType, content) if *c.streamProtocol == StreamProtocolUDP { if streamType == StreamTypeRtp { diff --git a/connclientread.go b/connclientread.go index 08d5e4f2..1d9b0bee 100644 --- a/connclientread.go +++ b/connclientread.go @@ -162,7 +162,7 @@ func (c *ConnClient) backgroundPlayTCP(onFrameDone chan error) { 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) } diff --git a/connclientudpl.go b/connclientudpl.go index 5514e9f9..3ee042bd 100644 --- a/connclientudpl.go +++ b/connclientudpl.go @@ -85,7 +85,7 @@ func (l *connClientUDPListener) run() { now := time.Now() 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]) } diff --git a/pkg/rtcpreceiver/rtcpreceiver.go b/pkg/rtcpreceiver/rtcpreceiver.go index 5491d8ba..1c023ec8 100644 --- a/pkg/rtcpreceiver/rtcpreceiver.go +++ b/pkg/rtcpreceiver/rtcpreceiver.go @@ -47,8 +47,8 @@ func New(receiverSSRC *uint32, clockRate int) *RtcpReceiver { } } -// OnFrame extracts the needed data from RTP or RTCP frames. -func (rr *RtcpReceiver) OnFrame(ts time.Time, streamType base.StreamType, buf []byte) { +// ProcessFrame extracts the needed data from RTP or RTCP frames. +func (rr *RtcpReceiver) ProcessFrame(ts time.Time, streamType base.StreamType, buf []byte) { rr.mutex.Lock() defer rr.mutex.Unlock() diff --git a/pkg/rtcpreceiver/rtcpreceiver_test.go b/pkg/rtcpreceiver/rtcpreceiver_test.go index 0ea6472b..e486d86b 100644 --- a/pkg/rtcpreceiver/rtcpreceiver_test.go +++ b/pkg/rtcpreceiver/rtcpreceiver_test.go @@ -24,7 +24,7 @@ func TestRtcpReceiverBase(t *testing.T) { } byts, _ := srPkt.Marshal() 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{ Header: rtp.Header{ @@ -39,7 +39,7 @@ func TestRtcpReceiverBase(t *testing.T) { } byts, _ = rtpPkt.Marshal() 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{ Header: rtp.Header{ @@ -54,7 +54,7 @@ func TestRtcpReceiverBase(t *testing.T) { } byts, _ = rtpPkt.Marshal() 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{ SSRC: 0x65f83afb, @@ -85,7 +85,7 @@ func TestRtcpReceiverOverflow(t *testing.T) { } byts, _ := srPkt.Marshal() 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{ Header: rtp.Header{ @@ -100,7 +100,7 @@ func TestRtcpReceiverOverflow(t *testing.T) { } byts, _ = rtpPkt.Marshal() 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{ Header: rtp.Header{ @@ -115,7 +115,7 @@ func TestRtcpReceiverOverflow(t *testing.T) { } byts, _ = rtpPkt.Marshal() 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{ SSRC: 0x65f83afb, @@ -146,7 +146,7 @@ func TestRtcpReceiverPacketLost(t *testing.T) { } byts, _ := srPkt.Marshal() 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{ Header: rtp.Header{ @@ -161,7 +161,7 @@ func TestRtcpReceiverPacketLost(t *testing.T) { } byts, _ = rtpPkt.Marshal() 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{ Header: rtp.Header{ @@ -176,7 +176,7 @@ func TestRtcpReceiverPacketLost(t *testing.T) { } byts, _ = rtpPkt.Marshal() 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{ SSRC: 0x65f83afb, @@ -212,7 +212,7 @@ func TestRtcpReceiverOverflowPacketLost(t *testing.T) { } byts, _ := srPkt.Marshal() 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{ Header: rtp.Header{ @@ -227,7 +227,7 @@ func TestRtcpReceiverOverflowPacketLost(t *testing.T) { } byts, _ = rtpPkt.Marshal() 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{ Header: rtp.Header{ @@ -242,7 +242,7 @@ func TestRtcpReceiverOverflowPacketLost(t *testing.T) { } byts, _ = rtpPkt.Marshal() 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{ SSRC: 0x65f83afb, @@ -278,7 +278,7 @@ func TestRtcpReceiverReorderedPackets(t *testing.T) { } byts, _ := srPkt.Marshal() 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{ Header: rtp.Header{ @@ -293,7 +293,7 @@ func TestRtcpReceiverReorderedPackets(t *testing.T) { } byts, _ = rtpPkt.Marshal() 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{ Header: rtp.Header{ @@ -308,7 +308,7 @@ func TestRtcpReceiverReorderedPackets(t *testing.T) { } byts, _ = rtpPkt.Marshal() 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{ SSRC: 0x65f83afb, @@ -339,7 +339,7 @@ func TestRtcpReceiverJitter(t *testing.T) { } byts, _ := srPkt.Marshal() 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{ Header: rtp.Header{ @@ -354,7 +354,7 @@ func TestRtcpReceiverJitter(t *testing.T) { } byts, _ = rtpPkt.Marshal() 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{ Header: rtp.Header{ @@ -369,7 +369,7 @@ func TestRtcpReceiverJitter(t *testing.T) { } byts, _ = rtpPkt.Marshal() 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{ SSRC: 0x65f83afb, diff --git a/pkg/rtcpsender/rtcpsender.go b/pkg/rtcpsender/rtcpsender.go index bad8c89f..34a1d467 100644 --- a/pkg/rtcpsender/rtcpsender.go +++ b/pkg/rtcpsender/rtcpsender.go @@ -32,8 +32,8 @@ func New(clockRate int) *RtcpSender { } } -// OnFrame extracts the needed data from RTP or RTCP frames. -func (rs *RtcpSender) OnFrame(ts time.Time, streamType base.StreamType, buf []byte) { +// ProcessFrame extracts the needed data from RTP or RTCP frames. +func (rs *RtcpSender) ProcessFrame(ts time.Time, streamType base.StreamType, buf []byte) { rs.mutex.Lock() 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. -// 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 { rs.mutex.Lock() defer rs.mutex.Unlock() diff --git a/pkg/rtcpsender/rtcpsender_test.go b/pkg/rtcpsender/rtcpsender_test.go index 63f9d49e..0986da9b 100644 --- a/pkg/rtcpsender/rtcpsender_test.go +++ b/pkg/rtcpsender/rtcpsender_test.go @@ -27,7 +27,7 @@ func TestRtcpSender(t *testing.T) { } byts, _ := rtpPkt.Marshal() 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{ Header: rtp.Header{ @@ -42,7 +42,7 @@ func TestRtcpSender(t *testing.T) { } byts, _ = rtpPkt.Marshal() 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{ SSRC: 0xba9da416,