From 8960cbae5f03af42051cdb2b32b4a9d7d7dc8679 Mon Sep 17 00:00:00 2001 From: Alessandro Ros Date: Thu, 3 Oct 2024 12:18:13 +0200 Subject: [PATCH] remove redundant definition (#3824) --- internal/formatprocessor/ac3.go | 2 +- internal/formatprocessor/av1.go | 2 +- internal/formatprocessor/g711.go | 2 +- internal/formatprocessor/generic.go | 2 +- internal/formatprocessor/h264.go | 2 +- internal/formatprocessor/h265.go | 2 +- internal/formatprocessor/lpcm.go | 2 +- internal/formatprocessor/mjpeg.go | 2 +- internal/formatprocessor/mpeg1_audio.go | 2 +- internal/formatprocessor/mpeg1_video.go | 2 +- internal/formatprocessor/mpeg4_audio.go | 2 +- internal/formatprocessor/mpeg4_video.go | 2 +- internal/formatprocessor/opus.go | 2 +- internal/formatprocessor/processor.go | 2 +- internal/formatprocessor/unit.go | 19 ------------------- internal/formatprocessor/vp8.go | 2 +- internal/formatprocessor/vp9.go | 2 +- 17 files changed, 16 insertions(+), 35 deletions(-) delete mode 100644 internal/formatprocessor/unit.go diff --git a/internal/formatprocessor/ac3.go b/internal/formatprocessor/ac3.go index da1d3eb7..f52c9fc8 100644 --- a/internal/formatprocessor/ac3.go +++ b/internal/formatprocessor/ac3.go @@ -78,7 +78,7 @@ func (t *formatProcessorAC3) ProcessRTPPacket( //nolint:dupl ntp time.Time, pts time.Duration, hasNonRTSPReaders bool, -) (Unit, error) { +) (unit.Unit, error) { u := &unit.AC3{ Base: unit.Base{ RTPPackets: []*rtp.Packet{pkt}, diff --git a/internal/formatprocessor/av1.go b/internal/formatprocessor/av1.go index a549dd10..e7646bdd 100644 --- a/internal/formatprocessor/av1.go +++ b/internal/formatprocessor/av1.go @@ -86,7 +86,7 @@ func (t *formatProcessorAV1) ProcessRTPPacket( //nolint:dupl ntp time.Time, pts time.Duration, hasNonRTSPReaders bool, -) (Unit, error) { +) (unit.Unit, error) { u := &unit.AV1{ Base: unit.Base{ RTPPackets: []*rtp.Packet{pkt}, diff --git a/internal/formatprocessor/g711.go b/internal/formatprocessor/g711.go index fe26db55..e9644de3 100644 --- a/internal/formatprocessor/g711.go +++ b/internal/formatprocessor/g711.go @@ -80,7 +80,7 @@ func (t *formatProcessorG711) ProcessRTPPacket( //nolint:dupl ntp time.Time, pts time.Duration, hasNonRTSPReaders bool, -) (Unit, error) { +) (unit.Unit, error) { u := &unit.G711{ Base: unit.Base{ RTPPackets: []*rtp.Packet{pkt}, diff --git a/internal/formatprocessor/generic.go b/internal/formatprocessor/generic.go index 1faba6a8..c5bca81d 100644 --- a/internal/formatprocessor/generic.go +++ b/internal/formatprocessor/generic.go @@ -37,7 +37,7 @@ func (t *formatProcessorGeneric) ProcessRTPPacket( ntp time.Time, pts time.Duration, _ bool, -) (Unit, error) { +) (unit.Unit, error) { u := &unit.Generic{ Base: unit.Base{ RTPPackets: []*rtp.Packet{pkt}, diff --git a/internal/formatprocessor/h264.go b/internal/formatprocessor/h264.go index 55c2de78..d43726e4 100644 --- a/internal/formatprocessor/h264.go +++ b/internal/formatprocessor/h264.go @@ -260,7 +260,7 @@ func (t *formatProcessorH264) ProcessRTPPacket( //nolint:dupl ntp time.Time, pts time.Duration, hasNonRTSPReaders bool, -) (Unit, error) { +) (unit.Unit, error) { u := &unit.H264{ Base: unit.Base{ RTPPackets: []*rtp.Packet{pkt}, diff --git a/internal/formatprocessor/h265.go b/internal/formatprocessor/h265.go index 4e07b91b..9f433168 100644 --- a/internal/formatprocessor/h265.go +++ b/internal/formatprocessor/h265.go @@ -292,7 +292,7 @@ func (t *formatProcessorH265) ProcessRTPPacket( //nolint:dupl ntp time.Time, pts time.Duration, hasNonRTSPReaders bool, -) (Unit, error) { +) (unit.Unit, error) { u := &unit.H265{ Base: unit.Base{ RTPPackets: []*rtp.Packet{pkt}, diff --git a/internal/formatprocessor/lpcm.go b/internal/formatprocessor/lpcm.go index 73cc8c59..f326fd70 100644 --- a/internal/formatprocessor/lpcm.go +++ b/internal/formatprocessor/lpcm.go @@ -80,7 +80,7 @@ func (t *formatProcessorLPCM) ProcessRTPPacket( //nolint:dupl ntp time.Time, pts time.Duration, hasNonRTSPReaders bool, -) (Unit, error) { +) (unit.Unit, error) { u := &unit.LPCM{ Base: unit.Base{ RTPPackets: []*rtp.Packet{pkt}, diff --git a/internal/formatprocessor/mjpeg.go b/internal/formatprocessor/mjpeg.go index 8acb7121..5071b861 100644 --- a/internal/formatprocessor/mjpeg.go +++ b/internal/formatprocessor/mjpeg.go @@ -79,7 +79,7 @@ func (t *formatProcessorMJPEG) ProcessRTPPacket( //nolint:dupl ntp time.Time, pts time.Duration, hasNonRTSPReaders bool, -) (Unit, error) { +) (unit.Unit, error) { u := &unit.MJPEG{ Base: unit.Base{ RTPPackets: []*rtp.Packet{pkt}, diff --git a/internal/formatprocessor/mpeg1_audio.go b/internal/formatprocessor/mpeg1_audio.go index 41a42f4c..b3428abe 100644 --- a/internal/formatprocessor/mpeg1_audio.go +++ b/internal/formatprocessor/mpeg1_audio.go @@ -78,7 +78,7 @@ func (t *formatProcessorMPEG1Audio) ProcessRTPPacket( //nolint:dupl ntp time.Time, pts time.Duration, hasNonRTSPReaders bool, -) (Unit, error) { +) (unit.Unit, error) { u := &unit.MPEG1Audio{ Base: unit.Base{ RTPPackets: []*rtp.Packet{pkt}, diff --git a/internal/formatprocessor/mpeg1_video.go b/internal/formatprocessor/mpeg1_video.go index 079049ff..5bf0ef10 100644 --- a/internal/formatprocessor/mpeg1_video.go +++ b/internal/formatprocessor/mpeg1_video.go @@ -88,7 +88,7 @@ func (t *formatProcessorMPEG1Video) ProcessRTPPacket( //nolint:dupl ntp time.Time, pts time.Duration, hasNonRTSPReaders bool, -) (Unit, error) { +) (unit.Unit, error) { u := &unit.MPEG1Video{ Base: unit.Base{ RTPPackets: []*rtp.Packet{pkt}, diff --git a/internal/formatprocessor/mpeg4_audio.go b/internal/formatprocessor/mpeg4_audio.go index 26764419..f91ba1c1 100644 --- a/internal/formatprocessor/mpeg4_audio.go +++ b/internal/formatprocessor/mpeg4_audio.go @@ -82,7 +82,7 @@ func (t *formatProcessorMPEG4Audio) ProcessRTPPacket( //nolint:dupl ntp time.Time, pts time.Duration, hasNonRTSPReaders bool, -) (Unit, error) { +) (unit.Unit, error) { u := &unit.MPEG4Audio{ Base: unit.Base{ RTPPackets: []*rtp.Packet{pkt}, diff --git a/internal/formatprocessor/mpeg4_video.go b/internal/formatprocessor/mpeg4_video.go index 63691231..c646f23f 100644 --- a/internal/formatprocessor/mpeg4_video.go +++ b/internal/formatprocessor/mpeg4_video.go @@ -131,7 +131,7 @@ func (t *formatProcessorMPEG4Video) ProcessRTPPacket( //nolint:dupl ntp time.Time, pts time.Duration, hasNonRTSPReaders bool, -) (Unit, error) { +) (unit.Unit, error) { u := &unit.MPEG4Video{ Base: unit.Base{ RTPPackets: []*rtp.Packet{pkt}, diff --git a/internal/formatprocessor/opus.go b/internal/formatprocessor/opus.go index a72be67e..464f2d13 100644 --- a/internal/formatprocessor/opus.go +++ b/internal/formatprocessor/opus.go @@ -86,7 +86,7 @@ func (t *formatProcessorOpus) ProcessRTPPacket( ntp time.Time, pts time.Duration, hasNonRTSPReaders bool, -) (Unit, error) { +) (unit.Unit, error) { u := &unit.Opus{ Base: unit.Base{ RTPPackets: []*rtp.Packet{pkt}, diff --git a/internal/formatprocessor/processor.go b/internal/formatprocessor/processor.go index 530ff8c8..2d1ec256 100644 --- a/internal/formatprocessor/processor.go +++ b/internal/formatprocessor/processor.go @@ -21,7 +21,7 @@ type Processor interface { ntp time.Time, pts time.Duration, hasNonRTSPReaders bool, - ) (Unit, error) + ) (unit.Unit, error) } // New allocates a Processor. diff --git a/internal/formatprocessor/unit.go b/internal/formatprocessor/unit.go deleted file mode 100644 index e6d41995..00000000 --- a/internal/formatprocessor/unit.go +++ /dev/null @@ -1,19 +0,0 @@ -package formatprocessor - -import ( - "time" - - "github.com/pion/rtp" -) - -// Unit is the elementary data unit routed across the server. -type Unit interface { - // returns RTP packets contained into the unit. - GetRTPPackets() []*rtp.Packet - - // returns the NTP timestamp of the unit. - GetNTP() time.Time - - // returns the PTS of the unit. - GetPTS() time.Duration -} diff --git a/internal/formatprocessor/vp8.go b/internal/formatprocessor/vp8.go index 61ea9730..17ca15fb 100644 --- a/internal/formatprocessor/vp8.go +++ b/internal/formatprocessor/vp8.go @@ -79,7 +79,7 @@ func (t *formatProcessorVP8) ProcessRTPPacket( //nolint:dupl ntp time.Time, pts time.Duration, hasNonRTSPReaders bool, -) (Unit, error) { +) (unit.Unit, error) { u := &unit.VP8{ Base: unit.Base{ RTPPackets: []*rtp.Packet{pkt}, diff --git a/internal/formatprocessor/vp9.go b/internal/formatprocessor/vp9.go index db7ccb76..079bedcc 100644 --- a/internal/formatprocessor/vp9.go +++ b/internal/formatprocessor/vp9.go @@ -79,7 +79,7 @@ func (t *formatProcessorVP9) ProcessRTPPacket( //nolint:dupl ntp time.Time, pts time.Duration, hasNonRTSPReaders bool, -) (Unit, error) { +) (unit.Unit, error) { u := &unit.VP9{ Base: unit.Base{ RTPPackets: []*rtp.Packet{pkt},