diff --git a/.golangci.yml b/.golangci.yml index 40fdaad2..c028501f 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -91,6 +91,14 @@ linters: formatters: enable: + - gci - gofmt - gofumpt - goimports + + settings: + gci: + sections: + - standard + - default + - localmodule diff --git a/internal/api/api_config_global.go b/internal/api/api_config_global.go index a5e56f90..1cebdb19 100644 --- a/internal/api/api_config_global.go +++ b/internal/api/api_config_global.go @@ -3,9 +3,10 @@ package api //nolint:revive import ( "net/http" + "github.com/gin-gonic/gin" + "github.com/bluenviron/mediamtx/internal/conf" "github.com/bluenviron/mediamtx/internal/conf/jsonwrapper" - "github.com/gin-gonic/gin" ) func (a *API) onConfigGlobalGet(ctx *gin.Context) { diff --git a/internal/api/api_config_global_test.go b/internal/api/api_config_global_test.go index e23fe54a..3494eaa2 100644 --- a/internal/api/api_config_global_test.go +++ b/internal/api/api_config_global_test.go @@ -7,10 +7,11 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/bluenviron/mediamtx/internal/auth" "github.com/bluenviron/mediamtx/internal/conf" "github.com/bluenviron/mediamtx/internal/test" - "github.com/stretchr/testify/require" ) func TestConfigGlobalGet(t *testing.T) { diff --git a/internal/api/api_config_pathdefaults.go b/internal/api/api_config_pathdefaults.go index 0c70fbbe..245b36ea 100644 --- a/internal/api/api_config_pathdefaults.go +++ b/internal/api/api_config_pathdefaults.go @@ -3,9 +3,10 @@ package api //nolint:revive import ( "net/http" + "github.com/gin-gonic/gin" + "github.com/bluenviron/mediamtx/internal/conf" "github.com/bluenviron/mediamtx/internal/conf/jsonwrapper" - "github.com/gin-gonic/gin" ) func (a *API) onConfigPathDefaultsGet(ctx *gin.Context) { diff --git a/internal/api/api_config_pathdefaults_test.go b/internal/api/api_config_pathdefaults_test.go index 48798c2b..7f39e905 100644 --- a/internal/api/api_config_pathdefaults_test.go +++ b/internal/api/api_config_pathdefaults_test.go @@ -5,9 +5,10 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/bluenviron/mediamtx/internal/conf" "github.com/bluenviron/mediamtx/internal/test" - "github.com/stretchr/testify/require" ) func TestConfigPathDefaultsGet(t *testing.T) { diff --git a/internal/api/api_config_paths.go b/internal/api/api_config_paths.go index be4c297f..55416834 100644 --- a/internal/api/api_config_paths.go +++ b/internal/api/api_config_paths.go @@ -5,10 +5,11 @@ import ( "fmt" "net/http" + "github.com/gin-gonic/gin" + "github.com/bluenviron/mediamtx/internal/conf" "github.com/bluenviron/mediamtx/internal/conf/jsonwrapper" "github.com/bluenviron/mediamtx/internal/defs" - "github.com/gin-gonic/gin" ) func (a *API) onConfigPathsList(ctx *gin.Context) { diff --git a/internal/api/api_config_paths_test.go b/internal/api/api_config_paths_test.go index c2046c6e..3f1b5e6c 100644 --- a/internal/api/api_config_paths_test.go +++ b/internal/api/api_config_paths_test.go @@ -7,9 +7,10 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/bluenviron/mediamtx/internal/conf" "github.com/bluenviron/mediamtx/internal/test" - "github.com/stretchr/testify/require" ) func TestConfigPathsList(t *testing.T) { diff --git a/internal/api/api_hls.go b/internal/api/api_hls.go index 961512f5..130177aa 100644 --- a/internal/api/api_hls.go +++ b/internal/api/api_hls.go @@ -6,9 +6,10 @@ import ( "fmt" "net/http" - "github.com/bluenviron/mediamtx/internal/servers/hls" "github.com/gin-gonic/gin" "github.com/google/uuid" + + "github.com/bluenviron/mediamtx/internal/servers/hls" ) func (a *API) onHLSMuxersList(ctx *gin.Context) { diff --git a/internal/api/api_hls_test.go b/internal/api/api_hls_test.go index f370dd26..e07b2d6f 100644 --- a/internal/api/api_hls_test.go +++ b/internal/api/api_hls_test.go @@ -7,12 +7,13 @@ import ( "testing" "time" + "github.com/google/uuid" + "github.com/stretchr/testify/require" + "github.com/bluenviron/mediamtx/internal/conf" "github.com/bluenviron/mediamtx/internal/defs" "github.com/bluenviron/mediamtx/internal/servers/hls" "github.com/bluenviron/mediamtx/internal/test" - "github.com/google/uuid" - "github.com/stretchr/testify/require" ) type testHLSServer struct { diff --git a/internal/api/api_moq.go b/internal/api/api_moq.go index c6d2646d..1a2fec1f 100644 --- a/internal/api/api_moq.go +++ b/internal/api/api_moq.go @@ -4,9 +4,10 @@ import ( "errors" "net/http" - "github.com/bluenviron/mediamtx/internal/servers/moq" "github.com/gin-gonic/gin" "github.com/google/uuid" + + "github.com/bluenviron/mediamtx/internal/servers/moq" ) func (a *API) onMoQSessionsList(ctx *gin.Context) { diff --git a/internal/api/api_moq_test.go b/internal/api/api_moq_test.go index df644f04..58df95f3 100644 --- a/internal/api/api_moq_test.go +++ b/internal/api/api_moq_test.go @@ -6,12 +6,13 @@ import ( "testing" "time" + "github.com/google/uuid" + "github.com/stretchr/testify/require" + "github.com/bluenviron/mediamtx/internal/conf" "github.com/bluenviron/mediamtx/internal/defs" "github.com/bluenviron/mediamtx/internal/servers/moq" "github.com/bluenviron/mediamtx/internal/test" - "github.com/google/uuid" - "github.com/stretchr/testify/require" ) type testMoQServer struct { diff --git a/internal/api/api_paths.go b/internal/api/api_paths.go index 2d6c8474..72d7d612 100644 --- a/internal/api/api_paths.go +++ b/internal/api/api_paths.go @@ -6,8 +6,9 @@ import ( "fmt" "net/http" - "github.com/bluenviron/mediamtx/internal/conf" "github.com/gin-gonic/gin" + + "github.com/bluenviron/mediamtx/internal/conf" ) func (a *API) onPathsList(ctx *gin.Context) { diff --git a/internal/api/api_paths_test.go b/internal/api/api_paths_test.go index 8f17328f..a52b3e74 100644 --- a/internal/api/api_paths_test.go +++ b/internal/api/api_paths_test.go @@ -6,12 +6,12 @@ import ( "time" "github.com/google/uuid" + "github.com/stretchr/testify/require" "github.com/bluenviron/mediamtx/internal/conf" "github.com/bluenviron/mediamtx/internal/defs" "github.com/bluenviron/mediamtx/internal/formatlabel" "github.com/bluenviron/mediamtx/internal/test" - "github.com/stretchr/testify/require" ) type testPathManager struct { diff --git a/internal/api/api_recordings.go b/internal/api/api_recordings.go index 1c4f3ad3..f4cffba1 100644 --- a/internal/api/api_recordings.go +++ b/internal/api/api_recordings.go @@ -8,10 +8,11 @@ import ( "strings" "time" + "github.com/gin-gonic/gin" + "github.com/bluenviron/mediamtx/internal/conf" "github.com/bluenviron/mediamtx/internal/defs" "github.com/bluenviron/mediamtx/internal/recordstore" - "github.com/gin-gonic/gin" ) // this prevents directory traversal. diff --git a/internal/api/api_recordings_test.go b/internal/api/api_recordings_test.go index 3bdb1008..09a9ddb6 100644 --- a/internal/api/api_recordings_test.go +++ b/internal/api/api_recordings_test.go @@ -9,9 +9,10 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/bluenviron/mediamtx/internal/conf" "github.com/bluenviron/mediamtx/internal/test" - "github.com/stretchr/testify/require" ) func TestRecordingsList(t *testing.T) { diff --git a/internal/api/api_rtmp.go b/internal/api/api_rtmp.go index 1a4476dc..add3093f 100644 --- a/internal/api/api_rtmp.go +++ b/internal/api/api_rtmp.go @@ -4,9 +4,10 @@ import ( "errors" "net/http" - "github.com/bluenviron/mediamtx/internal/servers/rtmp" "github.com/gin-gonic/gin" "github.com/google/uuid" + + "github.com/bluenviron/mediamtx/internal/servers/rtmp" ) func (a *API) onRTMPConnsList(ctx *gin.Context) { diff --git a/internal/api/api_rtmp_test.go b/internal/api/api_rtmp_test.go index 754aa075..e2f9cb1a 100644 --- a/internal/api/api_rtmp_test.go +++ b/internal/api/api_rtmp_test.go @@ -6,12 +6,13 @@ import ( "testing" "time" + "github.com/google/uuid" + "github.com/stretchr/testify/require" + "github.com/bluenviron/mediamtx/internal/conf" "github.com/bluenviron/mediamtx/internal/defs" "github.com/bluenviron/mediamtx/internal/servers/rtmp" "github.com/bluenviron/mediamtx/internal/test" - "github.com/google/uuid" - "github.com/stretchr/testify/require" ) type testRTMPServer struct { diff --git a/internal/api/api_rtsp.go b/internal/api/api_rtsp.go index 54ec9e1f..043fffd5 100644 --- a/internal/api/api_rtsp.go +++ b/internal/api/api_rtsp.go @@ -4,9 +4,10 @@ import ( "errors" "net/http" - "github.com/bluenviron/mediamtx/internal/servers/rtsp" "github.com/gin-gonic/gin" "github.com/google/uuid" + + "github.com/bluenviron/mediamtx/internal/servers/rtsp" ) func (a *API) onRTSPConnsList(ctx *gin.Context) { diff --git a/internal/api/api_rtsp_test.go b/internal/api/api_rtsp_test.go index 5d97a205..6d306fee 100644 --- a/internal/api/api_rtsp_test.go +++ b/internal/api/api_rtsp_test.go @@ -7,12 +7,13 @@ import ( "testing" "time" + "github.com/google/uuid" + "github.com/stretchr/testify/require" + "github.com/bluenviron/mediamtx/internal/conf" "github.com/bluenviron/mediamtx/internal/defs" "github.com/bluenviron/mediamtx/internal/servers/rtsp" "github.com/bluenviron/mediamtx/internal/test" - "github.com/google/uuid" - "github.com/stretchr/testify/require" ) type testRTSPServer struct { diff --git a/internal/api/api_srt.go b/internal/api/api_srt.go index b9909df2..f255fdd2 100644 --- a/internal/api/api_srt.go +++ b/internal/api/api_srt.go @@ -5,9 +5,10 @@ import ( "errors" "net/http" - "github.com/bluenviron/mediamtx/internal/servers/srt" "github.com/gin-gonic/gin" "github.com/google/uuid" + + "github.com/bluenviron/mediamtx/internal/servers/srt" ) func (a *API) onSRTConnsList(ctx *gin.Context) { diff --git a/internal/api/api_srt_test.go b/internal/api/api_srt_test.go index b16d35e9..9367355e 100644 --- a/internal/api/api_srt_test.go +++ b/internal/api/api_srt_test.go @@ -6,12 +6,13 @@ import ( "testing" "time" + "github.com/google/uuid" + "github.com/stretchr/testify/require" + "github.com/bluenviron/mediamtx/internal/conf" "github.com/bluenviron/mediamtx/internal/defs" "github.com/bluenviron/mediamtx/internal/servers/srt" "github.com/bluenviron/mediamtx/internal/test" - "github.com/google/uuid" - "github.com/stretchr/testify/require" ) type testSRTServer struct { diff --git a/internal/api/api_test.go b/internal/api/api_test.go index c97ad7b4..285a39e1 100644 --- a/internal/api/api_test.go +++ b/internal/api/api_test.go @@ -10,11 +10,12 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/bluenviron/mediamtx/internal/auth" "github.com/bluenviron/mediamtx/internal/conf" "github.com/bluenviron/mediamtx/internal/logger" "github.com/bluenviron/mediamtx/internal/test" - "github.com/stretchr/testify/require" ) type testParent struct { diff --git a/internal/api/api_webrtc.go b/internal/api/api_webrtc.go index 2f27ca3b..1c92bf68 100644 --- a/internal/api/api_webrtc.go +++ b/internal/api/api_webrtc.go @@ -5,9 +5,10 @@ import ( "errors" "net/http" - "github.com/bluenviron/mediamtx/internal/servers/webrtc" "github.com/gin-gonic/gin" "github.com/google/uuid" + + "github.com/bluenviron/mediamtx/internal/servers/webrtc" ) func (a *API) onWebRTCSessionsList(ctx *gin.Context) { diff --git a/internal/api/api_webrtc_test.go b/internal/api/api_webrtc_test.go index 1dc2b21d..0c6def7f 100644 --- a/internal/api/api_webrtc_test.go +++ b/internal/api/api_webrtc_test.go @@ -6,12 +6,13 @@ import ( "testing" "time" + "github.com/google/uuid" + "github.com/stretchr/testify/require" + "github.com/bluenviron/mediamtx/internal/conf" "github.com/bluenviron/mediamtx/internal/defs" "github.com/bluenviron/mediamtx/internal/servers/webrtc" "github.com/bluenviron/mediamtx/internal/test" - "github.com/google/uuid" - "github.com/stretchr/testify/require" ) type testWebRTCServer struct { diff --git a/internal/apidocsgen/structs.go b/internal/apidocsgen/structs.go index 98a9fb93..f4d2f30a 100644 --- a/internal/apidocsgen/structs.go +++ b/internal/apidocsgen/structs.go @@ -10,11 +10,12 @@ import ( "strings" "time" - "github.com/bluenviron/mediamtx/internal/conf" - "github.com/bluenviron/mediamtx/internal/defs" "github.com/goccy/go-yaml" "github.com/goccy/go-yaml/ast" "github.com/google/uuid" + + "github.com/bluenviron/mediamtx/internal/conf" + "github.com/bluenviron/mediamtx/internal/defs" ) var structs = []struct { diff --git a/internal/auth/jwt_claims.go b/internal/auth/jwt_claims.go index e4aaf220..78d660da 100644 --- a/internal/auth/jwt_claims.go +++ b/internal/auth/jwt_claims.go @@ -4,9 +4,10 @@ import ( "encoding/json" "fmt" + "github.com/golang-jwt/jwt/v5" + "github.com/bluenviron/mediamtx/internal/conf" "github.com/bluenviron/mediamtx/internal/conf/jsonwrapper" - "github.com/golang-jwt/jwt/v5" ) type jwtClaims struct { diff --git a/internal/auth/manager.go b/internal/auth/manager.go index 263b4c8e..d1e2dbdd 100644 --- a/internal/auth/manager.go +++ b/internal/auth/manager.go @@ -14,10 +14,11 @@ import ( "time" "github.com/MicahParks/keyfunc/v3" - "github.com/bluenviron/mediamtx/internal/conf" - "github.com/bluenviron/mediamtx/internal/protocols/tls" "github.com/golang-jwt/jwt/v5" "github.com/google/uuid" + + "github.com/bluenviron/mediamtx/internal/conf" + "github.com/bluenviron/mediamtx/internal/protocols/tls" ) const ( diff --git a/internal/auth/manager_test.go b/internal/auth/manager_test.go index ef65fa76..230c8191 100644 --- a/internal/auth/manager_test.go +++ b/internal/auth/manager_test.go @@ -12,9 +12,10 @@ import ( "time" "github.com/MicahParks/jwkset" - "github.com/bluenviron/mediamtx/internal/conf" "github.com/golang-jwt/jwt/v5" "github.com/stretchr/testify/require" + + "github.com/bluenviron/mediamtx/internal/conf" ) var testTLSCertPub = []byte(`-----BEGIN CERTIFICATE----- diff --git a/internal/auth/request.go b/internal/auth/request.go index dc95f094..0e34724e 100644 --- a/internal/auth/request.go +++ b/internal/auth/request.go @@ -3,8 +3,9 @@ package auth import ( "net" - "github.com/bluenviron/mediamtx/internal/conf" "github.com/google/uuid" + + "github.com/bluenviron/mediamtx/internal/conf" ) // Protocol is a protocol. diff --git a/internal/certloader/certloader_test.go b/internal/certloader/certloader_test.go index 9dc4a4a1..81b99a16 100644 --- a/internal/certloader/certloader_test.go +++ b/internal/certloader/certloader_test.go @@ -6,9 +6,10 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/bluenviron/mediamtx/internal/certloader" "github.com/bluenviron/mediamtx/internal/test" - "github.com/stretchr/testify/require" ) func TestCertReload(t *testing.T) { diff --git a/internal/conf/credential.go b/internal/conf/credential.go index e7779ecc..3cefc698 100644 --- a/internal/conf/credential.go +++ b/internal/conf/credential.go @@ -8,8 +8,9 @@ import ( "regexp" "strings" - "github.com/bluenviron/mediamtx/internal/conf/jsonwrapper" "github.com/matthewhartstonge/argon2" + + "github.com/bluenviron/mediamtx/internal/conf/jsonwrapper" ) var ( diff --git a/internal/conf/hls_variant.go b/internal/conf/hls_variant.go index eccf10f6..d758bc4c 100644 --- a/internal/conf/hls_variant.go +++ b/internal/conf/hls_variant.go @@ -5,6 +5,7 @@ import ( "fmt" "github.com/bluenviron/gohlslib/v2" + "github.com/bluenviron/mediamtx/internal/conf/jsonwrapper" ) diff --git a/internal/conf/path.go b/internal/conf/path.go index 055ace48..de5cc4ae 100644 --- a/internal/conf/path.go +++ b/internal/conf/path.go @@ -16,6 +16,7 @@ import ( "github.com/bluenviron/gortsplib/v5/pkg/base" "github.com/bluenviron/mediacommon/v2/pkg/formats/mp4/codecs" "github.com/bluenviron/mediacommon/v2/pkg/formats/pmp4" + "github.com/bluenviron/mediamtx/internal/logger" ) diff --git a/internal/conf/rtsp_auth_method.go b/internal/conf/rtsp_auth_method.go index d7915b8b..0304ecd0 100644 --- a/internal/conf/rtsp_auth_method.go +++ b/internal/conf/rtsp_auth_method.go @@ -5,6 +5,7 @@ import ( "fmt" "github.com/bluenviron/gortsplib/v5/pkg/auth" + "github.com/bluenviron/mediamtx/internal/conf/jsonwrapper" ) diff --git a/internal/conf/rtsp_auth_methods.go b/internal/conf/rtsp_auth_methods.go index 9c1a79af..661c899a 100644 --- a/internal/conf/rtsp_auth_methods.go +++ b/internal/conf/rtsp_auth_methods.go @@ -5,6 +5,7 @@ import ( "strings" "github.com/bluenviron/gortsplib/v5/pkg/auth" + "github.com/bluenviron/mediamtx/internal/conf/jsonwrapper" ) diff --git a/internal/conf/rtsp_transport.go b/internal/conf/rtsp_transport.go index 94e3c549..6e6c75a5 100644 --- a/internal/conf/rtsp_transport.go +++ b/internal/conf/rtsp_transport.go @@ -5,6 +5,7 @@ import ( "fmt" "github.com/bluenviron/gortsplib/v5" + "github.com/bluenviron/mediamtx/internal/conf/jsonwrapper" ) diff --git a/internal/conf/rtsp_transports.go b/internal/conf/rtsp_transports.go index c32fb219..0526a65c 100644 --- a/internal/conf/rtsp_transports.go +++ b/internal/conf/rtsp_transports.go @@ -7,6 +7,7 @@ import ( "strings" "github.com/bluenviron/gortsplib/v5" + "github.com/bluenviron/mediamtx/internal/conf/jsonwrapper" ) diff --git a/internal/conf/string_size.go b/internal/conf/string_size.go index 24a1a158..1fabd117 100644 --- a/internal/conf/string_size.go +++ b/internal/conf/string_size.go @@ -2,6 +2,7 @@ package conf import ( "code.cloudfoundry.org/bytefmt" + "github.com/bluenviron/mediamtx/internal/conf/jsonwrapper" ) diff --git a/internal/conf/yamlwrapper/unmarshal.go b/internal/conf/yamlwrapper/unmarshal.go index 7d219ce4..0e009091 100644 --- a/internal/conf/yamlwrapper/unmarshal.go +++ b/internal/conf/yamlwrapper/unmarshal.go @@ -5,11 +5,12 @@ import ( "encoding/json" "fmt" - "github.com/bluenviron/mediamtx/internal/conf/jsonwrapper" "github.com/goccy/go-yaml" "github.com/goccy/go-yaml/ast" "github.com/goccy/go-yaml/parser" "github.com/goccy/go-yaml/token" + + "github.com/bluenviron/mediamtx/internal/conf/jsonwrapper" ) // differences with respect to the standard package: diff --git a/internal/confwatcher/confwatcher_test.go b/internal/confwatcher/confwatcher_test.go index 48010086..152f21c3 100644 --- a/internal/confwatcher/confwatcher_test.go +++ b/internal/confwatcher/confwatcher_test.go @@ -5,9 +5,10 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/bluenviron/mediamtx/internal/confwatcher" "github.com/bluenviron/mediamtx/internal/test" - "github.com/stretchr/testify/require" ) func TestNoFile(t *testing.T) { diff --git a/internal/core/core_test.go b/internal/core/core_test.go index 5f545286..23859e4b 100644 --- a/internal/core/core_test.go +++ b/internal/core/core_test.go @@ -8,8 +8,9 @@ import ( "github.com/bluenviron/gortsplib/v5" "github.com/bluenviron/gortsplib/v5/pkg/description" - "github.com/bluenviron/mediamtx/internal/test" "github.com/stretchr/testify/require" + + "github.com/bluenviron/mediamtx/internal/test" ) func newInstance(t *testing.T, conf string) (*Core, bool) { diff --git a/internal/core/path_manager.go b/internal/core/path_manager.go index 248c3b92..b65259c5 100644 --- a/internal/core/path_manager.go +++ b/internal/core/path_manager.go @@ -8,6 +8,8 @@ import ( "sort" "sync" + "github.com/google/uuid" + "github.com/bluenviron/mediamtx/internal/auth" "github.com/bluenviron/mediamtx/internal/conf" "github.com/bluenviron/mediamtx/internal/defs" @@ -15,7 +17,6 @@ import ( "github.com/bluenviron/mediamtx/internal/logger" "github.com/bluenviron/mediamtx/internal/metrics" "github.com/bluenviron/mediamtx/internal/servers/hls" - "github.com/google/uuid" ) func pathConfCanBeUpdated(oldPathConf *conf.Path, newPathConf *conf.Path) bool { diff --git a/internal/defs/api_forward.go b/internal/defs/api_forward.go index f3c773da..1b40ced1 100644 --- a/internal/defs/api_forward.go +++ b/internal/defs/api_forward.go @@ -3,8 +3,9 @@ package defs import ( "time" - "github.com/bluenviron/mediamtx/internal/conf" "github.com/google/uuid" + + "github.com/bluenviron/mediamtx/internal/conf" ) // APIForwardDestState is the state of a forward destination. diff --git a/internal/defs/api_path_track.go b/internal/defs/api_path_track.go index dff34940..8f278fe3 100644 --- a/internal/defs/api_path_track.go +++ b/internal/defs/api_path_track.go @@ -3,6 +3,7 @@ package defs import ( "github.com/bluenviron/gortsplib/v5/pkg/description" "github.com/bluenviron/gortsplib/v5/pkg/format" + "github.com/bluenviron/mediamtx/internal/formatlabel" ) diff --git a/internal/defs/path_access_request.go b/internal/defs/path_access_request.go index 67e3bc48..34a2f411 100644 --- a/internal/defs/path_access_request.go +++ b/internal/defs/path_access_request.go @@ -3,9 +3,10 @@ package defs import ( "net" + "github.com/google/uuid" + "github.com/bluenviron/mediamtx/internal/auth" "github.com/bluenviron/mediamtx/internal/conf" - "github.com/google/uuid" ) // PathAccessRequest is a path access request. diff --git a/internal/forward/manager_test.go b/internal/forward/manager_test.go index 73c2e032..545eb8ea 100644 --- a/internal/forward/manager_test.go +++ b/internal/forward/manager_test.go @@ -4,11 +4,11 @@ import ( "net" "testing" - "github.com/stretchr/testify/require" - "github.com/bluenviron/gortmplib" "github.com/bluenviron/gortsplib/v5/pkg/description" "github.com/bluenviron/gortsplib/v5/pkg/format" + "github.com/stretchr/testify/require" + "github.com/bluenviron/mediamtx/internal/conf" "github.com/bluenviron/mediamtx/internal/defs" "github.com/bluenviron/mediamtx/internal/forward" diff --git a/internal/metrics/metrics_test.go b/internal/metrics/metrics_test.go index 0de9479f..9bf00742 100644 --- a/internal/metrics/metrics_test.go +++ b/internal/metrics/metrics_test.go @@ -9,13 +9,14 @@ import ( "testing" "time" + "github.com/google/uuid" + "github.com/stretchr/testify/require" + "github.com/bluenviron/mediamtx/internal/auth" "github.com/bluenviron/mediamtx/internal/conf" "github.com/bluenviron/mediamtx/internal/defs" "github.com/bluenviron/mediamtx/internal/formatlabel" "github.com/bluenviron/mediamtx/internal/test" - "github.com/google/uuid" - "github.com/stretchr/testify/require" ) type dummyPathManager struct{} diff --git a/internal/packetdumper/tls_listener_test.go b/internal/packetdumper/tls_listener_test.go index b3785dfa..7fdb2f33 100644 --- a/internal/packetdumper/tls_listener_test.go +++ b/internal/packetdumper/tls_listener_test.go @@ -6,8 +6,9 @@ import ( "path/filepath" "testing" - "github.com/bluenviron/mediamtx/internal/test" "github.com/stretchr/testify/require" + + "github.com/bluenviron/mediamtx/internal/test" ) func TestTLSListener(t *testing.T) { diff --git a/internal/playback/muxer_fmp4.go b/internal/playback/muxer_fmp4.go index 1af1806c..faf361a3 100644 --- a/internal/playback/muxer_fmp4.go +++ b/internal/playback/muxer_fmp4.go @@ -6,6 +6,7 @@ import ( "github.com/bluenviron/mediacommon/v2/pkg/formats/fmp4" "github.com/bluenviron/mediacommon/v2/pkg/formats/fmp4/seekablebuffer" + "github.com/bluenviron/mediamtx/internal/recordstore" ) diff --git a/internal/playback/muxer_mp4.go b/internal/playback/muxer_mp4.go index 5a2f53bf..ef4de6f7 100644 --- a/internal/playback/muxer_mp4.go +++ b/internal/playback/muxer_mp4.go @@ -5,6 +5,7 @@ import ( "github.com/bluenviron/mediacommon/v2/pkg/formats/fmp4" "github.com/bluenviron/mediacommon/v2/pkg/formats/pmp4" + "github.com/bluenviron/mediamtx/internal/recordstore" ) diff --git a/internal/playback/muxer_mp4_test.go b/internal/playback/muxer_mp4_test.go index 51767d0e..ee005a4e 100644 --- a/internal/playback/muxer_mp4_test.go +++ b/internal/playback/muxer_mp4_test.go @@ -6,9 +6,10 @@ import ( "github.com/bluenviron/mediacommon/v2/pkg/formats/fmp4" mcodecs "github.com/bluenviron/mediacommon/v2/pkg/formats/mp4/codecs" + "github.com/stretchr/testify/require" + "github.com/bluenviron/mediamtx/internal/recordstore" "github.com/bluenviron/mediamtx/internal/test" - "github.com/stretchr/testify/require" ) // Test that tracks with no samples are not included in the output diff --git a/internal/playback/on_get.go b/internal/playback/on_get.go index 62565920..cc4b837e 100644 --- a/internal/playback/on_get.go +++ b/internal/playback/on_get.go @@ -10,10 +10,11 @@ import ( "time" "github.com/bluenviron/mediacommon/v2/pkg/formats/fmp4" + "github.com/gin-gonic/gin" + "github.com/bluenviron/mediamtx/internal/conf" "github.com/bluenviron/mediamtx/internal/logger" "github.com/bluenviron/mediamtx/internal/recordstore" - "github.com/gin-gonic/gin" ) type writerWrapper struct { diff --git a/internal/playback/on_get_test.go b/internal/playback/on_get_test.go index 0ed35ce5..0f9e1ce7 100644 --- a/internal/playback/on_get_test.go +++ b/internal/playback/on_get_test.go @@ -16,11 +16,12 @@ import ( "github.com/bluenviron/mediacommon/v2/pkg/formats/fmp4/seekablebuffer" mcodecs "github.com/bluenviron/mediacommon/v2/pkg/formats/mp4/codecs" "github.com/bluenviron/mediacommon/v2/pkg/formats/pmp4" + "github.com/google/uuid" + "github.com/stretchr/testify/require" + "github.com/bluenviron/mediamtx/internal/conf" "github.com/bluenviron/mediamtx/internal/recordstore" "github.com/bluenviron/mediamtx/internal/test" - "github.com/google/uuid" - "github.com/stretchr/testify/require" ) func writeSegment1(t *testing.T, fpath string) { diff --git a/internal/playback/on_list.go b/internal/playback/on_list.go index ed86f16d..83ac4220 100644 --- a/internal/playback/on_list.go +++ b/internal/playback/on_list.go @@ -12,9 +12,10 @@ import ( "time" "github.com/bluenviron/mediacommon/v2/pkg/formats/fmp4" + "github.com/gin-gonic/gin" + "github.com/bluenviron/mediamtx/internal/conf" "github.com/bluenviron/mediamtx/internal/recordstore" - "github.com/gin-gonic/gin" ) type listEntryDuration time.Duration diff --git a/internal/playback/on_list_test.go b/internal/playback/on_list_test.go index 807947e4..57f22e2c 100644 --- a/internal/playback/on_list_test.go +++ b/internal/playback/on_list_test.go @@ -15,10 +15,11 @@ import ( amp4 "github.com/abema/go-mp4" "github.com/bluenviron/mediacommon/v2/pkg/formats/fmp4" mcodecs "github.com/bluenviron/mediacommon/v2/pkg/formats/mp4/codecs" + "github.com/stretchr/testify/require" + "github.com/bluenviron/mediamtx/internal/auth" "github.com/bluenviron/mediamtx/internal/conf" "github.com/bluenviron/mediamtx/internal/test" - "github.com/stretchr/testify/require" ) func TestOnList(t *testing.T) { diff --git a/internal/playback/segment_fmp4.go b/internal/playback/segment_fmp4.go index 4cadb349..bd4ba60c 100644 --- a/internal/playback/segment_fmp4.go +++ b/internal/playback/segment_fmp4.go @@ -10,6 +10,7 @@ import ( amp4 "github.com/abema/go-mp4" "github.com/bluenviron/mediacommon/v2/pkg/formats/fmp4" + "github.com/bluenviron/mediamtx/internal/recordstore" ) diff --git a/internal/playback/segment_fmp4_test.go b/internal/playback/segment_fmp4_test.go index 4d156434..fd7b7f53 100644 --- a/internal/playback/segment_fmp4_test.go +++ b/internal/playback/segment_fmp4_test.go @@ -10,9 +10,10 @@ import ( "github.com/bluenviron/mediacommon/v2/pkg/codecs/mpeg4audio" "github.com/bluenviron/mediacommon/v2/pkg/formats/fmp4" mcodecs "github.com/bluenviron/mediacommon/v2/pkg/formats/mp4/codecs" + "github.com/stretchr/testify/require" + "github.com/bluenviron/mediamtx/internal/recordstore" "github.com/bluenviron/mediamtx/internal/test" - "github.com/stretchr/testify/require" ) func writeBenchInit(f io.WriteSeeker) { diff --git a/internal/playback/server.go b/internal/playback/server.go index 41635e75..c299da75 100644 --- a/internal/playback/server.go +++ b/internal/playback/server.go @@ -8,12 +8,13 @@ import ( "sync" "time" + "github.com/gin-gonic/gin" + "github.com/bluenviron/mediamtx/internal/auth" "github.com/bluenviron/mediamtx/internal/conf" "github.com/bluenviron/mediamtx/internal/defs" "github.com/bluenviron/mediamtx/internal/logger" "github.com/bluenviron/mediamtx/internal/protocols/httpp" - "github.com/gin-gonic/gin" ) type serverAuthManager interface { diff --git a/internal/playback/server_test.go b/internal/playback/server_test.go index cfbbefea..2fe6c2ea 100644 --- a/internal/playback/server_test.go +++ b/internal/playback/server_test.go @@ -8,10 +8,11 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/bluenviron/mediamtx/internal/auth" "github.com/bluenviron/mediamtx/internal/conf" "github.com/bluenviron/mediamtx/internal/test" - "github.com/stretchr/testify/require" ) func TestPreflightRequest(t *testing.T) { diff --git a/internal/pprof/pprof_test.go b/internal/pprof/pprof_test.go index a272c533..00f5d344 100644 --- a/internal/pprof/pprof_test.go +++ b/internal/pprof/pprof_test.go @@ -7,11 +7,12 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/bluenviron/mediamtx/internal/auth" "github.com/bluenviron/mediamtx/internal/conf" "github.com/bluenviron/mediamtx/internal/pprof" "github.com/bluenviron/mediamtx/internal/test" - "github.com/stretchr/testify/require" ) func TestPreflightRequest(t *testing.T) { diff --git a/internal/protocols/hls/from_stream.go b/internal/protocols/hls/from_stream.go index 2fd49207..442c24f1 100644 --- a/internal/protocols/hls/from_stream.go +++ b/internal/protocols/hls/from_stream.go @@ -15,6 +15,7 @@ import ( "github.com/bluenviron/gortsplib/v5/pkg/format" "github.com/bluenviron/mediacommon/v2/pkg/codecs/flac" "github.com/bluenviron/mediacommon/v2/pkg/codecs/mpeg4audio" + "github.com/bluenviron/mediamtx/internal/formatlabel" "github.com/bluenviron/mediamtx/internal/logger" "github.com/bluenviron/mediamtx/internal/stream" diff --git a/internal/protocols/hls/from_stream_test.go b/internal/protocols/hls/from_stream_test.go index 7e4ae2c2..078e900a 100644 --- a/internal/protocols/hls/from_stream_test.go +++ b/internal/protocols/hls/from_stream_test.go @@ -7,10 +7,11 @@ import ( "github.com/bluenviron/gohlslib/v2" "github.com/bluenviron/gortsplib/v5/pkg/description" "github.com/bluenviron/gortsplib/v5/pkg/format" + "github.com/stretchr/testify/require" + "github.com/bluenviron/mediamtx/internal/logger" "github.com/bluenviron/mediamtx/internal/stream" "github.com/bluenviron/mediamtx/internal/test" - "github.com/stretchr/testify/require" ) func TestFromStreamNoSupportedCodecs(t *testing.T) { diff --git a/internal/protocols/hls/to_stream.go b/internal/protocols/hls/to_stream.go index a1b41d1b..c2e2f6a3 100644 --- a/internal/protocols/hls/to_stream.go +++ b/internal/protocols/hls/to_stream.go @@ -10,6 +10,7 @@ import ( "github.com/bluenviron/gohlslib/v2/pkg/codecs" "github.com/bluenviron/gortsplib/v5/pkg/description" "github.com/bluenviron/gortsplib/v5/pkg/format" + "github.com/bluenviron/mediamtx/internal/conf" "github.com/bluenviron/mediamtx/internal/ntpestimator" "github.com/bluenviron/mediamtx/internal/stream" diff --git a/internal/protocols/hls/to_stream_test.go b/internal/protocols/hls/to_stream_test.go index fa064548..fcc0116e 100644 --- a/internal/protocols/hls/to_stream_test.go +++ b/internal/protocols/hls/to_stream_test.go @@ -12,11 +12,12 @@ import ( "github.com/bluenviron/gortsplib/v5/pkg/format" "github.com/bluenviron/mediacommon/v2/pkg/formats/mpegts" tscodecs "github.com/bluenviron/mediacommon/v2/pkg/formats/mpegts/codecs" + "github.com/stretchr/testify/require" + "github.com/bluenviron/mediamtx/internal/conf" "github.com/bluenviron/mediamtx/internal/stream" "github.com/bluenviron/mediamtx/internal/test" "github.com/bluenviron/mediamtx/internal/unit" - "github.com/stretchr/testify/require" ) func TestToStreamNoSupportedCodecs(t *testing.T) { diff --git a/internal/protocols/httpp/credentials_test.go b/internal/protocols/httpp/credentials_test.go index bdc0c5dd..097b7c80 100644 --- a/internal/protocols/httpp/credentials_test.go +++ b/internal/protocols/httpp/credentials_test.go @@ -5,8 +5,9 @@ import ( "net/url" "testing" - "github.com/bluenviron/mediamtx/internal/auth" "github.com/stretchr/testify/require" + + "github.com/bluenviron/mediamtx/internal/auth" ) func TestCredentials(t *testing.T) { diff --git a/internal/protocols/httpp/handler_filter_requests_test.go b/internal/protocols/httpp/handler_filter_requests_test.go index 02d5e24b..d89d0bfa 100644 --- a/internal/protocols/httpp/handler_filter_requests_test.go +++ b/internal/protocols/httpp/handler_filter_requests_test.go @@ -7,8 +7,9 @@ import ( "testing" "time" - "github.com/bluenviron/mediamtx/internal/test" "github.com/stretchr/testify/require" + + "github.com/bluenviron/mediamtx/internal/test" ) func TestHandlerFilterRequests(t *testing.T) { diff --git a/internal/protocols/httpp/handler_origin_test.go b/internal/protocols/httpp/handler_origin_test.go index 98b0ad91..eb5411d9 100644 --- a/internal/protocols/httpp/handler_origin_test.go +++ b/internal/protocols/httpp/handler_origin_test.go @@ -5,8 +5,9 @@ import ( "testing" "time" - "github.com/bluenviron/mediamtx/internal/test" "github.com/stretchr/testify/require" + + "github.com/bluenviron/mediamtx/internal/test" ) func TestHandlerOrigin(t *testing.T) { diff --git a/internal/protocols/httpp/handler_tracker_test.go b/internal/protocols/httpp/handler_tracker_test.go index 145e7ca3..c8f28ce5 100644 --- a/internal/protocols/httpp/handler_tracker_test.go +++ b/internal/protocols/httpp/handler_tracker_test.go @@ -5,8 +5,9 @@ import ( "testing" "time" - "github.com/bluenviron/mediamtx/internal/test" "github.com/stretchr/testify/require" + + "github.com/bluenviron/mediamtx/internal/test" ) func TestHandlerTracker(t *testing.T) { diff --git a/internal/protocols/httpp/server.go b/internal/protocols/httpp/server.go index 4c5d533a..70511ba4 100644 --- a/internal/protocols/httpp/server.go +++ b/internal/protocols/httpp/server.go @@ -11,11 +11,12 @@ import ( "strings" "time" + "golang.org/x/net/http2" + "github.com/bluenviron/mediamtx/internal/certloader" "github.com/bluenviron/mediamtx/internal/logger" "github.com/bluenviron/mediamtx/internal/packetdumper" "github.com/bluenviron/mediamtx/internal/restrictnetwork" - "golang.org/x/net/http2" ) type nilWriter struct{} diff --git a/internal/protocols/httpp3/server.go b/internal/protocols/httpp3/server.go index 46961675..4ba84b4d 100644 --- a/internal/protocols/httpp3/server.go +++ b/internal/protocols/httpp3/server.go @@ -18,9 +18,10 @@ import ( "time" "github.com/bluenviron/gortsplib/v5/pkg/readbuffer" - "github.com/bluenviron/mediamtx/internal/logger" "github.com/quic-go/quic-go/http3" "github.com/quic-go/webtransport-go" + + "github.com/bluenviron/mediamtx/internal/logger" ) const ( diff --git a/internal/protocols/httpp3/server_test.go b/internal/protocols/httpp3/server_test.go index 6e025dba..1cb72d06 100644 --- a/internal/protocols/httpp3/server_test.go +++ b/internal/protocols/httpp3/server_test.go @@ -6,9 +6,10 @@ import ( "net/http" "testing" - "github.com/bluenviron/mediamtx/internal/test" "github.com/quic-go/quic-go/http3" "github.com/stretchr/testify/require" + + "github.com/bluenviron/mediamtx/internal/test" ) func TestServer(t *testing.T) { diff --git a/internal/protocols/moq/controlmessage/message_test.go b/internal/protocols/moq/controlmessage/message_test.go index 53681068..0590cae8 100644 --- a/internal/protocols/moq/controlmessage/message_test.go +++ b/internal/protocols/moq/controlmessage/message_test.go @@ -4,9 +4,10 @@ import ( "bytes" "testing" + "github.com/stretchr/testify/require" + "github.com/bluenviron/mediamtx/internal/protocols/moq/controlmessage" "github.com/bluenviron/mediamtx/internal/protocols/moq/parameter" - "github.com/stretchr/testify/require" ) var cases = []struct { diff --git a/internal/protocols/moq/from_stream.go b/internal/protocols/moq/from_stream.go index 35fe9eae..a32b2b70 100644 --- a/internal/protocols/moq/from_stream.go +++ b/internal/protocols/moq/from_stream.go @@ -17,6 +17,7 @@ import ( "github.com/bluenviron/mediacommon/v2/pkg/codecs/mpeg4audio" "github.com/bluenviron/mediacommon/v2/pkg/codecs/vp8" "github.com/bluenviron/mediacommon/v2/pkg/codecs/vp9" + "github.com/bluenviron/mediamtx/internal/protocols/moq/catalog" "github.com/bluenviron/mediamtx/internal/stream" "github.com/bluenviron/mediamtx/internal/unit" diff --git a/internal/protocols/moq/from_stream_test.go b/internal/protocols/moq/from_stream_test.go index dbd17ce2..ade28686 100644 --- a/internal/protocols/moq/from_stream_test.go +++ b/internal/protocols/moq/from_stream_test.go @@ -9,8 +9,9 @@ import ( "github.com/bluenviron/gortsplib/v5/pkg/format" "github.com/bluenviron/mediacommon/v2/pkg/codecs/flac" "github.com/bluenviron/mediacommon/v2/pkg/codecs/mpeg4audio" - "github.com/bluenviron/mediamtx/internal/protocols/moq/catalog" "github.com/stretchr/testify/require" + + "github.com/bluenviron/mediamtx/internal/protocols/moq/catalog" ) func TestFromStream(t *testing.T) { diff --git a/internal/protocols/moq/parameter/parameter_test.go b/internal/protocols/moq/parameter/parameter_test.go index 8f3a9ed7..2610d7b6 100644 --- a/internal/protocols/moq/parameter/parameter_test.go +++ b/internal/protocols/moq/parameter/parameter_test.go @@ -3,8 +3,9 @@ package parameter_test import ( "testing" - "github.com/bluenviron/mediamtx/internal/protocols/moq/parameter" "github.com/stretchr/testify/require" + + "github.com/bluenviron/mediamtx/internal/protocols/moq/parameter" ) var cases = []struct { diff --git a/internal/protocols/moq/property/property_test.go b/internal/protocols/moq/property/property_test.go index 8b5b1414..a16c2d1c 100644 --- a/internal/protocols/moq/property/property_test.go +++ b/internal/protocols/moq/property/property_test.go @@ -3,8 +3,9 @@ package property_test import ( "testing" - "github.com/bluenviron/mediamtx/internal/protocols/moq/property" "github.com/stretchr/testify/require" + + "github.com/bluenviron/mediamtx/internal/protocols/moq/property" ) var cases = []struct { diff --git a/internal/protocols/moq/reorderer/reorderer_test.go b/internal/protocols/moq/reorderer/reorderer_test.go index 3bf728ad..aab7693e 100644 --- a/internal/protocols/moq/reorderer/reorderer_test.go +++ b/internal/protocols/moq/reorderer/reorderer_test.go @@ -3,10 +3,11 @@ package reorderer_test import ( "testing" + "github.com/stretchr/testify/require" + "github.com/bluenviron/mediamtx/internal/logger" "github.com/bluenviron/mediamtx/internal/protocols/moq/reorderer" "github.com/bluenviron/mediamtx/internal/protocols/moq/subgroup" - "github.com/stretchr/testify/require" ) type nopLogger struct{} diff --git a/internal/protocols/moq/subgroup/subgroup_test.go b/internal/protocols/moq/subgroup/subgroup_test.go index 967abc7e..d0241681 100644 --- a/internal/protocols/moq/subgroup/subgroup_test.go +++ b/internal/protocols/moq/subgroup/subgroup_test.go @@ -4,9 +4,10 @@ import ( "bytes" "testing" + "github.com/stretchr/testify/require" + "github.com/bluenviron/mediamtx/internal/protocols/moq/property" "github.com/bluenviron/mediamtx/internal/protocols/moq/subgroup" - "github.com/stretchr/testify/require" ) var cases = []struct { diff --git a/internal/protocols/moq/to_stream.go b/internal/protocols/moq/to_stream.go index 472e1709..312d400e 100644 --- a/internal/protocols/moq/to_stream.go +++ b/internal/protocols/moq/to_stream.go @@ -9,6 +9,7 @@ import ( "github.com/bluenviron/mediacommon/v2/pkg/codecs/av1" "github.com/bluenviron/mediacommon/v2/pkg/codecs/h264" "github.com/bluenviron/mediacommon/v2/pkg/codecs/mpeg4audio" + "github.com/bluenviron/mediamtx/internal/protocols/moq/catalog" "github.com/bluenviron/mediamtx/internal/protocols/moq/property" "github.com/bluenviron/mediamtx/internal/protocols/moq/subgroup" diff --git a/internal/protocols/moq/to_stream_test.go b/internal/protocols/moq/to_stream_test.go index 12cefa10..e01e9ddf 100644 --- a/internal/protocols/moq/to_stream_test.go +++ b/internal/protocols/moq/to_stream_test.go @@ -6,8 +6,9 @@ import ( "github.com/bluenviron/gortsplib/v5/pkg/description" "github.com/bluenviron/gortsplib/v5/pkg/format" "github.com/bluenviron/mediacommon/v2/pkg/codecs/mpeg4audio" - "github.com/bluenviron/mediamtx/internal/protocols/moq/catalog" "github.com/stretchr/testify/require" + + "github.com/bluenviron/mediamtx/internal/protocols/moq/catalog" ) func TestToStream(t *testing.T) { diff --git a/internal/protocols/moq/varint/varint_test.go b/internal/protocols/moq/varint/varint_test.go index 5f8c3047..a7d1234f 100644 --- a/internal/protocols/moq/varint/varint_test.go +++ b/internal/protocols/moq/varint/varint_test.go @@ -4,8 +4,9 @@ import ( "bytes" "testing" - "github.com/bluenviron/mediamtx/internal/protocols/moq/varint" "github.com/stretchr/testify/require" + + "github.com/bluenviron/mediamtx/internal/protocols/moq/varint" ) var cases = []struct { diff --git a/internal/protocols/mpegts/from_stream_test.go b/internal/protocols/mpegts/from_stream_test.go index f50eb92d..c244f25f 100644 --- a/internal/protocols/mpegts/from_stream_test.go +++ b/internal/protocols/mpegts/from_stream_test.go @@ -6,10 +6,11 @@ import ( "github.com/bluenviron/gortsplib/v5/pkg/description" "github.com/bluenviron/gortsplib/v5/pkg/format" + "github.com/stretchr/testify/require" + "github.com/bluenviron/mediamtx/internal/logger" "github.com/bluenviron/mediamtx/internal/stream" "github.com/bluenviron/mediamtx/internal/test" - "github.com/stretchr/testify/require" ) func TestFromStreamNoSupportedCodecs(t *testing.T) { diff --git a/internal/protocols/mpegts/to_stream_test.go b/internal/protocols/mpegts/to_stream_test.go index efbb169e..435704a5 100644 --- a/internal/protocols/mpegts/to_stream_test.go +++ b/internal/protocols/mpegts/to_stream_test.go @@ -10,9 +10,10 @@ import ( "github.com/bluenviron/gortsplib/v5/pkg/description" "github.com/bluenviron/gortsplib/v5/pkg/format" "github.com/bluenviron/mediacommon/v2/pkg/codecs/mpeg4audio" + "github.com/stretchr/testify/require" + "github.com/bluenviron/mediamtx/internal/logger" "github.com/bluenviron/mediamtx/internal/test" - "github.com/stretchr/testify/require" ) func TestToStream(t *testing.T) { diff --git a/internal/protocols/rtmp/from_stream.go b/internal/protocols/rtmp/from_stream.go index 18b50cc3..21484894 100644 --- a/internal/protocols/rtmp/from_stream.go +++ b/internal/protocols/rtmp/from_stream.go @@ -22,6 +22,7 @@ import ( "github.com/bluenviron/mediacommon/v2/pkg/codecs/mpeg1audio" "github.com/bluenviron/mediacommon/v2/pkg/codecs/mpeg4audio" "github.com/bluenviron/mediacommon/v2/pkg/codecs/opus" + "github.com/bluenviron/mediamtx/internal/formatlabel" "github.com/bluenviron/mediamtx/internal/logger" "github.com/bluenviron/mediamtx/internal/stream" diff --git a/internal/protocols/rtmp/from_stream_test.go b/internal/protocols/rtmp/from_stream_test.go index 0a4cfe83..93430d9a 100644 --- a/internal/protocols/rtmp/from_stream_test.go +++ b/internal/protocols/rtmp/from_stream_test.go @@ -16,11 +16,12 @@ import ( "github.com/bluenviron/mediacommon/v2/pkg/codecs/flac" "github.com/bluenviron/mediacommon/v2/pkg/codecs/mpeg4audio" "github.com/bluenviron/mediacommon/v2/pkg/codecs/opus" + "github.com/stretchr/testify/require" + "github.com/bluenviron/mediamtx/internal/logger" "github.com/bluenviron/mediamtx/internal/stream" "github.com/bluenviron/mediamtx/internal/test" "github.com/bluenviron/mediamtx/internal/unit" - "github.com/stretchr/testify/require" ) var ( diff --git a/internal/protocols/rtmp/to_stream.go b/internal/protocols/rtmp/to_stream.go index 318207dc..4881bd2b 100644 --- a/internal/protocols/rtmp/to_stream.go +++ b/internal/protocols/rtmp/to_stream.go @@ -11,6 +11,7 @@ import ( "github.com/bluenviron/gortmplib/pkg/message" "github.com/bluenviron/gortsplib/v5/pkg/description" "github.com/bluenviron/gortsplib/v5/pkg/format" + "github.com/bluenviron/mediamtx/internal/stream" "github.com/bluenviron/mediamtx/internal/unit" ) diff --git a/internal/protocols/rtsp/credentials.go b/internal/protocols/rtsp/credentials.go index dd73c0ee..bd73e164 100644 --- a/internal/protocols/rtsp/credentials.go +++ b/internal/protocols/rtsp/credentials.go @@ -3,6 +3,7 @@ package rtsp import ( "github.com/bluenviron/gortsplib/v5/pkg/base" "github.com/bluenviron/gortsplib/v5/pkg/headers" + "github.com/bluenviron/mediamtx/internal/auth" ) diff --git a/internal/protocols/rtsp/credentials_test.go b/internal/protocols/rtsp/credentials_test.go index 6e9a6201..050c89e1 100644 --- a/internal/protocols/rtsp/credentials_test.go +++ b/internal/protocols/rtsp/credentials_test.go @@ -4,8 +4,9 @@ import ( "testing" "github.com/bluenviron/gortsplib/v5/pkg/base" - "github.com/bluenviron/mediamtx/internal/auth" "github.com/stretchr/testify/require" + + "github.com/bluenviron/mediamtx/internal/auth" ) func TestCredentials(t *testing.T) { diff --git a/internal/protocols/rtsp/to_stream.go b/internal/protocols/rtsp/to_stream.go index b45577be..d96221e2 100644 --- a/internal/protocols/rtsp/to_stream.go +++ b/internal/protocols/rtsp/to_stream.go @@ -7,11 +7,12 @@ import ( "github.com/bluenviron/gortsplib/v5" "github.com/bluenviron/gortsplib/v5/pkg/description" "github.com/bluenviron/gortsplib/v5/pkg/format" + "github.com/pion/rtp" + "github.com/bluenviron/mediamtx/internal/conf" "github.com/bluenviron/mediamtx/internal/logger" "github.com/bluenviron/mediamtx/internal/stream" "github.com/bluenviron/mediamtx/internal/unit" - "github.com/pion/rtp" ) type ntpState int diff --git a/internal/protocols/udp/listener.go b/internal/protocols/udp/listener.go index 3699e457..1c63cb63 100644 --- a/internal/protocols/udp/listener.go +++ b/internal/protocols/udp/listener.go @@ -9,6 +9,7 @@ import ( "github.com/bluenviron/gortsplib/v5/pkg/multicast" "github.com/bluenviron/gortsplib/v5/pkg/readbuffer" + "github.com/bluenviron/mediamtx/internal/restrictnetwork" ) diff --git a/internal/protocols/webrtc/from_stream.go b/internal/protocols/webrtc/from_stream.go index d70db5a3..f8718c6f 100644 --- a/internal/protocols/webrtc/from_stream.go +++ b/internal/protocols/webrtc/from_stream.go @@ -17,12 +17,13 @@ import ( "github.com/bluenviron/gortsplib/v5/pkg/format/rtpvp9" "github.com/bluenviron/mediacommon/v2/pkg/codecs/g711" "github.com/bluenviron/mediacommon/v2/pkg/codecs/opus" + "github.com/pion/rtp" + "github.com/pion/webrtc/v4" + "github.com/bluenviron/mediamtx/internal/formatlabel" "github.com/bluenviron/mediamtx/internal/logger" "github.com/bluenviron/mediamtx/internal/stream" "github.com/bluenviron/mediamtx/internal/unit" - "github.com/pion/rtp" - "github.com/pion/webrtc/v4" ) const ( diff --git a/internal/protocols/webrtc/from_stream_test.go b/internal/protocols/webrtc/from_stream_test.go index 83058f49..fc652f11 100644 --- a/internal/protocols/webrtc/from_stream_test.go +++ b/internal/protocols/webrtc/from_stream_test.go @@ -7,13 +7,14 @@ import ( "github.com/bluenviron/gortsplib/v5/pkg/description" "github.com/bluenviron/gortsplib/v5/pkg/format" + "github.com/pion/rtp" + "github.com/stretchr/testify/require" + "github.com/bluenviron/mediamtx/internal/logger" "github.com/bluenviron/mediamtx/internal/protocols/webrtc" "github.com/bluenviron/mediamtx/internal/stream" "github.com/bluenviron/mediamtx/internal/test" "github.com/bluenviron/mediamtx/internal/unit" - "github.com/pion/rtp" - "github.com/stretchr/testify/require" ) func TestFromStreamNoSupportedCodecs(t *testing.T) { diff --git a/internal/protocols/webrtc/peer_connection_test.go b/internal/protocols/webrtc/peer_connection_test.go index 0bbb0d9e..b2ebf0e2 100644 --- a/internal/protocols/webrtc/peer_connection_test.go +++ b/internal/protocols/webrtc/peer_connection_test.go @@ -8,7 +8,6 @@ import ( "testing" "time" - "github.com/bluenviron/mediamtx/internal/test" "github.com/pion/ice/v4" "github.com/pion/logging" "github.com/pion/rtcp" @@ -16,6 +15,8 @@ import ( "github.com/pion/sdp/v3" "github.com/pion/webrtc/v4" "github.com/stretchr/testify/require" + + "github.com/bluenviron/mediamtx/internal/test" ) type nilWriter struct{} diff --git a/internal/protocols/webrtc/to_stream.go b/internal/protocols/webrtc/to_stream.go index 5e7580fa..a03ed20d 100644 --- a/internal/protocols/webrtc/to_stream.go +++ b/internal/protocols/webrtc/to_stream.go @@ -9,12 +9,13 @@ import ( "github.com/bluenviron/gortsplib/v5/pkg/description" "github.com/bluenviron/gortsplib/v5/pkg/format" "github.com/bluenviron/gortsplib/v5/pkg/rtptime" + "github.com/pion/rtp" + "github.com/pion/webrtc/v4" + "github.com/bluenviron/mediamtx/internal/conf" "github.com/bluenviron/mediamtx/internal/logger" "github.com/bluenviron/mediamtx/internal/stream" "github.com/bluenviron/mediamtx/internal/unit" - "github.com/pion/rtp" - "github.com/pion/webrtc/v4" ) type ntpState int diff --git a/internal/protocols/webrtc/to_stream_test.go b/internal/protocols/webrtc/to_stream_test.go index a836c766..ed9b4049 100644 --- a/internal/protocols/webrtc/to_stream_test.go +++ b/internal/protocols/webrtc/to_stream_test.go @@ -4,16 +4,15 @@ import ( "testing" "time" - "github.com/bluenviron/mediamtx/internal/protocols/webrtc" - - pwebrtc "github.com/pion/webrtc/v4" - "github.com/bluenviron/gortsplib/v5/pkg/format" + "github.com/pion/rtp" + pwebrtc "github.com/pion/webrtc/v4" + "github.com/stretchr/testify/require" + "github.com/bluenviron/mediamtx/internal/conf" + "github.com/bluenviron/mediamtx/internal/protocols/webrtc" "github.com/bluenviron/mediamtx/internal/stream" "github.com/bluenviron/mediamtx/internal/test" - "github.com/pion/rtp" - "github.com/stretchr/testify/require" ) func TestToStreamNoSupportedCodecs(t *testing.T) { diff --git a/internal/protocols/whip/client_test.go b/internal/protocols/whip/client_test.go index 69848e24..1af978c6 100644 --- a/internal/protocols/whip/client_test.go +++ b/internal/protocols/whip/client_test.go @@ -10,11 +10,12 @@ import ( "testing" "time" - "github.com/bluenviron/mediamtx/internal/protocols/webrtc" - "github.com/bluenviron/mediamtx/internal/test" "github.com/pion/rtp" pwebrtc "github.com/pion/webrtc/v4" "github.com/stretchr/testify/require" + + "github.com/bluenviron/mediamtx/internal/protocols/webrtc" + "github.com/bluenviron/mediamtx/internal/test" ) func whipOffer(body []byte) *pwebrtc.SessionDescription { diff --git a/internal/recordcleaner/cleaner_test.go b/internal/recordcleaner/cleaner_test.go index a2cc84fe..964dc0a4 100644 --- a/internal/recordcleaner/cleaner_test.go +++ b/internal/recordcleaner/cleaner_test.go @@ -7,9 +7,10 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/bluenviron/mediamtx/internal/conf" "github.com/bluenviron/mediamtx/internal/test" - "github.com/stretchr/testify/require" ) func TestCleaner(t *testing.T) { diff --git a/internal/recorder/format_fmp4_part.go b/internal/recorder/format_fmp4_part.go index 1746f0f2..664e75f1 100644 --- a/internal/recorder/format_fmp4_part.go +++ b/internal/recorder/format_fmp4_part.go @@ -7,6 +7,7 @@ import ( "github.com/bluenviron/mediacommon/v2/pkg/formats/fmp4" "github.com/bluenviron/mediacommon/v2/pkg/formats/fmp4/seekablebuffer" + "github.com/bluenviron/mediamtx/internal/conf" ) diff --git a/internal/recorder/format_fmp4_segment.go b/internal/recorder/format_fmp4_segment.go index 807a117a..5772b7c5 100644 --- a/internal/recorder/format_fmp4_segment.go +++ b/internal/recorder/format_fmp4_segment.go @@ -11,9 +11,10 @@ import ( amp4 "github.com/abema/go-mp4" "github.com/bluenviron/mediacommon/v2/pkg/formats/fmp4" "github.com/bluenviron/mediacommon/v2/pkg/formats/fmp4/seekablebuffer" + "github.com/google/uuid" + "github.com/bluenviron/mediamtx/internal/logger" "github.com/bluenviron/mediamtx/internal/recordstore" - "github.com/google/uuid" ) func writeInit( diff --git a/internal/recorder/format_fmp4_track.go b/internal/recorder/format_fmp4_track.go index 9c3f867d..ff64400c 100644 --- a/internal/recorder/format_fmp4_track.go +++ b/internal/recorder/format_fmp4_track.go @@ -6,6 +6,7 @@ import ( "github.com/bluenviron/mediacommon/v2/pkg/formats/fmp4" mcodecs "github.com/bluenviron/mediacommon/v2/pkg/formats/mp4/codecs" + "github.com/bluenviron/mediamtx/internal/logger" ) diff --git a/internal/recordstore/segment_test.go b/internal/recordstore/segment_test.go index 768d3096..8dd3e98f 100644 --- a/internal/recordstore/segment_test.go +++ b/internal/recordstore/segment_test.go @@ -7,8 +7,9 @@ import ( "testing" "time" - "github.com/bluenviron/mediamtx/internal/conf" "github.com/stretchr/testify/require" + + "github.com/bluenviron/mediamtx/internal/conf" ) func TestFindAllPathsWithSegments(t *testing.T) { diff --git a/internal/servers/hls/muxer.go b/internal/servers/hls/muxer.go index 3bb1ce37..4ed80382 100644 --- a/internal/servers/hls/muxer.go +++ b/internal/servers/hls/muxer.go @@ -9,13 +9,14 @@ import ( "time" "github.com/bluenviron/gortsplib/v5/pkg/format" + "github.com/gin-gonic/gin" + "github.com/google/uuid" + "github.com/bluenviron/mediamtx/internal/conf" "github.com/bluenviron/mediamtx/internal/defs" "github.com/bluenviron/mediamtx/internal/logger" "github.com/bluenviron/mediamtx/internal/protocols/hls" "github.com/bluenviron/mediamtx/internal/stream" - "github.com/gin-gonic/gin" - "github.com/google/uuid" ) const ( diff --git a/internal/servers/hls/muxer_instance.go b/internal/servers/hls/muxer_instance.go index eb221ac4..3047c249 100644 --- a/internal/servers/hls/muxer_instance.go +++ b/internal/servers/hls/muxer_instance.go @@ -11,12 +11,13 @@ import ( "time" "github.com/bluenviron/gohlslib/v2" + "github.com/gin-gonic/gin" + "github.com/bluenviron/mediamtx/internal/conf" "github.com/bluenviron/mediamtx/internal/defs" "github.com/bluenviron/mediamtx/internal/logger" "github.com/bluenviron/mediamtx/internal/protocols/hls" "github.com/bluenviron/mediamtx/internal/stream" - "github.com/gin-gonic/gin" ) const ( diff --git a/internal/servers/hls/server.go b/internal/servers/hls/server.go index 3c32c471..4d9f25bb 100644 --- a/internal/servers/hls/server.go +++ b/internal/servers/hls/server.go @@ -9,11 +9,12 @@ import ( "sort" "sync" + "github.com/google/uuid" + "github.com/bluenviron/mediamtx/internal/conf" "github.com/bluenviron/mediamtx/internal/defs" "github.com/bluenviron/mediamtx/internal/externalcmd" "github.com/bluenviron/mediamtx/internal/logger" - "github.com/google/uuid" ) // ErrMuxerNotFound is returned when a muxer is not found. diff --git a/internal/servers/hls/server_test.go b/internal/servers/hls/server_test.go index 2f4ed5ce..094ce5d2 100644 --- a/internal/servers/hls/server_test.go +++ b/internal/servers/hls/server_test.go @@ -15,6 +15,8 @@ import ( "github.com/bluenviron/gortsplib/v5/pkg/description" "github.com/bluenviron/gortsplib/v5/pkg/format" "github.com/bluenviron/mediacommon/v2/pkg/codecs/mpeg4audio" + "github.com/stretchr/testify/require" + "github.com/bluenviron/mediamtx/internal/auth" "github.com/bluenviron/mediamtx/internal/conf" "github.com/bluenviron/mediamtx/internal/defs" @@ -22,7 +24,6 @@ import ( "github.com/bluenviron/mediamtx/internal/stream" "github.com/bluenviron/mediamtx/internal/test" "github.com/bluenviron/mediamtx/internal/unit" - "github.com/stretchr/testify/require" ) type dummyPathManager struct { diff --git a/internal/servers/hls/session.go b/internal/servers/hls/session.go index 6cd188a4..ae597d45 100644 --- a/internal/servers/hls/session.go +++ b/internal/servers/hls/session.go @@ -7,6 +7,9 @@ import ( "sync/atomic" "time" + "github.com/gin-gonic/gin" + "github.com/google/uuid" + "github.com/bluenviron/mediamtx/internal/auth" "github.com/bluenviron/mediamtx/internal/defs" "github.com/bluenviron/mediamtx/internal/externalcmd" @@ -15,8 +18,6 @@ import ( "github.com/bluenviron/mediamtx/internal/protocols/httpp" "github.com/bluenviron/mediamtx/internal/stream" "github.com/bluenviron/mediamtx/internal/unit" - "github.com/gin-gonic/gin" - "github.com/google/uuid" ) type sessionServer interface { diff --git a/internal/servers/moq/conn_quic.go b/internal/servers/moq/conn_quic.go index a857d812..228220a5 100644 --- a/internal/servers/moq/conn_quic.go +++ b/internal/servers/moq/conn_quic.go @@ -5,8 +5,9 @@ import ( "io" "net" - "github.com/bluenviron/mediamtx/internal/defs" "github.com/quic-go/quic-go" + + "github.com/bluenviron/mediamtx/internal/defs" ) type connQUIC struct { diff --git a/internal/servers/moq/conn_webtransport.go b/internal/servers/moq/conn_webtransport.go index b5773853..948db4a5 100644 --- a/internal/servers/moq/conn_webtransport.go +++ b/internal/servers/moq/conn_webtransport.go @@ -5,8 +5,9 @@ import ( "io" "net" - "github.com/bluenviron/mediamtx/internal/defs" "github.com/quic-go/webtransport-go" + + "github.com/bluenviron/mediamtx/internal/defs" ) type connWebTransport struct { diff --git a/internal/servers/moq/native_listener.go b/internal/servers/moq/native_listener.go index 9b843cb8..3f20849c 100644 --- a/internal/servers/moq/native_listener.go +++ b/internal/servers/moq/native_listener.go @@ -9,9 +9,10 @@ import ( "strings" "github.com/bluenviron/gortsplib/v5/pkg/readbuffer" + "github.com/quic-go/quic-go" + "github.com/bluenviron/mediamtx/internal/defs" "github.com/bluenviron/mediamtx/internal/logger" - "github.com/quic-go/quic-go" ) var supportedMoqtALPNs = []string{ diff --git a/internal/servers/moq/server.go b/internal/servers/moq/server.go index a2e05359..47202858 100644 --- a/internal/servers/moq/server.go +++ b/internal/servers/moq/server.go @@ -8,10 +8,11 @@ import ( "reflect" "sync" + "github.com/google/uuid" + "github.com/bluenviron/mediamtx/internal/conf" "github.com/bluenviron/mediamtx/internal/defs" "github.com/bluenviron/mediamtx/internal/logger" - "github.com/google/uuid" ) // ErrSessionNotFound is returned when a session is not found. diff --git a/internal/servers/moq/server_test.go b/internal/servers/moq/server_test.go index 0cd2fc4c..c41d3d35 100644 --- a/internal/servers/moq/server_test.go +++ b/internal/servers/moq/server_test.go @@ -11,6 +11,10 @@ import ( "github.com/bluenviron/gortsplib/v5/pkg/description" "github.com/bluenviron/mediacommon/v2/pkg/codecs/h264" + "github.com/quic-go/quic-go" + "github.com/quic-go/webtransport-go" + "github.com/stretchr/testify/require" + "github.com/bluenviron/mediamtx/internal/auth" "github.com/bluenviron/mediamtx/internal/conf" "github.com/bluenviron/mediamtx/internal/defs" @@ -23,9 +27,6 @@ import ( "github.com/bluenviron/mediamtx/internal/stream" "github.com/bluenviron/mediamtx/internal/test" "github.com/bluenviron/mediamtx/internal/unit" - "github.com/quic-go/quic-go" - "github.com/quic-go/webtransport-go" - "github.com/stretchr/testify/require" ) type serverDummyPath struct{} diff --git a/internal/servers/moq/session.go b/internal/servers/moq/session.go index b2e16a84..c3620283 100644 --- a/internal/servers/moq/session.go +++ b/internal/servers/moq/session.go @@ -18,6 +18,9 @@ import ( "time" "github.com/bluenviron/gortsplib/v5/pkg/description" + "github.com/google/uuid" + "golang.org/x/sync/errgroup" + "github.com/bluenviron/mediamtx/internal/auth" "github.com/bluenviron/mediamtx/internal/defs" "github.com/bluenviron/mediamtx/internal/logger" @@ -28,8 +31,6 @@ import ( "github.com/bluenviron/mediamtx/internal/protocols/moq/property" "github.com/bluenviron/mediamtx/internal/protocols/moq/subgroup" "github.com/bluenviron/mediamtx/internal/stream" - "github.com/google/uuid" - "golang.org/x/sync/errgroup" ) const maxReorderedSubGroups = 50 diff --git a/internal/servers/rtmp/server_test.go b/internal/servers/rtmp/server_test.go index 73aa590c..e07937f7 100644 --- a/internal/servers/rtmp/server_test.go +++ b/internal/servers/rtmp/server_test.go @@ -13,6 +13,7 @@ import ( "github.com/bluenviron/gortmplib/pkg/codecs" "github.com/bluenviron/gortsplib/v5/pkg/description" "github.com/pires/go-proxyproto" + "github.com/stretchr/testify/require" "github.com/bluenviron/mediamtx/internal/auth" "github.com/bluenviron/mediamtx/internal/conf" @@ -21,7 +22,6 @@ import ( "github.com/bluenviron/mediamtx/internal/stream" "github.com/bluenviron/mediamtx/internal/test" "github.com/bluenviron/mediamtx/internal/unit" - "github.com/stretchr/testify/require" ) type dummyPath struct{} diff --git a/internal/servers/rtsp/server_test.go b/internal/servers/rtsp/server_test.go index 18fbb9dd..1001ec1c 100644 --- a/internal/servers/rtsp/server_test.go +++ b/internal/servers/rtsp/server_test.go @@ -17,7 +17,9 @@ import ( "github.com/bluenviron/gortsplib/v5/pkg/format" "github.com/bluenviron/mediacommon/v2/pkg/formats/mpegts" tscodecs "github.com/bluenviron/mediacommon/v2/pkg/formats/mpegts/codecs" + "github.com/pion/rtp" "github.com/pires/go-proxyproto" + "github.com/stretchr/testify/require" "github.com/bluenviron/mediamtx/internal/auth" "github.com/bluenviron/mediamtx/internal/conf" @@ -26,8 +28,6 @@ import ( "github.com/bluenviron/mediamtx/internal/stream" "github.com/bluenviron/mediamtx/internal/test" "github.com/bluenviron/mediamtx/internal/unit" - "github.com/pion/rtp" - "github.com/stretchr/testify/require" ) type dummyPath struct{} diff --git a/internal/servers/srt/server_test.go b/internal/servers/srt/server_test.go index cc094f17..9a870dc7 100644 --- a/internal/servers/srt/server_test.go +++ b/internal/servers/srt/server_test.go @@ -9,6 +9,9 @@ import ( "github.com/bluenviron/gortsplib/v5/pkg/description" "github.com/bluenviron/mediacommon/v2/pkg/formats/mpegts" tscodecs "github.com/bluenviron/mediacommon/v2/pkg/formats/mpegts/codecs" + srt "github.com/datarhei/gosrt" + "github.com/stretchr/testify/require" + "github.com/bluenviron/mediamtx/internal/auth" "github.com/bluenviron/mediamtx/internal/conf" "github.com/bluenviron/mediamtx/internal/defs" @@ -16,8 +19,6 @@ import ( "github.com/bluenviron/mediamtx/internal/stream" "github.com/bluenviron/mediamtx/internal/test" "github.com/bluenviron/mediamtx/internal/unit" - srt "github.com/datarhei/gosrt" - "github.com/stretchr/testify/require" ) type dummyPath struct{} diff --git a/internal/servers/webrtc/server.go b/internal/servers/webrtc/server.go index a5c3071e..72a1292c 100644 --- a/internal/servers/webrtc/server.go +++ b/internal/servers/webrtc/server.go @@ -17,12 +17,12 @@ import ( "sync" "time" + "github.com/bluenviron/gortsplib/v5/pkg/readbuffer" "github.com/google/uuid" "github.com/pion/ice/v4" "github.com/pion/logging" pwebrtc "github.com/pion/webrtc/v4" - "github.com/bluenviron/gortsplib/v5/pkg/readbuffer" "github.com/bluenviron/mediamtx/internal/conf" "github.com/bluenviron/mediamtx/internal/defs" "github.com/bluenviron/mediamtx/internal/externalcmd" diff --git a/internal/servers/webrtc/server_test.go b/internal/servers/webrtc/server_test.go index f2789fda..8d1d4adf 100644 --- a/internal/servers/webrtc/server_test.go +++ b/internal/servers/webrtc/server_test.go @@ -14,6 +14,12 @@ import ( "github.com/bluenviron/gortsplib/v5/pkg/description" "github.com/bluenviron/gortsplib/v5/pkg/format" + "github.com/google/uuid" + "github.com/pion/rtp" + "github.com/pion/sdp/v3" + pwebrtc "github.com/pion/webrtc/v4" + "github.com/stretchr/testify/require" + "github.com/bluenviron/mediamtx/internal/auth" "github.com/bluenviron/mediamtx/internal/conf" "github.com/bluenviron/mediamtx/internal/defs" @@ -23,11 +29,6 @@ import ( "github.com/bluenviron/mediamtx/internal/stream" "github.com/bluenviron/mediamtx/internal/test" "github.com/bluenviron/mediamtx/internal/unit" - "github.com/google/uuid" - "github.com/pion/rtp" - "github.com/pion/sdp/v3" - pwebrtc "github.com/pion/webrtc/v4" - "github.com/stretchr/testify/require" ) func whipAnswer(body []byte) *pwebrtc.SessionDescription { diff --git a/internal/staticsources/rpicamera/source_arm_.go b/internal/staticsources/rpicamera/source_arm_.go index 83ac3b16..d8581992 100644 --- a/internal/staticsources/rpicamera/source_arm_.go +++ b/internal/staticsources/rpicamera/source_arm_.go @@ -13,11 +13,12 @@ import ( "github.com/bluenviron/gortsplib/v5/pkg/format/rtph264" "github.com/bluenviron/gortsplib/v5/pkg/format/rtpmjpeg" "github.com/bluenviron/mediacommon/v2/pkg/codecs/h264" + "github.com/pion/rtp" + "github.com/bluenviron/mediamtx/internal/defs" "github.com/bluenviron/mediamtx/internal/logger" "github.com/bluenviron/mediamtx/internal/stream" "github.com/bluenviron/mediamtx/internal/unit" - "github.com/pion/rtp" ) const ( diff --git a/internal/staticsources/rtmp/source_test.go b/internal/staticsources/rtmp/source_test.go index fe339cf1..986b60c4 100644 --- a/internal/staticsources/rtmp/source_test.go +++ b/internal/staticsources/rtmp/source_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" - "github.com/stretchr/testify/require" - "github.com/bluenviron/gortmplib" "github.com/bluenviron/gortmplib/pkg/codecs" + "github.com/stretchr/testify/require" + "github.com/bluenviron/mediamtx/internal/conf" "github.com/bluenviron/mediamtx/internal/defs" "github.com/bluenviron/mediamtx/internal/staticsources/rtmp" diff --git a/internal/staticsources/rtp/source.go b/internal/staticsources/rtp/source.go index 2ee9b2a5..b2ecd973 100644 --- a/internal/staticsources/rtp/source.go +++ b/internal/staticsources/rtp/source.go @@ -10,6 +10,8 @@ import ( "github.com/bluenviron/gortsplib/v5/pkg/description" "github.com/bluenviron/gortsplib/v5/pkg/rtptime" "github.com/bluenviron/gortsplib/v5/pkg/sdpunmarshaler" + "github.com/pion/rtp" + "github.com/bluenviron/mediamtx/internal/conf" "github.com/bluenviron/mediamtx/internal/counterdumper" "github.com/bluenviron/mediamtx/internal/defs" @@ -20,7 +22,6 @@ import ( "github.com/bluenviron/mediamtx/internal/protocols/unix" "github.com/bluenviron/mediamtx/internal/stream" "github.com/bluenviron/mediamtx/internal/unit" - "github.com/pion/rtp" ) type parent interface { diff --git a/internal/staticsources/webrtc/source_test.go b/internal/staticsources/webrtc/source_test.go index 9efcae64..a46b2461 100644 --- a/internal/staticsources/webrtc/source_test.go +++ b/internal/staticsources/webrtc/source_test.go @@ -9,6 +9,7 @@ import ( "time" "github.com/pion/rtp" + webrtclib "github.com/pion/webrtc/v4" "github.com/stretchr/testify/require" "github.com/bluenviron/mediamtx/internal/conf" @@ -16,7 +17,6 @@ import ( pwebrtc "github.com/bluenviron/mediamtx/internal/protocols/webrtc" "github.com/bluenviron/mediamtx/internal/staticsources/webrtc" "github.com/bluenviron/mediamtx/internal/test" - webrtclib "github.com/pion/webrtc/v4" ) func whipOffer(body []byte) *webrtclib.SessionDescription { diff --git a/internal/stream/format_updater.go b/internal/stream/format_updater.go index 3be70012..0f42ae5d 100644 --- a/internal/stream/format_updater.go +++ b/internal/stream/format_updater.go @@ -7,6 +7,7 @@ import ( "github.com/bluenviron/mediacommon/v2/pkg/codecs/h264" "github.com/bluenviron/mediacommon/v2/pkg/codecs/h265" "github.com/bluenviron/mediacommon/v2/pkg/codecs/mpeg4video" + "github.com/bluenviron/mediamtx/internal/unit" ) diff --git a/internal/stream/format_updater_test.go b/internal/stream/format_updater_test.go index 82161c9a..43c06e5f 100644 --- a/internal/stream/format_updater_test.go +++ b/internal/stream/format_updater_test.go @@ -5,9 +5,10 @@ import ( "github.com/bluenviron/gortsplib/v5/pkg/description" "github.com/bluenviron/gortsplib/v5/pkg/format" + "github.com/stretchr/testify/require" + "github.com/bluenviron/mediamtx/internal/stream" "github.com/bluenviron/mediamtx/internal/unit" - "github.com/stretchr/testify/require" ) func TestFormatUpdater(t *testing.T) { diff --git a/internal/stream/offline_sub_stream_track.go b/internal/stream/offline_sub_stream_track.go index da1d3846..965fb480 100644 --- a/internal/stream/offline_sub_stream_track.go +++ b/internal/stream/offline_sub_stream_track.go @@ -16,6 +16,7 @@ import ( "github.com/bluenviron/mediacommon/v2/pkg/codecs/mpeg4audio" mcodecs "github.com/bluenviron/mediacommon/v2/pkg/formats/mp4/codecs" "github.com/bluenviron/mediacommon/v2/pkg/formats/pmp4" + "github.com/bluenviron/mediamtx/internal/unit" ) diff --git a/internal/stream/reader.go b/internal/stream/reader.go index 4186d615..76be7f92 100644 --- a/internal/stream/reader.go +++ b/internal/stream/reader.go @@ -6,6 +6,7 @@ import ( "github.com/bluenviron/gortsplib/v5/pkg/description" "github.com/bluenviron/gortsplib/v5/pkg/format" "github.com/bluenviron/gortsplib/v5/pkg/ringbuffer" + "github.com/bluenviron/mediamtx/internal/counterdumper" "github.com/bluenviron/mediamtx/internal/logger" "github.com/bluenviron/mediamtx/internal/unit" diff --git a/internal/stream/rtp_decoder.go b/internal/stream/rtp_decoder.go index edca4e78..dd3cf197 100644 --- a/internal/stream/rtp_decoder.go +++ b/internal/stream/rtp_decoder.go @@ -18,8 +18,9 @@ import ( "github.com/bluenviron/gortsplib/v5/pkg/format/rtpsimpleaudio" "github.com/bluenviron/gortsplib/v5/pkg/format/rtpvp8" "github.com/bluenviron/gortsplib/v5/pkg/format/rtpvp9" - "github.com/bluenviron/mediamtx/internal/unit" "github.com/pion/rtp" + + "github.com/bluenviron/mediamtx/internal/unit" ) type rtpDecoder interface { diff --git a/internal/stream/rtp_decoder_test.go b/internal/stream/rtp_decoder_test.go index e67fc898..3278b98f 100644 --- a/internal/stream/rtp_decoder_test.go +++ b/internal/stream/rtp_decoder_test.go @@ -5,11 +5,12 @@ import ( "github.com/bluenviron/gortsplib/v5/pkg/description" "github.com/bluenviron/gortsplib/v5/pkg/format" + "github.com/pion/rtp" + "github.com/stretchr/testify/require" + "github.com/bluenviron/mediamtx/internal/stream" "github.com/bluenviron/mediamtx/internal/test" "github.com/bluenviron/mediamtx/internal/unit" - "github.com/pion/rtp" - "github.com/stretchr/testify/require" ) var casesDecodeEncode = []struct { diff --git a/internal/stream/rtp_encoder.go b/internal/stream/rtp_encoder.go index c7beedfa..43ec3864 100644 --- a/internal/stream/rtp_encoder.go +++ b/internal/stream/rtp_encoder.go @@ -20,8 +20,9 @@ import ( "github.com/bluenviron/gortsplib/v5/pkg/format/rtpvp8" "github.com/bluenviron/gortsplib/v5/pkg/format/rtpvp9" mcopus "github.com/bluenviron/mediacommon/v2/pkg/codecs/opus" - "github.com/bluenviron/mediamtx/internal/unit" "github.com/pion/rtp" + + "github.com/bluenviron/mediamtx/internal/unit" ) type rtpEncoderNotAvailableError struct { diff --git a/internal/stream/rtp_encoder_test.go b/internal/stream/rtp_encoder_test.go index eef288d5..8ede3938 100644 --- a/internal/stream/rtp_encoder_test.go +++ b/internal/stream/rtp_encoder_test.go @@ -5,10 +5,11 @@ import ( "github.com/bluenviron/gortsplib/v5/pkg/description" "github.com/bluenviron/gortsplib/v5/pkg/format" + "github.com/stretchr/testify/require" + "github.com/bluenviron/mediamtx/internal/stream" "github.com/bluenviron/mediamtx/internal/test" "github.com/bluenviron/mediamtx/internal/unit" - "github.com/stretchr/testify/require" ) func TestRTPEncoder(t *testing.T) { diff --git a/internal/stream/stream_media.go b/internal/stream/stream_media.go index dac6afc8..d6f8d687 100644 --- a/internal/stream/stream_media.go +++ b/internal/stream/stream_media.go @@ -6,9 +6,10 @@ import ( "github.com/bluenviron/gortsplib/v5/pkg/description" "github.com/bluenviron/gortsplib/v5/pkg/format" + "github.com/pion/rtp" + "github.com/bluenviron/mediamtx/internal/errordumper" "github.com/bluenviron/mediamtx/internal/logger" - "github.com/pion/rtp" ) type streamMedia struct { diff --git a/internal/stream/stream_test.go b/internal/stream/stream_test.go index 9ed27ab5..9b2a39a3 100644 --- a/internal/stream/stream_test.go +++ b/internal/stream/stream_test.go @@ -11,11 +11,12 @@ import ( "github.com/bluenviron/mediacommon/v2/pkg/codecs/mpeg4audio" "github.com/bluenviron/mediacommon/v2/pkg/formats/mp4/codecs" "github.com/bluenviron/mediacommon/v2/pkg/formats/pmp4" + "github.com/pion/rtp" + "github.com/stretchr/testify/require" + "github.com/bluenviron/mediamtx/internal/conf" "github.com/bluenviron/mediamtx/internal/logger" "github.com/bluenviron/mediamtx/internal/unit" - "github.com/pion/rtp" - "github.com/stretchr/testify/require" ) type nilLogger struct{} diff --git a/internal/stream/sub_stream.go b/internal/stream/sub_stream.go index 57e83657..20ad64de 100644 --- a/internal/stream/sub_stream.go +++ b/internal/stream/sub_stream.go @@ -7,6 +7,7 @@ import ( "github.com/bluenviron/gortsplib/v5/pkg/description" "github.com/bluenviron/gortsplib/v5/pkg/format" "github.com/bluenviron/mediacommon/v2/pkg/codecs/mpeg4audio" + "github.com/bluenviron/mediamtx/internal/formatlabel" "github.com/bluenviron/mediamtx/internal/logger" "github.com/bluenviron/mediamtx/internal/unit" diff --git a/internal/stream/sub_stream_format.go b/internal/stream/sub_stream_format.go index f523ec95..e7f186a2 100644 --- a/internal/stream/sub_stream_format.go +++ b/internal/stream/sub_stream_format.go @@ -6,6 +6,7 @@ import ( "time" "github.com/bluenviron/gortsplib/v5/pkg/format" + "github.com/bluenviron/mediamtx/internal/logger" "github.com/bluenviron/mediamtx/internal/unit" ) diff --git a/internal/stream/unit_remuxer.go b/internal/stream/unit_remuxer.go index 8da521d6..565f319b 100644 --- a/internal/stream/unit_remuxer.go +++ b/internal/stream/unit_remuxer.go @@ -8,6 +8,7 @@ import ( "github.com/bluenviron/mediacommon/v2/pkg/codecs/h264" "github.com/bluenviron/mediacommon/v2/pkg/codecs/h265" "github.com/bluenviron/mediacommon/v2/pkg/codecs/mpeg4video" + "github.com/bluenviron/mediamtx/internal/unit" ) diff --git a/internal/stream/unit_remuxer_test.go b/internal/stream/unit_remuxer_test.go index fcfd53bb..2810b4cb 100644 --- a/internal/stream/unit_remuxer_test.go +++ b/internal/stream/unit_remuxer_test.go @@ -5,9 +5,10 @@ import ( "github.com/bluenviron/gortsplib/v5/pkg/description" "github.com/bluenviron/gortsplib/v5/pkg/format" + "github.com/stretchr/testify/require" + "github.com/bluenviron/mediamtx/internal/stream" "github.com/bluenviron/mediamtx/internal/unit" - "github.com/stretchr/testify/require" ) func TestUnitRemuxer(t *testing.T) { diff --git a/internal/teste2e/rtsp_server_test.go b/internal/teste2e/rtsp_server_test.go index 82590b93..8d7cb8a3 100644 --- a/internal/teste2e/rtsp_server_test.go +++ b/internal/teste2e/rtsp_server_test.go @@ -6,8 +6,9 @@ import ( "testing" "time" - "github.com/bluenviron/mediamtx/internal/test" "github.com/stretchr/testify/require" + + "github.com/bluenviron/mediamtx/internal/test" ) func TestRTSPServerPublishRead(t *testing.T) { diff --git a/scripts/format.mk b/scripts/format.mk index b947b8b7..774ffc21 100644 --- a/scripts/format.mk +++ b/scripts/format.mk @@ -1,9 +1,3 @@ -define DOCKERFILE_FORMAT -FROM $(BASE_IMAGE) -RUN go install mvdan.cc/gofumpt@v0.5.0 -endef -export DOCKERFILE_FORMAT - define DOCKERFILE_PRETTIER FROM $(NODE_IMAGE) RUN yarn global add prettier@3.6.2 @@ -11,9 +5,9 @@ endef export DOCKERFILE_PRETTIER format-go: - echo "$$DOCKERFILE_FORMAT" | docker build -q . -f - -t temp - docker run --rm -it -v "$(shell pwd):/s" -w /s temp \ - sh -c "gofumpt -l -w ." + docker run --rm -v "$(shell pwd):/app" -w /app \ + $(GOLANGCI_LINT_IMAGE) \ + golangci-lint fmt format-other: echo "$$DOCKERFILE_PRETTIER" | docker build . -f - -t temp