From 9d12c345f84b9ece34cc04bb31cc99b1f0bc9322 Mon Sep 17 00:00:00 2001 From: aler9 <46489434+aler9@users.noreply.github.com> Date: Thu, 7 Apr 2022 12:28:00 +0200 Subject: [PATCH] support go 1.18 --- .github/workflows/lint.yml | 4 +++- .github/workflows/test.yml | 4 ++-- Makefile | 4 ++-- README.md | 2 +- client.go | 6 ++++-- go.mod | 2 +- pkg/rtcpreceiver/rtcpreceiver.go | 3 ++- pkg/rtcpsender/rtcpsender.go | 3 ++- server_test.go | 3 ++- serverconn.go | 3 ++- serverudpl.go | 3 ++- track_aac.go | 6 ++++-- track_generic.go | 3 ++- track_h264.go | 3 ++- track_opus.go | 3 ++- 15 files changed, 33 insertions(+), 19 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 2c1c41ae..dd5b98e8 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -15,7 +15,7 @@ jobs: - uses: golangci/golangci-lint-action@v2 with: - version: v1.44.2 + version: v1.45.2 go-mod-tidy: runs-on: ubuntu-20.04 @@ -24,6 +24,8 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 + with: + go-version: "1.17" - run: | go mod download diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1e9c0076..5e168550 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - go: ["1.15", "1.16", "1.17"] + go: ["1.16", "1.17", "1.18"] steps: - uses: actions/checkout@v2 @@ -24,5 +24,5 @@ jobs: - run: make test-nodocker - - if: matrix.go == '1.16' + - if: matrix.go == '1.18' run: bash <(curl -s https://codecov.io/bash) diff --git a/Makefile b/Makefile index 26437010..54f6afdf 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ BASE_IMAGE = golang:1.17-alpine3.14 -LINT_IMAGE = golangci/golangci-lint:v1.44.2 +LINT_IMAGE = golangci/golangci-lint:v1.45.2 .PHONY: $(shell ls) @@ -28,7 +28,7 @@ mod-tidy: define DOCKERFILE_FORMAT FROM $(BASE_IMAGE) -RUN go install mvdan.cc/gofumpt@v0.2.0 +RUN go install mvdan.cc/gofumpt@v0.3.1 endef export DOCKERFILE_FORMAT diff --git a/README.md b/README.md index 1da64abc..4b44e768 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ RTSP 1.0 client and server library for the Go programming language, written for [rtsp-simple-server](https://github.com/aler9/rtsp-simple-server). -Go ≥ 1.15 is required. +Go ≥ 1.16 is required. Features: diff --git a/client.go b/client.go index 06ee2188..0e9cf786 100644 --- a/client.go +++ b/client.go @@ -1263,7 +1263,8 @@ func (c *Client) doSetup( track Track, baseURL *base.URL, rtpPort int, - rtcpPort int) (*base.Response, error) { + rtcpPort int, +) (*base.Response, error) { err := c.checkState(map[clientState]struct{}{ clientStateInitial: {}, clientStatePrePlay: {}, @@ -1578,7 +1579,8 @@ func (c *Client) Setup( track Track, baseURL *base.URL, rtpPort int, - rtcpPort int) (*base.Response, error) { + rtcpPort int, +) (*base.Response, error) { cres := make(chan clientRes) select { case c.setup <- setupReq{ diff --git a/go.mod b/go.mod index a40c23ee..f1436a2e 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/aler9/gortsplib -go 1.15 +go 1.16 require ( github.com/asticode/go-astits v1.10.0 diff --git a/pkg/rtcpreceiver/rtcpreceiver.go b/pkg/rtcpreceiver/rtcpreceiver.go index 1083c0a1..96af15a5 100644 --- a/pkg/rtcpreceiver/rtcpreceiver.go +++ b/pkg/rtcpreceiver/rtcpreceiver.go @@ -48,7 +48,8 @@ type RTCPReceiver struct { // New allocates a RTCPReceiver. func New(period time.Duration, receiverSSRC *uint32, clockRate int, - writePacketRTCP func(rtcp.Packet)) *RTCPReceiver { + writePacketRTCP func(rtcp.Packet), +) *RTCPReceiver { rr := &RTCPReceiver{ period: period, receiverSSRC: func() uint32 { diff --git a/pkg/rtcpsender/rtcpsender.go b/pkg/rtcpsender/rtcpsender.go index 9247cf70..f5fea5f1 100644 --- a/pkg/rtcpsender/rtcpsender.go +++ b/pkg/rtcpsender/rtcpsender.go @@ -32,7 +32,8 @@ type RTCPSender struct { // New allocates a RTCPSender. func New(period time.Duration, clockRate int, - writePacketRTCP func(rtcp.Packet)) *RTCPSender { + writePacketRTCP func(rtcp.Packet), +) *RTCPSender { rs := &RTCPSender{ period: period, clockRate: float64(clockRate), diff --git a/server_test.go b/server_test.go index 9b0e9dfa..4e0de20c 100644 --- a/server_test.go +++ b/server_test.go @@ -22,7 +22,8 @@ import ( func writeReqReadRes(conn net.Conn, br *bufio.Reader, - req base.Request) (*base.Response, error) { + req base.Request, +) (*base.Response, error) { var bb bytes.Buffer req.Write(&bb) _, err := conn.Write(bb.Bytes()) diff --git a/serverconn.go b/serverconn.go index 95866c4a..8922b97f 100644 --- a/serverconn.go +++ b/serverconn.go @@ -51,7 +51,8 @@ type ServerConn struct { func newServerConn( s *Server, - nconn net.Conn) *ServerConn { + nconn net.Conn, +) *ServerConn { ctx, ctxCancel := context.WithCancel(s.ctx) conn := func() net.Conn { diff --git a/serverudpl.go b/serverudpl.go index 06108d7b..97e5caca 100644 --- a/serverudpl.go +++ b/serverudpl.go @@ -81,7 +81,8 @@ func newServerUDPListener( s *Server, multicast bool, address string, - isRTP bool) (*serverUDPListener, error) { + isRTP bool, +) (*serverUDPListener, error) { var pc *net.UDPConn var listenIP net.IP if multicast { diff --git a/track_aac.go b/track_aac.go index 7bbd00c9..bfb759aa 100644 --- a/track_aac.go +++ b/track_aac.go @@ -24,7 +24,8 @@ type TrackAAC struct { // NewTrackAAC allocates a TrackAAC. func NewTrackAAC(payloadType uint8, typ int, sampleRate int, - channelCount int, aotSpecificConfig []byte) (*TrackAAC, error) { + channelCount int, aotSpecificConfig []byte, +) (*TrackAAC, error) { mpegConf, err := aac.MPEG4AudioConfig{ Type: aac.MPEG4AudioType(typ), SampleRate: sampleRate, @@ -48,7 +49,8 @@ func NewTrackAAC(payloadType uint8, typ int, sampleRate int, func newTrackAACFromMediaDescription( control string, payloadType uint8, - md *psdp.MediaDescription) (*TrackAAC, error) { + md *psdp.MediaDescription, +) (*TrackAAC, error) { v, ok := md.Attribute("fmtp") if !ok { return nil, fmt.Errorf("fmtp attribute is missing") diff --git a/track_generic.go b/track_generic.go index ab731b01..64f179d1 100644 --- a/track_generic.go +++ b/track_generic.go @@ -87,7 +87,8 @@ func NewTrackGeneric(media string, formats []string, rtpmap string, fmtp string) func newTrackGenericFromMediaDescription( control string, - md *psdp.MediaDescription) (*TrackGeneric, error) { + md *psdp.MediaDescription, +) (*TrackGeneric, error) { rtpmap := func() string { for _, attr := range md.Attributes { if attr.Key == "rtpmap" { diff --git a/track_h264.go b/track_h264.go index b5b1cedb..a05aadac 100644 --- a/track_h264.go +++ b/track_h264.go @@ -80,7 +80,8 @@ func NewTrackH264(payloadType uint8, sps []byte, pps []byte, extradata []byte) ( func newTrackH264FromMediaDescription( control string, payloadType uint8, - md *psdp.MediaDescription) (*TrackH264, error) { + md *psdp.MediaDescription, +) (*TrackH264, error) { t := &TrackH264{ trackBase: trackBase{ control: control, diff --git a/track_opus.go b/track_opus.go index 71b85bfa..3db5fa85 100644 --- a/track_opus.go +++ b/track_opus.go @@ -29,7 +29,8 @@ func newTrackOpusFromMediaDescription( control string, payloadType uint8, rtpmapPart1 string, - md *psdp.MediaDescription) (*TrackOpus, error) { + md *psdp.MediaDescription, +) (*TrackOpus, error) { tmp := strings.SplitN(rtpmapPart1, "/", 3) if len(tmp) != 3 { return nil, fmt.Errorf("invalid rtpmap (%v)", rtpmapPart1)