Skip to content

Commit 240c612

Browse files
Sean-DerSean-Der
committed
Fix linter errors
golangci-lint upgrade to v1.56.2 added more checks Relates to pion/.goassets#201
1 parent 5574fda commit 240c612

16 files changed

+38
-38
lines changed

‎examples/nack/main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ func sendRoutine() {
125125
streamWriter := chain.BindLocalStream(&interceptor.StreamInfo{
126126
SSRC: ssrc,
127127
RTCPFeedback: []interceptor.RTCPFeedback{{Type: "nack", Parameter: ""}},
128-
}, interceptor.RTPWriterFunc(func(header *rtp.Header, payload []byte, attributes interceptor.Attributes) (int, error) {
128+
}, interceptor.RTPWriterFunc(func(header *rtp.Header, payload []byte, _ interceptor.Attributes) (int, error) {
129129
headerBuf, err := header.Marshal()
130130
if err != nil {
131131
panic(err)

‎internal/test/mock_stream.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ func NewMockStream(info *interceptor.StreamInfo, i interceptor.Interceptor) *Moc
5555
rtcpInModified: make(chan RTCPWithError, 1000),
5656
rtpInModified: make(chan RTPWithError, 1000),
5757
}
58-
s.rtcpWriter = i.BindRTCPWriter(interceptor.RTCPWriterFunc(func(pkts []rtcp.Packet, attributes interceptor.Attributes) (int, error) {
58+
s.rtcpWriter = i.BindRTCPWriter(interceptor.RTCPWriterFunc(func(pkts []rtcp.Packet, _ interceptor.Attributes) (int, error) {
5959
select {
6060
case s.rtcpOutModified <- pkts:
6161
default:
@@ -79,7 +79,7 @@ func NewMockStream(info *interceptor.StreamInfo, i interceptor.Interceptor) *Moc
7979
copy(b, marshaled)
8080
return len(marshaled), a, err
8181
}))
82-
s.rtpWriter = i.BindLocalStream(info, interceptor.RTPWriterFunc(func(header *rtp.Header, payload []byte, attributes interceptor.Attributes) (int, error) {
82+
s.rtpWriter = i.BindLocalStream(info, interceptor.RTPWriterFunc(func(header *rtp.Header, payload []byte, _ interceptor.Attributes) (int, error) {
8383
select {
8484
case s.rtpOutModified <- &rtp.Packet{Header: *header, Payload: payload}:
8585
default:

‎pkg/flexfec/encoder_interceptor.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ func (r *FecInterceptor) BindLocalStream(info *interceptor.StreamInfo, writer in
6363
if len(r.packetBuffer) == int(r.minNumMediaPackets) {
6464
fecPackets = r.flexFecEncoder.EncodeFec(r.packetBuffer, 2)
6565

66-
for _, fecPacket := range fecPackets {
67-
fecResult, fecErr := writer.Write(&fecPacket.Header, fecPacket.Payload, attributes)
66+
for i := range fecPackets {
67+
fecResult, fecErr := writer.Write(&(fecPackets[i].Header), fecPackets[i].Payload, attributes)
6868

6969
if fecErr != nil && fecResult == 0 {
7070
break

‎pkg/intervalpli/generator_interceptor.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ func (r *GeneratorInterceptor) loop(rtcpWriter interceptor.RTCPWriter) {
121121
case <-tickerChan:
122122
ssrcs := make([]uint32, 0)
123123

124-
r.streams.Range(func(k, value interface{}) bool {
124+
r.streams.Range(func(k, _ interface{}) bool {
125125
key, ok := k.(uint32)
126126
if !ok {
127127
return false

‎pkg/jitterbuffer/jitter_buffer_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313

1414
func TestJitterBuffer(t *testing.T) {
1515
assert := assert.New(t)
16-
t.Run("Appends packets in order", func(t *testing.T) {
16+
t.Run("Appends packets in order", func(*testing.T) {
1717
jb := New()
1818
assert.Equal(jb.lastSequence, uint16(0))
1919
jb.Push(&rtp.Packet{Header: rtp.Header{SequenceNumber: 5000, Timestamp: 500}, Payload: []byte{0x02}})
@@ -30,7 +30,7 @@ func TestJitterBuffer(t *testing.T) {
3030
assert.Equal(jb.lastSequence, uint16(5012))
3131
})
3232

33-
t.Run("Appends packets and begins playout", func(t *testing.T) {
33+
t.Run("Appends packets and begins playout", func(*testing.T) {
3434
jb := New()
3535
for i := 0; i < 100; i++ {
3636
jb.Push(&rtp.Packet{Header: rtp.Header{SequenceNumber: uint16(5012 + i), Timestamp: uint32(512 + i)}, Payload: []byte{0x02}})
@@ -42,7 +42,7 @@ func TestJitterBuffer(t *testing.T) {
4242
assert.Equal(head.SequenceNumber, uint16(5012))
4343
assert.Equal(err, nil)
4444
})
45-
t.Run("Wraps playout correctly", func(t *testing.T) {
45+
t.Run("Wraps playout correctly", func(*testing.T) {
4646
jb := New()
4747
for i := 0; i < 100; i++ {
4848
sqnum := uint16((math.MaxUint16 - 32 + i) % math.MaxUint16)
@@ -64,7 +64,7 @@ func TestJitterBuffer(t *testing.T) {
6464
}
6565
}
6666
})
67-
t.Run("Pops at timestamp correctly", func(t *testing.T) {
67+
t.Run("Pops at timestamp correctly", func(*testing.T) {
6868
jb := New()
6969
for i := 0; i < 100; i++ {
7070
sqnum := uint16((math.MaxUint16 - 32 + i) % math.MaxUint16)
@@ -83,7 +83,7 @@ func TestJitterBuffer(t *testing.T) {
8383
assert.Equal(head.SequenceNumber, uint16(math.MaxUint16-32))
8484
assert.Equal(err, nil)
8585
})
86-
t.Run("Can peek at a packet", func(t *testing.T) {
86+
t.Run("Can peek at a packet", func(*testing.T) {
8787
jb := New()
8888
jb.Push(&rtp.Packet{Header: rtp.Header{SequenceNumber: 5000, Timestamp: 500}, Payload: []byte{0x02}})
8989
jb.Push(&rtp.Packet{Header: rtp.Header{SequenceNumber: 5001, Timestamp: 501}, Payload: []byte{0x02}})
@@ -99,7 +99,7 @@ func TestJitterBuffer(t *testing.T) {
9999
assert.Equal(pkt.SequenceNumber, uint16(5000))
100100
assert.Equal(err, nil)
101101
})
102-
t.Run("Pops at timestamp with multiple packets", func(t *testing.T) {
102+
t.Run("Pops at timestamp with multiple packets", func(*testing.T) {
103103
jb := New()
104104
for i := 0; i < 50; i++ {
105105
sqnum := uint16((math.MaxUint16 - 32 + i) % math.MaxUint16)

‎pkg/jitterbuffer/priority_queue_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212

1313
func TestPriorityQueue(t *testing.T) {
1414
assert := assert.New(t)
15-
t.Run("Appends packets in order", func(t *testing.T) {
15+
t.Run("Appends packets in order", func(*testing.T) {
1616
pkt := &rtp.Packet{Header: rtp.Header{SequenceNumber: 5000, Timestamp: 500}, Payload: []byte{0x02}}
1717
q := NewQueue()
1818
q.Push(pkt, pkt.SequenceNumber)
@@ -22,7 +22,7 @@ func TestPriorityQueue(t *testing.T) {
2222
assert.Equal(q.next.prio, uint16(5000))
2323
assert.Equal(q.next.next.prio, uint16(5004))
2424
})
25-
t.Run("Appends many in order", func(t *testing.T) {
25+
t.Run("Appends many in order", func(*testing.T) {
2626
q := NewQueue()
2727
for i := 0; i < 100; i++ {
2828
q.Push(&rtp.Packet{Header: rtp.Header{SequenceNumber: uint16(5012 + i), Timestamp: uint32(512 + i)}, Payload: []byte{0x02}}, uint16(5012+i))
@@ -40,7 +40,7 @@ func TestPriorityQueue(t *testing.T) {
4040
assert.Equal(q.next.prio, uint16(5012))
4141
assert.Equal(last.prio, uint16(5012+99))
4242
})
43-
t.Run("Can remove an element", func(t *testing.T) {
43+
t.Run("Can remove an element", func(*testing.T) {
4444
pkt := &rtp.Packet{Header: rtp.Header{SequenceNumber: 5000, Timestamp: 500}, Payload: []byte{0x02}}
4545
q := NewQueue()
4646
q.Push(pkt, pkt.SequenceNumber)
@@ -55,7 +55,7 @@ func TestPriorityQueue(t *testing.T) {
5555
nextPop, _ := q.Pop()
5656
assert.Equal(nextPop.SequenceNumber, uint16(5012))
5757
})
58-
t.Run("Appends in order", func(t *testing.T) {
58+
t.Run("Appends in order", func(*testing.T) {
5959
q := NewQueue()
6060
for i := 0; i < 100; i++ {
6161
q.Push(&rtp.Packet{Header: rtp.Header{SequenceNumber: uint16(5012 + i), Timestamp: uint32(512 + i)}, Payload: []byte{0x02}}, uint16(5012+i))
@@ -67,7 +67,7 @@ func TestPriorityQueue(t *testing.T) {
6767
assert.Equal(uint16(101), q.Length())
6868
assert.Equal(q.next.prio, uint16(5000))
6969
})
70-
t.Run("Can find", func(t *testing.T) {
70+
t.Run("Can find", func(*testing.T) {
7171
q := NewQueue()
7272
for i := 0; i < 100; i++ {
7373
q.Push(&rtp.Packet{Header: rtp.Header{SequenceNumber: uint16(5012 + i), Timestamp: uint32(512 + i)}, Payload: []byte{0x02}}, uint16(5012+i))

‎pkg/mock/interceptor_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,18 +57,18 @@ func TestInterceptor(t *testing.T) {
5757
atomic.AddUint32(&cntBindRTCPWriter, 1)
5858
return writer
5959
},
60-
BindLocalStreamFn: func(i *interceptor.StreamInfo, writer interceptor.RTPWriter) interceptor.RTPWriter {
60+
BindLocalStreamFn: func(_ *interceptor.StreamInfo, writer interceptor.RTPWriter) interceptor.RTPWriter {
6161
atomic.AddUint32(&cntBindLocalStream, 1)
6262
return writer
6363
},
64-
UnbindLocalStreamFn: func(i *interceptor.StreamInfo) {
64+
UnbindLocalStreamFn: func(*interceptor.StreamInfo) {
6565
atomic.AddUint32(&cntUnbindLocalStream, 1)
6666
},
67-
BindRemoteStreamFn: func(i *interceptor.StreamInfo, reader interceptor.RTPReader) interceptor.RTPReader {
67+
BindRemoteStreamFn: func(_ *interceptor.StreamInfo, reader interceptor.RTPReader) interceptor.RTPReader {
6868
atomic.AddUint32(&cntBindRemoteStream, 1)
6969
return reader
7070
},
71-
UnbindRemoteStreamFn: func(i *interceptor.StreamInfo) {
71+
UnbindRemoteStreamFn: func(*interceptor.StreamInfo) {
7272
atomic.AddUint32(&cntUnbindRemoteStream, 1)
7373
},
7474
CloseFn: func() error {

‎pkg/packetdump/packet_dumper.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ func NewPacketDumper(opts ...PacketDumperOption) (*PacketDumper, error) {
4747
rtcpStream: os.Stdout,
4848
rtpFormat: DefaultRTPFormatter,
4949
rtcpFormat: DefaultRTCPFormatter,
50-
rtpFilter: func(pkt *rtp.Packet) bool {
50+
rtpFilter: func(*rtp.Packet) bool {
5151
return true
5252
},
53-
rtcpFilter: func(pkt []rtcp.Packet) bool {
53+
rtcpFilter: func([]rtcp.Packet) bool {
5454
return true
5555
},
5656
}

‎pkg/packetdump/receiver_interceptor_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ func TestReceiverFilterEverythingOut(t *testing.T) {
2323
RTPWriter(&buf),
2424
RTCPWriter(&buf),
2525
Log(logging.NewDefaultLoggerFactory().NewLogger("test")),
26-
RTPFilter(func(pkt *rtp.Packet) bool {
26+
RTPFilter(func(*rtp.Packet) bool {
2727
return false
2828
}),
29-
RTCPFilter(func(pkt []rtcp.Packet) bool {
29+
RTCPFilter(func([]rtcp.Packet) bool {
3030
return false
3131
}),
3232
)
@@ -70,10 +70,10 @@ func TestReceiverFilterNothing(t *testing.T) {
7070
RTPWriter(&buf),
7171
RTCPWriter(&buf),
7272
Log(logging.NewDefaultLoggerFactory().NewLogger("test")),
73-
RTPFilter(func(pkt *rtp.Packet) bool {
73+
RTPFilter(func(*rtp.Packet) bool {
7474
return true
7575
}),
76-
RTCPFilter(func(pkt []rtcp.Packet) bool {
76+
RTCPFilter(func([]rtcp.Packet) bool {
7777
return true
7878
}),
7979
)

‎pkg/packetdump/sender_interceptor_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ func TestSenderFilterEverythingOut(t *testing.T) {
2323
RTPWriter(&buf),
2424
RTCPWriter(&buf),
2525
Log(logging.NewDefaultLoggerFactory().NewLogger("test")),
26-
RTPFilter(func(pkt *rtp.Packet) bool {
26+
RTPFilter(func(*rtp.Packet) bool {
2727
return false
2828
}),
29-
RTCPFilter(func(pkt []rtcp.Packet) bool {
29+
RTCPFilter(func([]rtcp.Packet) bool {
3030
return false
3131
}),
3232
)
@@ -73,10 +73,10 @@ func TestSenderFilterNothing(t *testing.T) {
7373
RTPWriter(&buf),
7474
RTCPWriter(&buf),
7575
Log(logging.NewDefaultLoggerFactory().NewLogger("test")),
76-
RTPFilter(func(pkt *rtp.Packet) bool {
76+
RTPFilter(func(*rtp.Packet) bool {
7777
return true
7878
}),
79-
RTCPFilter(func(pkt []rtcp.Packet) bool {
79+
RTCPFilter(func([]rtcp.Packet) bool {
8080
return true
8181
}),
8282
)

0 commit comments

Comments
 (0)