diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 98f7d7bd..13d69e29 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -2,5 +2,5 @@ blank_issues_enabled: false contact_links: - name: Question - url: https://github.com/aler9/mediamtx/discussions/new + url: https://github.com/bluenviron/mediamtx/discussions/new about: Ask the community for help diff --git a/.github/workflows/issue-lint.yml b/.github/workflows/issue-lint.yml index 5c5fcbb9..514abb41 100644 --- a/.github/workflows/issue-lint.yml +++ b/.github/workflows/issue-lint.yml @@ -1,11 +1,11 @@ -name: issue-link +name: issue-lint on: issues: types: [opened] jobs: - issue-link: + issue-lint: runs-on: ubuntu-latest steps: diff --git a/README.md b/README.md index 353f60ba..ffbd9b7d 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@
-[_MediaMTX_](#important-announcement) / _rtsp-simple-server_ is a ready-to-use and zero-dependency server and proxy that allows users to publish, read and proxy live video and audio streams. +_MediaMTX_/ [_rtsp-simple-server_](#note-about-rtsp-simple-server) is a ready-to-use and zero-dependency server and proxy that allows users to publish, read and proxy live video and audio streams. Live streams can be published to the server with: @@ -44,20 +44,16 @@ Features: * Natively compatible with the Raspberry Pi Camera * Compatible with Linux, Windows and macOS, does not require any dependency or interpreter, it's a single executable -[![Test](https://github.com/aler9/mediamtx/workflows/test/badge.svg)](https://github.com/aler9/mediamtx/actions?query=workflow:test) -[![Lint](https://github.com/aler9/mediamtx/workflows/lint/badge.svg)](https://github.com/aler9/mediamtx/actions?query=workflow:lint) -[![CodeCov](https://codecov.io/gh/aler9/mediamtx/branch/main/graph/badge.svg)](https://app.codecov.io/gh/aler9/mediamtx/branch/main) -[![Release](https://img.shields.io/github/v/release/aler9/mediamtx)](https://github.com/aler9/mediamtx/releases) +[![Test](https://github.com/bluenviron/mediamtx/workflows/test/badge.svg)](https://github.com/bluenviron/mediamtx/actions?query=workflow:test) +[![Lint](https://github.com/bluenviron/mediamtx/workflows/lint/badge.svg)](https://github.com/bluenviron/mediamtx/actions?query=workflow:lint) +[![CodeCov](https://codecov.io/gh/bluenviron/mediamtx/branch/main/graph/badge.svg)](https://app.codecov.io/gh/bluenviron/mediamtx/branch/main) +[![Release](https://img.shields.io/github/v/release/bluenviron/mediamtx)](https://github.com/bluenviron/mediamtx/releases) [![Docker Hub](https://img.shields.io/badge/docker-aler9/rtsp--simple--server-blue)](https://hub.docker.com/r/aler9/rtsp-simple-server) [![API Documentation](https://img.shields.io/badge/api-documentation-blue)](https://aler9.github.io/mediamtx) -## Important announcement +## Note about rtsp-simple-server -_rtsp-simple-server_ is being rebranded as _MediaMTX_. The reason is pretty obvious: this project started as a RTSP server but has evolved into a much more versatile media server (i like to call it a "media broker", a message broker for media streams), that is not tied to the RTSP protocol anymore. Nothing will change regarding license, features and backward compatibility. - -Furthermore, my main open source projects are being transferred to the [bluenviron organization](https://github.com/bluenviron), in order to allow the community to maintain and evolve the code regardless of my personal availability. - -In the next months, the repository name and the Docker image name will be changed accordingly. +_rtsp-simple-server_ has been rebranded as _MediaMTX_. The reason is pretty obvious: this project started as a RTSP server but has evolved into a much more versatile media server (i like to call it a "media broker", a message broker for media streams), that is not tied to the RTSP protocol anymore. Nothing will change regarding license, features and backward compatibility. ## Table of contents @@ -120,7 +116,7 @@ In the next months, the repository name and the Docker image name will be change ### Standard -1. Download and extract a precompiled binary from the [release page](https://github.com/aler9/mediamtx/releases). +1. Download and extract a precompiled binary from the [release page](https://github.com/bluenviron/mediamtx/releases). 2. Start the server: @@ -142,7 +138,7 @@ The `--network=host` flag is mandatory since Docker can change the source port o docker run --rm -it -e MTX_PROTOCOLS=tcp -p 8554:8554 -p 1935:1935 -p 8888:8888 -p 8889:8889 aler9/rtsp-simple-server ``` -Please keep in mind that the Docker image doesn't include _FFmpeg_. if you need to use _FFmpeg_ for an external command or anything else, you need to build a Docker image that contains both _rtsp-simple-server_ and _FFmpeg_, by following instructions [here](https://github.com/aler9/mediamtx/discussions/278#discussioncomment-549104). +Please keep in mind that the Docker image doesn't include _FFmpeg_. if you need to use _FFmpeg_ for an external command or anything else, you need to build a Docker image that contains both _rtsp-simple-server_ and _FFmpeg_, by following instructions [here](https://github.com/bluenviron/mediamtx/discussions/278#discussioncomment-549104). ### OpenWRT @@ -160,8 +156,8 @@ Please keep in mind that the Docker image doesn't include _FFmpeg_. if you need ``` mkdir package/mediamtx - wget -O package/mediamtx/Makefile https://raw.githubusercontent.com/aler9/mediamtx/main/openwrt.mk - sed -i "s/v0.0.0/$(git ls-remote --tags --sort=v:refname https://github.com/aler9/mediamtx | tail -n1 | sed 's/.*\///; s/\^{}//')/" package/mediamtx/Makefile + wget -O package/mediamtx/Makefile https://raw.githubusercontent.com/bluenviron/mediamtx/main/openwrt.mk + sed -i "s/v0.0.0/$(git ls-remote --tags --sort=v:refname https://github.com/bluenviron/mediamtx | tail -n1 | sed 's/.*\///; s/\^{}//')/" package/mediamtx/Makefile ``` 4. Compile the server: @@ -434,7 +430,7 @@ The command inserted into `runOnDemand` will start only when a client requests t Systemd is the service manager used by Ubuntu, Debian and many other Linux distributions, and allows to launch _MediaMTX_ on boot. -Download a release bundle from the [release page](https://github.com/aler9/mediamtx/releases), unzip it, and move the executable and configuration in the system: +Download a release bundle from the [release page](https://github.com/bluenviron/mediamtx/releases), unzip it, and move the executable and configuration in the system: ``` sudo mv mediamtx /usr/local/bin/ diff --git a/go.mod b/go.mod index dc03349e..125fb0b4 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/aler9/mediamtx +module github.com/bluenviron/mediamtx go 1.20 diff --git a/internal/conf/conf.go b/internal/conf/conf.go index 3064171a..e2a6db15 100644 --- a/internal/conf/conf.go +++ b/internal/conf/conf.go @@ -14,10 +14,10 @@ import ( "github.com/bluenviron/gortsplib/v3" "github.com/bluenviron/gortsplib/v3/pkg/headers" - "github.com/aler9/mediamtx/internal/conf/decrypt" - "github.com/aler9/mediamtx/internal/conf/env" - "github.com/aler9/mediamtx/internal/conf/yaml" - "github.com/aler9/mediamtx/internal/logger" + "github.com/bluenviron/mediamtx/internal/conf/decrypt" + "github.com/bluenviron/mediamtx/internal/conf/env" + "github.com/bluenviron/mediamtx/internal/conf/yaml" + "github.com/bluenviron/mediamtx/internal/logger" ) func getSortedKeys(paths map[string]*PathConf) []string { diff --git a/internal/conf/conf_test.go b/internal/conf/conf_test.go index c466f74f..ee91db06 100644 --- a/internal/conf/conf_test.go +++ b/internal/conf/conf_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/crypto/nacl/secretbox" - "github.com/aler9/mediamtx/internal/logger" + "github.com/bluenviron/mediamtx/internal/logger" ) func writeTempFile(byts []byte) (string, error) { diff --git a/internal/conf/logdestination.go b/internal/conf/logdestination.go index 4e911b3a..c9493d7b 100644 --- a/internal/conf/logdestination.go +++ b/internal/conf/logdestination.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/aler9/mediamtx/internal/logger" + "github.com/bluenviron/mediamtx/internal/logger" ) // LogDestinations is the logDestionations parameter. diff --git a/internal/conf/loglevel.go b/internal/conf/loglevel.go index 3f337a9d..4c2f5b8d 100644 --- a/internal/conf/loglevel.go +++ b/internal/conf/loglevel.go @@ -4,7 +4,7 @@ import ( "encoding/json" "fmt" - "github.com/aler9/mediamtx/internal/logger" + "github.com/bluenviron/mediamtx/internal/logger" ) // LogLevel is the logLevel parameter. diff --git a/internal/core/api.go b/internal/core/api.go index 6babf981..7cdc4f0b 100644 --- a/internal/core/api.go +++ b/internal/core/api.go @@ -13,8 +13,8 @@ import ( "github.com/gin-gonic/gin" "github.com/google/uuid" - "github.com/aler9/mediamtx/internal/conf" - "github.com/aler9/mediamtx/internal/logger" + "github.com/bluenviron/mediamtx/internal/conf" + "github.com/bluenviron/mediamtx/internal/logger" ) func interfaceIsEmpty(i interface{}) bool { diff --git a/internal/core/api_test.go b/internal/core/api_test.go index d4c79999..1cbdf7b6 100644 --- a/internal/core/api_test.go +++ b/internal/core/api_test.go @@ -20,7 +20,7 @@ import ( "github.com/pion/rtp" "github.com/stretchr/testify/require" - "github.com/aler9/mediamtx/internal/rtmp" + "github.com/bluenviron/mediamtx/internal/rtmp" ) var testFormatH264 = &formats.H264{ diff --git a/internal/core/authentication.go b/internal/core/authentication.go index 6c847835..8d2e0d41 100644 --- a/internal/core/authentication.go +++ b/internal/core/authentication.go @@ -17,7 +17,7 @@ import ( "github.com/bluenviron/gortsplib/v3/pkg/url" "github.com/google/uuid" - "github.com/aler9/mediamtx/internal/conf" + "github.com/bluenviron/mediamtx/internal/conf" ) func sha256Base64(in string) string { diff --git a/internal/core/core.go b/internal/core/core.go index d7df2f3c..9dcec3d8 100644 --- a/internal/core/core.go +++ b/internal/core/core.go @@ -12,12 +12,12 @@ import ( "github.com/bluenviron/gortsplib/v3" "github.com/gin-gonic/gin" - "github.com/aler9/mediamtx/internal/conf" - "github.com/aler9/mediamtx/internal/confwatcher" - "github.com/aler9/mediamtx/internal/externalcmd" - "github.com/aler9/mediamtx/internal/logger" - "github.com/aler9/mediamtx/internal/rlimit" - "github.com/aler9/mediamtx/internal/rpicamera" + "github.com/bluenviron/mediamtx/internal/conf" + "github.com/bluenviron/mediamtx/internal/confwatcher" + "github.com/bluenviron/mediamtx/internal/externalcmd" + "github.com/bluenviron/mediamtx/internal/logger" + "github.com/bluenviron/mediamtx/internal/rlimit" + "github.com/bluenviron/mediamtx/internal/rpicamera" ) var version = "v0.0.0" diff --git a/internal/core/hls_http_server.go b/internal/core/hls_http_server.go index d4b571c0..a7c03ce7 100644 --- a/internal/core/hls_http_server.go +++ b/internal/core/hls_http_server.go @@ -12,8 +12,8 @@ import ( "github.com/gin-gonic/gin" - "github.com/aler9/mediamtx/internal/conf" - "github.com/aler9/mediamtx/internal/logger" + "github.com/bluenviron/mediamtx/internal/conf" + "github.com/bluenviron/mediamtx/internal/logger" ) type hlsHTTPServerParent interface { diff --git a/internal/core/hls_manager.go b/internal/core/hls_manager.go index 921828e5..8a40070d 100644 --- a/internal/core/hls_manager.go +++ b/internal/core/hls_manager.go @@ -6,8 +6,8 @@ import ( "sync" "time" - "github.com/aler9/mediamtx/internal/conf" - "github.com/aler9/mediamtx/internal/logger" + "github.com/bluenviron/mediamtx/internal/conf" + "github.com/bluenviron/mediamtx/internal/logger" ) type nilWriter struct{} diff --git a/internal/core/hls_muxer.go b/internal/core/hls_muxer.go index 92a0441c..7f2c9733 100644 --- a/internal/core/hls_muxer.go +++ b/internal/core/hls_muxer.go @@ -15,6 +15,7 @@ import ( "sync/atomic" "time" + "github.com/bluenviron/gohlslib" "github.com/bluenviron/gohlslib/pkg/codecs" "github.com/bluenviron/gortsplib/v3/pkg/formats" "github.com/bluenviron/gortsplib/v3/pkg/media" @@ -22,10 +23,9 @@ import ( "github.com/bluenviron/mediacommon/pkg/codecs/mpeg4audio" "github.com/gin-gonic/gin" - "github.com/aler9/mediamtx/internal/conf" - "github.com/aler9/mediamtx/internal/formatprocessor" - "github.com/aler9/mediamtx/internal/logger" - "github.com/bluenviron/gohlslib" + "github.com/bluenviron/mediamtx/internal/conf" + "github.com/bluenviron/mediamtx/internal/formatprocessor" + "github.com/bluenviron/mediamtx/internal/logger" ) const ( diff --git a/internal/core/hls_source.go b/internal/core/hls_source.go index dfa9f0e0..ffd9f7f9 100644 --- a/internal/core/hls_source.go +++ b/internal/core/hls_source.go @@ -15,9 +15,9 @@ import ( "github.com/bluenviron/gortsplib/v3/pkg/formats" "github.com/bluenviron/gortsplib/v3/pkg/media" - "github.com/aler9/mediamtx/internal/conf" - "github.com/aler9/mediamtx/internal/formatprocessor" - "github.com/aler9/mediamtx/internal/logger" + "github.com/bluenviron/mediamtx/internal/conf" + "github.com/bluenviron/mediamtx/internal/formatprocessor" + "github.com/bluenviron/mediamtx/internal/logger" ) type hlsSourceParent interface { diff --git a/internal/core/http_logger.go b/internal/core/http_logger.go index 9b4c3f54..3e6c5ee3 100644 --- a/internal/core/http_logger.go +++ b/internal/core/http_logger.go @@ -8,7 +8,7 @@ import ( "github.com/gin-gonic/gin" - "github.com/aler9/mediamtx/internal/logger" + "github.com/bluenviron/mediamtx/internal/logger" ) type httpLoggerWriter struct { diff --git a/internal/core/http_set_trusted_proxies.go b/internal/core/http_set_trusted_proxies.go index 2bac9d4f..9b1986b4 100644 --- a/internal/core/http_set_trusted_proxies.go +++ b/internal/core/http_set_trusted_proxies.go @@ -3,7 +3,7 @@ package core import ( "github.com/gin-gonic/gin" - "github.com/aler9/mediamtx/internal/conf" + "github.com/bluenviron/mediamtx/internal/conf" ) func httpSetTrustedProxies(router *gin.Engine, trustedProxies conf.IPsOrCIDRs) { diff --git a/internal/core/metrics.go b/internal/core/metrics.go index 3f9e1b45..d90bb0f7 100644 --- a/internal/core/metrics.go +++ b/internal/core/metrics.go @@ -12,8 +12,8 @@ import ( "github.com/gin-gonic/gin" - "github.com/aler9/mediamtx/internal/conf" - "github.com/aler9/mediamtx/internal/logger" + "github.com/bluenviron/mediamtx/internal/conf" + "github.com/bluenviron/mediamtx/internal/logger" ) func metric(key string, tags string, value int64) string { diff --git a/internal/core/metrics_test.go b/internal/core/metrics_test.go index 16deeda6..4ba4d8b1 100644 --- a/internal/core/metrics_test.go +++ b/internal/core/metrics_test.go @@ -12,7 +12,7 @@ import ( "github.com/bluenviron/gortsplib/v3/pkg/media" "github.com/stretchr/testify/require" - "github.com/aler9/mediamtx/internal/rtmp" + "github.com/bluenviron/mediamtx/internal/rtmp" ) func TestMetrics(t *testing.T) { diff --git a/internal/core/path.go b/internal/core/path.go index f3c8d0dd..f99a5f49 100644 --- a/internal/core/path.go +++ b/internal/core/path.go @@ -13,9 +13,9 @@ import ( "github.com/bluenviron/gortsplib/v3/pkg/media" "github.com/bluenviron/gortsplib/v3/pkg/url" - "github.com/aler9/mediamtx/internal/conf" - "github.com/aler9/mediamtx/internal/externalcmd" - "github.com/aler9/mediamtx/internal/logger" + "github.com/bluenviron/mediamtx/internal/conf" + "github.com/bluenviron/mediamtx/internal/externalcmd" + "github.com/bluenviron/mediamtx/internal/logger" ) func newEmptyTimer() *time.Timer { diff --git a/internal/core/path_manager.go b/internal/core/path_manager.go index b30943a4..ef33e26f 100644 --- a/internal/core/path_manager.go +++ b/internal/core/path_manager.go @@ -5,9 +5,9 @@ import ( "fmt" "sync" - "github.com/aler9/mediamtx/internal/conf" - "github.com/aler9/mediamtx/internal/externalcmd" - "github.com/aler9/mediamtx/internal/logger" + "github.com/bluenviron/mediamtx/internal/conf" + "github.com/bluenviron/mediamtx/internal/externalcmd" + "github.com/bluenviron/mediamtx/internal/logger" ) func pathConfCanBeUpdated(oldPathConf *conf.PathConf, newPathConf *conf.PathConf) bool { diff --git a/internal/core/pprof.go b/internal/core/pprof.go index 1a283da1..2e8c9c0b 100644 --- a/internal/core/pprof.go +++ b/internal/core/pprof.go @@ -10,8 +10,8 @@ import ( // start pprof _ "net/http/pprof" - "github.com/aler9/mediamtx/internal/conf" - "github.com/aler9/mediamtx/internal/logger" + "github.com/bluenviron/mediamtx/internal/conf" + "github.com/bluenviron/mediamtx/internal/logger" ) type pprofParent interface { diff --git a/internal/core/rpicamera_source.go b/internal/core/rpicamera_source.go index ed6f047b..d492f478 100644 --- a/internal/core/rpicamera_source.go +++ b/internal/core/rpicamera_source.go @@ -7,10 +7,10 @@ import ( "github.com/bluenviron/gortsplib/v3/pkg/formats" "github.com/bluenviron/gortsplib/v3/pkg/media" - "github.com/aler9/mediamtx/internal/conf" - "github.com/aler9/mediamtx/internal/formatprocessor" - "github.com/aler9/mediamtx/internal/logger" - "github.com/aler9/mediamtx/internal/rpicamera" + "github.com/bluenviron/mediamtx/internal/conf" + "github.com/bluenviron/mediamtx/internal/formatprocessor" + "github.com/bluenviron/mediamtx/internal/logger" + "github.com/bluenviron/mediamtx/internal/rpicamera" ) func paramsFromConf(cnf *conf.PathConf) rpicamera.Params { diff --git a/internal/core/rtmp_conn.go b/internal/core/rtmp_conn.go index 9b0f6d40..a67d607b 100644 --- a/internal/core/rtmp_conn.go +++ b/internal/core/rtmp_conn.go @@ -20,13 +20,13 @@ import ( "github.com/google/uuid" "github.com/notedit/rtmp/format/flv/flvio" - "github.com/aler9/mediamtx/internal/conf" - "github.com/aler9/mediamtx/internal/externalcmd" - "github.com/aler9/mediamtx/internal/formatprocessor" - "github.com/aler9/mediamtx/internal/logger" - "github.com/aler9/mediamtx/internal/rtmp" - "github.com/aler9/mediamtx/internal/rtmp/h264conf" - "github.com/aler9/mediamtx/internal/rtmp/message" + "github.com/bluenviron/mediamtx/internal/conf" + "github.com/bluenviron/mediamtx/internal/externalcmd" + "github.com/bluenviron/mediamtx/internal/formatprocessor" + "github.com/bluenviron/mediamtx/internal/logger" + "github.com/bluenviron/mediamtx/internal/rtmp" + "github.com/bluenviron/mediamtx/internal/rtmp/h264conf" + "github.com/bluenviron/mediamtx/internal/rtmp/message" ) const ( diff --git a/internal/core/rtmp_server.go b/internal/core/rtmp_server.go index 7e71ba56..99e33440 100644 --- a/internal/core/rtmp_server.go +++ b/internal/core/rtmp_server.go @@ -10,9 +10,9 @@ import ( "github.com/google/uuid" - "github.com/aler9/mediamtx/internal/conf" - "github.com/aler9/mediamtx/internal/externalcmd" - "github.com/aler9/mediamtx/internal/logger" + "github.com/bluenviron/mediamtx/internal/conf" + "github.com/bluenviron/mediamtx/internal/externalcmd" + "github.com/bluenviron/mediamtx/internal/logger" ) type rtmpServerAPIConnsListItem struct { diff --git a/internal/core/rtmp_server_test.go b/internal/core/rtmp_server_test.go index 4e89420f..9994078c 100644 --- a/internal/core/rtmp_server_test.go +++ b/internal/core/rtmp_server_test.go @@ -12,8 +12,8 @@ import ( "github.com/bluenviron/mediacommon/pkg/codecs/mpeg4audio" "github.com/stretchr/testify/require" - "github.com/aler9/mediamtx/internal/rtmp" - "github.com/aler9/mediamtx/internal/rtmp/message" + "github.com/bluenviron/mediamtx/internal/rtmp" + "github.com/bluenviron/mediamtx/internal/rtmp/message" ) func TestRTMPServerRunOnConnect(t *testing.T) { diff --git a/internal/core/rtmp_source.go b/internal/core/rtmp_source.go index 76550fbc..2a3dbc03 100644 --- a/internal/core/rtmp_source.go +++ b/internal/core/rtmp_source.go @@ -14,10 +14,10 @@ import ( "github.com/bluenviron/gortsplib/v3/pkg/formats" "github.com/bluenviron/gortsplib/v3/pkg/media" - "github.com/aler9/mediamtx/internal/conf" - "github.com/aler9/mediamtx/internal/logger" - "github.com/aler9/mediamtx/internal/rtmp" - "github.com/aler9/mediamtx/internal/rtmp/message" + "github.com/bluenviron/mediamtx/internal/conf" + "github.com/bluenviron/mediamtx/internal/logger" + "github.com/bluenviron/mediamtx/internal/rtmp" + "github.com/bluenviron/mediamtx/internal/rtmp/message" ) type rtmpSourceParent interface { diff --git a/internal/core/rtmp_source_test.go b/internal/core/rtmp_source_test.go index 28c41842..55608c8b 100644 --- a/internal/core/rtmp_source_test.go +++ b/internal/core/rtmp_source_test.go @@ -13,8 +13,8 @@ import ( "github.com/pion/rtp" "github.com/stretchr/testify/require" - "github.com/aler9/mediamtx/internal/rtmp" - "github.com/aler9/mediamtx/internal/rtmp/message" + "github.com/bluenviron/mediamtx/internal/rtmp" + "github.com/bluenviron/mediamtx/internal/rtmp/message" ) func TestRTMPSource(t *testing.T) { diff --git a/internal/core/rtsp_conn.go b/internal/core/rtsp_conn.go index cdc09964..ea4c3ec1 100644 --- a/internal/core/rtsp_conn.go +++ b/internal/core/rtsp_conn.go @@ -11,9 +11,9 @@ import ( "github.com/bluenviron/gortsplib/v3/pkg/headers" "github.com/google/uuid" - "github.com/aler9/mediamtx/internal/conf" - "github.com/aler9/mediamtx/internal/externalcmd" - "github.com/aler9/mediamtx/internal/logger" + "github.com/bluenviron/mediamtx/internal/conf" + "github.com/bluenviron/mediamtx/internal/externalcmd" + "github.com/bluenviron/mediamtx/internal/logger" ) const ( diff --git a/internal/core/rtsp_server.go b/internal/core/rtsp_server.go index 4daf7671..181fa4cc 100644 --- a/internal/core/rtsp_server.go +++ b/internal/core/rtsp_server.go @@ -14,9 +14,9 @@ import ( "github.com/bluenviron/gortsplib/v3/pkg/liberrors" "github.com/google/uuid" - "github.com/aler9/mediamtx/internal/conf" - "github.com/aler9/mediamtx/internal/externalcmd" - "github.com/aler9/mediamtx/internal/logger" + "github.com/bluenviron/mediamtx/internal/conf" + "github.com/bluenviron/mediamtx/internal/externalcmd" + "github.com/bluenviron/mediamtx/internal/logger" ) type rtspServerAPIConnsListItem struct { diff --git a/internal/core/rtsp_session.go b/internal/core/rtsp_session.go index b31c788a..54713159 100644 --- a/internal/core/rtsp_session.go +++ b/internal/core/rtsp_session.go @@ -14,9 +14,9 @@ import ( "github.com/google/uuid" "github.com/pion/rtp" - "github.com/aler9/mediamtx/internal/conf" - "github.com/aler9/mediamtx/internal/externalcmd" - "github.com/aler9/mediamtx/internal/logger" + "github.com/bluenviron/mediamtx/internal/conf" + "github.com/bluenviron/mediamtx/internal/externalcmd" + "github.com/bluenviron/mediamtx/internal/logger" ) type rtspSessionPathManager interface { diff --git a/internal/core/rtsp_source.go b/internal/core/rtsp_source.go index 3cb5a2e6..98958af7 100644 --- a/internal/core/rtsp_source.go +++ b/internal/core/rtsp_source.go @@ -14,9 +14,9 @@ import ( "github.com/bluenviron/gortsplib/v3/pkg/headers" "github.com/pion/rtp" - "github.com/aler9/mediamtx/internal/conf" - "github.com/aler9/mediamtx/internal/logger" "github.com/bluenviron/gortsplib/v3/pkg/url" + "github.com/bluenviron/mediamtx/internal/conf" + "github.com/bluenviron/mediamtx/internal/logger" ) type rtspSourceParent interface { diff --git a/internal/core/source.go b/internal/core/source.go index 7bbd6d8e..973d9992 100644 --- a/internal/core/source.go +++ b/internal/core/source.go @@ -6,7 +6,7 @@ import ( "github.com/bluenviron/gortsplib/v3/pkg/media" - "github.com/aler9/mediamtx/internal/logger" + "github.com/bluenviron/mediamtx/internal/logger" ) // source is an entity that can provide a stream. diff --git a/internal/core/source_redirect.go b/internal/core/source_redirect.go index 50e54d38..fafbda34 100644 --- a/internal/core/source_redirect.go +++ b/internal/core/source_redirect.go @@ -1,7 +1,7 @@ package core import ( - "github.com/aler9/mediamtx/internal/logger" + "github.com/bluenviron/mediamtx/internal/logger" ) // sourceRedirect is a source that redirects to another one. diff --git a/internal/core/source_static.go b/internal/core/source_static.go index f8edf1ec..72c6e298 100644 --- a/internal/core/source_static.go +++ b/internal/core/source_static.go @@ -6,8 +6,8 @@ import ( "strings" "time" - "github.com/aler9/mediamtx/internal/conf" - "github.com/aler9/mediamtx/internal/logger" + "github.com/bluenviron/mediamtx/internal/conf" + "github.com/bluenviron/mediamtx/internal/logger" ) const ( diff --git a/internal/core/stream.go b/internal/core/stream.go index 6bc673a6..5a79a525 100644 --- a/internal/core/stream.go +++ b/internal/core/stream.go @@ -8,7 +8,7 @@ import ( "github.com/bluenviron/gortsplib/v3/pkg/media" "github.com/pion/rtp" - "github.com/aler9/mediamtx/internal/formatprocessor" + "github.com/bluenviron/mediamtx/internal/formatprocessor" ) type stream struct { diff --git a/internal/core/stream_format.go b/internal/core/stream_format.go index 77691937..232a129e 100644 --- a/internal/core/stream_format.go +++ b/internal/core/stream_format.go @@ -9,8 +9,8 @@ import ( "github.com/bluenviron/gortsplib/v3/pkg/media" "github.com/pion/rtp" - "github.com/aler9/mediamtx/internal/formatprocessor" - "github.com/aler9/mediamtx/internal/logger" + "github.com/bluenviron/mediamtx/internal/formatprocessor" + "github.com/bluenviron/mediamtx/internal/logger" ) type streamFormat struct { diff --git a/internal/core/udp_source.go b/internal/core/udp_source.go index 99d87382..f650474a 100644 --- a/internal/core/udp_source.go +++ b/internal/core/udp_source.go @@ -14,9 +14,9 @@ import ( "github.com/bluenviron/mediacommon/pkg/formats/mpegts" "golang.org/x/net/ipv4" - "github.com/aler9/mediamtx/internal/conf" - "github.com/aler9/mediamtx/internal/formatprocessor" - "github.com/aler9/mediamtx/internal/logger" + "github.com/bluenviron/mediamtx/internal/conf" + "github.com/bluenviron/mediamtx/internal/formatprocessor" + "github.com/bluenviron/mediamtx/internal/logger" ) const ( diff --git a/internal/core/webrtc_http_server.go b/internal/core/webrtc_http_server.go index 9a8939b4..9862717d 100644 --- a/internal/core/webrtc_http_server.go +++ b/internal/core/webrtc_http_server.go @@ -18,8 +18,8 @@ import ( "github.com/pion/sdp/v3" "github.com/pion/webrtc/v3" - "github.com/aler9/mediamtx/internal/conf" - "github.com/aler9/mediamtx/internal/logger" + "github.com/bluenviron/mediamtx/internal/conf" + "github.com/bluenviron/mediamtx/internal/logger" ) //go:embed webrtc_publish_index.html diff --git a/internal/core/webrtc_manager.go b/internal/core/webrtc_manager.go index d66b4206..6abe301a 100644 --- a/internal/core/webrtc_manager.go +++ b/internal/core/webrtc_manager.go @@ -18,8 +18,8 @@ import ( "github.com/pion/ice/v2" "github.com/pion/webrtc/v3" - "github.com/aler9/mediamtx/internal/conf" - "github.com/aler9/mediamtx/internal/logger" + "github.com/bluenviron/mediamtx/internal/conf" + "github.com/bluenviron/mediamtx/internal/logger" ) func iceServersToLinkHeader(iceServers []webrtc.ICEServer) []string { diff --git a/internal/core/webrtc_outgoing_track.go b/internal/core/webrtc_outgoing_track.go index 1788969b..a2e938c1 100644 --- a/internal/core/webrtc_outgoing_track.go +++ b/internal/core/webrtc_outgoing_track.go @@ -5,7 +5,6 @@ import ( "fmt" "time" - "github.com/aler9/mediamtx/internal/formatprocessor" "github.com/bluenviron/gortsplib/v3/pkg/formats" "github.com/bluenviron/gortsplib/v3/pkg/formats/rtpav1" "github.com/bluenviron/gortsplib/v3/pkg/formats/rtph264" @@ -14,6 +13,8 @@ import ( "github.com/bluenviron/gortsplib/v3/pkg/media" "github.com/bluenviron/gortsplib/v3/pkg/ringbuffer" "github.com/pion/webrtc/v3" + + "github.com/bluenviron/mediamtx/internal/formatprocessor" ) type webRTCOutgoingTrack struct { diff --git a/internal/core/webrtc_pc.go b/internal/core/webrtc_pc.go index b626be25..14a35dcb 100644 --- a/internal/core/webrtc_pc.go +++ b/internal/core/webrtc_pc.go @@ -8,7 +8,7 @@ import ( "github.com/pion/interceptor" "github.com/pion/webrtc/v3" - "github.com/aler9/mediamtx/internal/logger" + "github.com/bluenviron/mediamtx/internal/logger" ) type peerConnection struct { diff --git a/internal/core/webrtc_session.go b/internal/core/webrtc_session.go index 6b152bd9..df3fd465 100644 --- a/internal/core/webrtc_session.go +++ b/internal/core/webrtc_session.go @@ -16,7 +16,7 @@ import ( "github.com/pion/sdp/v3" "github.com/pion/webrtc/v3" - "github.com/aler9/mediamtx/internal/logger" + "github.com/bluenviron/mediamtx/internal/logger" ) const ( diff --git a/internal/formatprocessor/av1.go b/internal/formatprocessor/av1.go index b6946984..8e847307 100644 --- a/internal/formatprocessor/av1.go +++ b/internal/formatprocessor/av1.go @@ -9,7 +9,7 @@ import ( "github.com/bluenviron/mediacommon/pkg/codecs/av1" "github.com/pion/rtp" - "github.com/aler9/mediamtx/internal/logger" + "github.com/bluenviron/mediamtx/internal/logger" ) // UnitAV1 is an AV1 data unit. diff --git a/internal/formatprocessor/generic.go b/internal/formatprocessor/generic.go index 5e8ec08f..f945d7e3 100644 --- a/internal/formatprocessor/generic.go +++ b/internal/formatprocessor/generic.go @@ -7,7 +7,7 @@ import ( "github.com/bluenviron/gortsplib/v3/pkg/formats" "github.com/pion/rtp" - "github.com/aler9/mediamtx/internal/logger" + "github.com/bluenviron/mediamtx/internal/logger" ) // UnitGeneric is a generic data unit. diff --git a/internal/formatprocessor/h264.go b/internal/formatprocessor/h264.go index 839b355b..6673b871 100644 --- a/internal/formatprocessor/h264.go +++ b/internal/formatprocessor/h264.go @@ -9,7 +9,7 @@ import ( "github.com/bluenviron/mediacommon/pkg/codecs/h264" "github.com/pion/rtp" - "github.com/aler9/mediamtx/internal/logger" + "github.com/bluenviron/mediamtx/internal/logger" ) // extract SPS and PPS without decoding RTP packets diff --git a/internal/formatprocessor/h265.go b/internal/formatprocessor/h265.go index e8690404..30168934 100644 --- a/internal/formatprocessor/h265.go +++ b/internal/formatprocessor/h265.go @@ -9,7 +9,7 @@ import ( "github.com/bluenviron/mediacommon/pkg/codecs/h265" "github.com/pion/rtp" - "github.com/aler9/mediamtx/internal/logger" + "github.com/bluenviron/mediamtx/internal/logger" ) // extract VPS, SPS and PPS without decoding RTP packets diff --git a/internal/formatprocessor/mpeg2audio.go b/internal/formatprocessor/mpeg2audio.go index 827ba7ce..cda0cd2a 100644 --- a/internal/formatprocessor/mpeg2audio.go +++ b/internal/formatprocessor/mpeg2audio.go @@ -8,7 +8,7 @@ import ( "github.com/bluenviron/gortsplib/v3/pkg/formats/rtpmpeg2audio" "github.com/pion/rtp" - "github.com/aler9/mediamtx/internal/logger" + "github.com/bluenviron/mediamtx/internal/logger" ) // UnitMPEG2Audio is a MPEG-2 Audio data unit. diff --git a/internal/formatprocessor/mpeg4audio.go b/internal/formatprocessor/mpeg4audio.go index 2b5abf9a..7fd3fcd4 100644 --- a/internal/formatprocessor/mpeg4audio.go +++ b/internal/formatprocessor/mpeg4audio.go @@ -8,7 +8,7 @@ import ( "github.com/bluenviron/gortsplib/v3/pkg/formats/rtpmpeg4audio" "github.com/pion/rtp" - "github.com/aler9/mediamtx/internal/logger" + "github.com/bluenviron/mediamtx/internal/logger" ) // UnitMPEG4Audio is a MPEG-4 Audio data unit. diff --git a/internal/formatprocessor/opus.go b/internal/formatprocessor/opus.go index a6d6e2e6..0a6bec95 100644 --- a/internal/formatprocessor/opus.go +++ b/internal/formatprocessor/opus.go @@ -8,7 +8,7 @@ import ( "github.com/bluenviron/gortsplib/v3/pkg/formats/rtpsimpleaudio" "github.com/pion/rtp" - "github.com/aler9/mediamtx/internal/logger" + "github.com/bluenviron/mediamtx/internal/logger" ) // UnitOpus is a Opus data unit. diff --git a/internal/formatprocessor/processor.go b/internal/formatprocessor/processor.go index 7cdc4cac..4c9a7e60 100644 --- a/internal/formatprocessor/processor.go +++ b/internal/formatprocessor/processor.go @@ -7,7 +7,7 @@ import ( "github.com/bluenviron/gortsplib/v3/pkg/formats" "github.com/pion/rtp" - "github.com/aler9/mediamtx/internal/logger" + "github.com/bluenviron/mediamtx/internal/logger" ) const ( diff --git a/internal/formatprocessor/vp8.go b/internal/formatprocessor/vp8.go index fdea2c19..d9ee6159 100644 --- a/internal/formatprocessor/vp8.go +++ b/internal/formatprocessor/vp8.go @@ -8,7 +8,7 @@ import ( "github.com/bluenviron/gortsplib/v3/pkg/formats/rtpvp8" "github.com/pion/rtp" - "github.com/aler9/mediamtx/internal/logger" + "github.com/bluenviron/mediamtx/internal/logger" ) // UnitVP8 is a VP8 data unit. diff --git a/internal/formatprocessor/vp9.go b/internal/formatprocessor/vp9.go index 52facc64..483e5e00 100644 --- a/internal/formatprocessor/vp9.go +++ b/internal/formatprocessor/vp9.go @@ -8,7 +8,7 @@ import ( "github.com/bluenviron/gortsplib/v3/pkg/formats/rtpvp9" "github.com/pion/rtp" - "github.com/aler9/mediamtx/internal/logger" + "github.com/bluenviron/mediamtx/internal/logger" ) // UnitVP9 is a VP9 data unit. diff --git a/internal/highleveltests/tests_test.go b/internal/highleveltests/tests_test.go index 3b1fc739..2f8b24c5 100644 --- a/internal/highleveltests/tests_test.go +++ b/internal/highleveltests/tests_test.go @@ -9,7 +9,7 @@ import ( "strconv" "time" - "github.com/aler9/mediamtx/internal/core" + "github.com/bluenviron/mediamtx/internal/core" ) var serverCert = []byte(`-----BEGIN CERTIFICATE----- diff --git a/internal/rtmp/conn.go b/internal/rtmp/conn.go index 31e32a00..ee2b7ba3 100644 --- a/internal/rtmp/conn.go +++ b/internal/rtmp/conn.go @@ -10,10 +10,10 @@ import ( "github.com/bluenviron/gortsplib/v3/pkg/formats" "github.com/notedit/rtmp/format/flv/flvio" - "github.com/aler9/mediamtx/internal/rtmp/bytecounter" - "github.com/aler9/mediamtx/internal/rtmp/handshake" - "github.com/aler9/mediamtx/internal/rtmp/message" - "github.com/aler9/mediamtx/internal/rtmp/tracks" + "github.com/bluenviron/mediamtx/internal/rtmp/bytecounter" + "github.com/bluenviron/mediamtx/internal/rtmp/handshake" + "github.com/bluenviron/mediamtx/internal/rtmp/message" + "github.com/bluenviron/mediamtx/internal/rtmp/tracks" ) func resultIsOK1(res *message.CommandAMF0) bool { diff --git a/internal/rtmp/conn_test.go b/internal/rtmp/conn_test.go index 04296831..f50df0c0 100644 --- a/internal/rtmp/conn_test.go +++ b/internal/rtmp/conn_test.go @@ -9,9 +9,9 @@ import ( "github.com/notedit/rtmp/format/flv/flvio" "github.com/stretchr/testify/require" - "github.com/aler9/mediamtx/internal/rtmp/bytecounter" - "github.com/aler9/mediamtx/internal/rtmp/handshake" - "github.com/aler9/mediamtx/internal/rtmp/message" + "github.com/bluenviron/mediamtx/internal/rtmp/bytecounter" + "github.com/bluenviron/mediamtx/internal/rtmp/handshake" + "github.com/bluenviron/mediamtx/internal/rtmp/message" ) func TestInitializeClient(t *testing.T) { diff --git a/internal/rtmp/message/acknowledge.go b/internal/rtmp/message/acknowledge.go index cae52527..3df1755e 100644 --- a/internal/rtmp/message/acknowledge.go +++ b/internal/rtmp/message/acknowledge.go @@ -3,7 +3,7 @@ package message //nolint:dupl import ( "fmt" - "github.com/aler9/mediamtx/internal/rtmp/rawmessage" + "github.com/bluenviron/mediamtx/internal/rtmp/rawmessage" ) // Acknowledge is an acknowledgement message. diff --git a/internal/rtmp/message/audio.go b/internal/rtmp/message/audio.go index 91bcd462..4db0c477 100644 --- a/internal/rtmp/message/audio.go +++ b/internal/rtmp/message/audio.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/aler9/mediamtx/internal/rtmp/rawmessage" + "github.com/bluenviron/mediamtx/internal/rtmp/rawmessage" ) const ( diff --git a/internal/rtmp/message/command_amf0.go b/internal/rtmp/message/command_amf0.go index 6e3663a0..73fb809c 100644 --- a/internal/rtmp/message/command_amf0.go +++ b/internal/rtmp/message/command_amf0.go @@ -5,7 +5,7 @@ import ( "github.com/notedit/rtmp/format/flv/flvio" - "github.com/aler9/mediamtx/internal/rtmp/rawmessage" + "github.com/bluenviron/mediamtx/internal/rtmp/rawmessage" ) // CommandAMF0 is a AMF0 command message. diff --git a/internal/rtmp/message/data_amf0.go b/internal/rtmp/message/data_amf0.go index ec438da7..37708370 100644 --- a/internal/rtmp/message/data_amf0.go +++ b/internal/rtmp/message/data_amf0.go @@ -3,7 +3,7 @@ package message import ( "github.com/notedit/rtmp/format/flv/flvio" - "github.com/aler9/mediamtx/internal/rtmp/rawmessage" + "github.com/bluenviron/mediamtx/internal/rtmp/rawmessage" ) // DataAMF0 is a AMF0 data message. diff --git a/internal/rtmp/message/extended_coded_frames.go b/internal/rtmp/message/extended_coded_frames.go index d492ec12..297d0337 100644 --- a/internal/rtmp/message/extended_coded_frames.go +++ b/internal/rtmp/message/extended_coded_frames.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/aler9/mediamtx/internal/rtmp/rawmessage" + "github.com/bluenviron/mediamtx/internal/rtmp/rawmessage" ) // ExtendedCodedFrames is a CodedFrames extended message. diff --git a/internal/rtmp/message/extended_frames_x.go b/internal/rtmp/message/extended_frames_x.go index c2fdd20c..49b48cac 100644 --- a/internal/rtmp/message/extended_frames_x.go +++ b/internal/rtmp/message/extended_frames_x.go @@ -3,7 +3,7 @@ package message import ( "time" - "github.com/aler9/mediamtx/internal/rtmp/rawmessage" + "github.com/bluenviron/mediamtx/internal/rtmp/rawmessage" ) // ExtendedFramesX is a FramesX extended message. diff --git a/internal/rtmp/message/extended_metadata.go b/internal/rtmp/message/extended_metadata.go index bee56796..e03226e0 100644 --- a/internal/rtmp/message/extended_metadata.go +++ b/internal/rtmp/message/extended_metadata.go @@ -3,7 +3,7 @@ package message import ( "fmt" - "github.com/aler9/mediamtx/internal/rtmp/rawmessage" + "github.com/bluenviron/mediamtx/internal/rtmp/rawmessage" ) // ExtendedMetadata is a metadata extended message. diff --git a/internal/rtmp/message/extended_mpeg2ts_sequence_start.go b/internal/rtmp/message/extended_mpeg2ts_sequence_start.go index 24af8f43..773863cb 100644 --- a/internal/rtmp/message/extended_mpeg2ts_sequence_start.go +++ b/internal/rtmp/message/extended_mpeg2ts_sequence_start.go @@ -3,7 +3,7 @@ package message import ( "fmt" - "github.com/aler9/mediamtx/internal/rtmp/rawmessage" + "github.com/bluenviron/mediamtx/internal/rtmp/rawmessage" ) // ExtendedMPEG2TSSequenceStart is a MPEG2-TS sequence start extended message. diff --git a/internal/rtmp/message/extended_sequence_end.go b/internal/rtmp/message/extended_sequence_end.go index 7360c030..79971e9f 100644 --- a/internal/rtmp/message/extended_sequence_end.go +++ b/internal/rtmp/message/extended_sequence_end.go @@ -3,7 +3,7 @@ package message import ( "fmt" - "github.com/aler9/mediamtx/internal/rtmp/rawmessage" + "github.com/bluenviron/mediamtx/internal/rtmp/rawmessage" ) // ExtendedSequenceEnd is a sequence end extended message. diff --git a/internal/rtmp/message/extended_sequence_start.go b/internal/rtmp/message/extended_sequence_start.go index c85b339c..0aaf41ee 100644 --- a/internal/rtmp/message/extended_sequence_start.go +++ b/internal/rtmp/message/extended_sequence_start.go @@ -3,7 +3,7 @@ package message import ( "fmt" - "github.com/aler9/mediamtx/internal/rtmp/rawmessage" + "github.com/bluenviron/mediamtx/internal/rtmp/rawmessage" ) // ExtendedSequenceStart is a sequence start extended message. diff --git a/internal/rtmp/message/message.go b/internal/rtmp/message/message.go index 16bfbebf..fc39dedd 100644 --- a/internal/rtmp/message/message.go +++ b/internal/rtmp/message/message.go @@ -2,7 +2,7 @@ package message import ( - "github.com/aler9/mediamtx/internal/rtmp/rawmessage" + "github.com/bluenviron/mediamtx/internal/rtmp/rawmessage" ) const ( diff --git a/internal/rtmp/message/reader.go b/internal/rtmp/message/reader.go index ab88633b..f7a458a0 100644 --- a/internal/rtmp/message/reader.go +++ b/internal/rtmp/message/reader.go @@ -3,8 +3,8 @@ package message import ( "fmt" - "github.com/aler9/mediamtx/internal/rtmp/bytecounter" - "github.com/aler9/mediamtx/internal/rtmp/rawmessage" + "github.com/bluenviron/mediamtx/internal/rtmp/bytecounter" + "github.com/bluenviron/mediamtx/internal/rtmp/rawmessage" ) func allocateMessage(raw *rawmessage.Message) (Message, error) { diff --git a/internal/rtmp/message/reader_test.go b/internal/rtmp/message/reader_test.go index 4aeab493..85e2ddfb 100644 --- a/internal/rtmp/message/reader_test.go +++ b/internal/rtmp/message/reader_test.go @@ -8,7 +8,7 @@ import ( "github.com/notedit/rtmp/format/flv/flvio" "github.com/stretchr/testify/require" - "github.com/aler9/mediamtx/internal/rtmp/bytecounter" + "github.com/bluenviron/mediamtx/internal/rtmp/bytecounter" ) var readWriterCases = []struct { diff --git a/internal/rtmp/message/readwriter.go b/internal/rtmp/message/readwriter.go index cd6b082f..fe4b3ea1 100644 --- a/internal/rtmp/message/readwriter.go +++ b/internal/rtmp/message/readwriter.go @@ -1,7 +1,7 @@ package message import ( - "github.com/aler9/mediamtx/internal/rtmp/bytecounter" + "github.com/bluenviron/mediamtx/internal/rtmp/bytecounter" ) // ReadWriter is a message reader/writer. diff --git a/internal/rtmp/message/readwriter_test.go b/internal/rtmp/message/readwriter_test.go index 99c4ae39..af00c9d6 100644 --- a/internal/rtmp/message/readwriter_test.go +++ b/internal/rtmp/message/readwriter_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/aler9/mediamtx/internal/rtmp/bytecounter" + "github.com/bluenviron/mediamtx/internal/rtmp/bytecounter" ) type duplexRW struct { diff --git a/internal/rtmp/message/set_chunk_size.go b/internal/rtmp/message/set_chunk_size.go index 53e5f499..2b7f88fd 100644 --- a/internal/rtmp/message/set_chunk_size.go +++ b/internal/rtmp/message/set_chunk_size.go @@ -3,7 +3,7 @@ package message //nolint:dupl import ( "fmt" - "github.com/aler9/mediamtx/internal/rtmp/rawmessage" + "github.com/bluenviron/mediamtx/internal/rtmp/rawmessage" ) // SetChunkSize is a set chunk size message. diff --git a/internal/rtmp/message/set_peer_bandwidth.go b/internal/rtmp/message/set_peer_bandwidth.go index fcb3337b..c1731540 100644 --- a/internal/rtmp/message/set_peer_bandwidth.go +++ b/internal/rtmp/message/set_peer_bandwidth.go @@ -3,7 +3,7 @@ package message //nolint:dupl import ( "fmt" - "github.com/aler9/mediamtx/internal/rtmp/rawmessage" + "github.com/bluenviron/mediamtx/internal/rtmp/rawmessage" ) // SetPeerBandwidth is a set peer bandwidth message. diff --git a/internal/rtmp/message/set_window_ack_size.go b/internal/rtmp/message/set_window_ack_size.go index 583cff86..566bbb70 100644 --- a/internal/rtmp/message/set_window_ack_size.go +++ b/internal/rtmp/message/set_window_ack_size.go @@ -3,7 +3,7 @@ package message //nolint:dupl import ( "fmt" - "github.com/aler9/mediamtx/internal/rtmp/rawmessage" + "github.com/bluenviron/mediamtx/internal/rtmp/rawmessage" ) // SetWindowAckSize is a set window acknowledgement message. diff --git a/internal/rtmp/message/user_control_ping_request.go b/internal/rtmp/message/user_control_ping_request.go index 2059470b..db69bb77 100644 --- a/internal/rtmp/message/user_control_ping_request.go +++ b/internal/rtmp/message/user_control_ping_request.go @@ -3,7 +3,7 @@ package message //nolint:dupl import ( "fmt" - "github.com/aler9/mediamtx/internal/rtmp/rawmessage" + "github.com/bluenviron/mediamtx/internal/rtmp/rawmessage" ) // UserControlPingRequest is a user control message. diff --git a/internal/rtmp/message/user_control_ping_response.go b/internal/rtmp/message/user_control_ping_response.go index 7adfc86e..288b555e 100644 --- a/internal/rtmp/message/user_control_ping_response.go +++ b/internal/rtmp/message/user_control_ping_response.go @@ -3,7 +3,7 @@ package message //nolint:dupl import ( "fmt" - "github.com/aler9/mediamtx/internal/rtmp/rawmessage" + "github.com/bluenviron/mediamtx/internal/rtmp/rawmessage" ) // UserControlPingResponse is a user control message. diff --git a/internal/rtmp/message/user_control_set_buffer_length.go b/internal/rtmp/message/user_control_set_buffer_length.go index 9e1df04b..ce7d4793 100644 --- a/internal/rtmp/message/user_control_set_buffer_length.go +++ b/internal/rtmp/message/user_control_set_buffer_length.go @@ -3,7 +3,7 @@ package message //nolint:dupl import ( "fmt" - "github.com/aler9/mediamtx/internal/rtmp/rawmessage" + "github.com/bluenviron/mediamtx/internal/rtmp/rawmessage" ) // UserControlSetBufferLength is a user control message. diff --git a/internal/rtmp/message/user_control_stream_begin.go b/internal/rtmp/message/user_control_stream_begin.go index 07fd1774..14672b72 100644 --- a/internal/rtmp/message/user_control_stream_begin.go +++ b/internal/rtmp/message/user_control_stream_begin.go @@ -3,7 +3,7 @@ package message //nolint:dupl import ( "fmt" - "github.com/aler9/mediamtx/internal/rtmp/rawmessage" + "github.com/bluenviron/mediamtx/internal/rtmp/rawmessage" ) // UserControlStreamBegin is a user control message. diff --git a/internal/rtmp/message/user_control_stream_dry.go b/internal/rtmp/message/user_control_stream_dry.go index 2d06cd0b..a5460423 100644 --- a/internal/rtmp/message/user_control_stream_dry.go +++ b/internal/rtmp/message/user_control_stream_dry.go @@ -3,7 +3,7 @@ package message //nolint:dupl import ( "fmt" - "github.com/aler9/mediamtx/internal/rtmp/rawmessage" + "github.com/bluenviron/mediamtx/internal/rtmp/rawmessage" ) // UserControlStreamDry is a user control message. diff --git a/internal/rtmp/message/user_control_stream_eof.go b/internal/rtmp/message/user_control_stream_eof.go index 287ed2dd..a2cd9857 100644 --- a/internal/rtmp/message/user_control_stream_eof.go +++ b/internal/rtmp/message/user_control_stream_eof.go @@ -3,7 +3,7 @@ package message //nolint:dupl import ( "fmt" - "github.com/aler9/mediamtx/internal/rtmp/rawmessage" + "github.com/bluenviron/mediamtx/internal/rtmp/rawmessage" ) // UserControlStreamEOF is a user control message. diff --git a/internal/rtmp/message/user_control_stream_is_recorded.go b/internal/rtmp/message/user_control_stream_is_recorded.go index a9a5da0f..9a605b37 100644 --- a/internal/rtmp/message/user_control_stream_is_recorded.go +++ b/internal/rtmp/message/user_control_stream_is_recorded.go @@ -3,7 +3,7 @@ package message //nolint:dupl import ( "fmt" - "github.com/aler9/mediamtx/internal/rtmp/rawmessage" + "github.com/bluenviron/mediamtx/internal/rtmp/rawmessage" ) // UserControlStreamIsRecorded is a user control message. diff --git a/internal/rtmp/message/video.go b/internal/rtmp/message/video.go index 9b38d69a..9504a735 100644 --- a/internal/rtmp/message/video.go +++ b/internal/rtmp/message/video.go @@ -6,7 +6,7 @@ import ( "github.com/notedit/rtmp/format/flv/flvio" - "github.com/aler9/mediamtx/internal/rtmp/rawmessage" + "github.com/bluenviron/mediamtx/internal/rtmp/rawmessage" ) const ( diff --git a/internal/rtmp/message/writer.go b/internal/rtmp/message/writer.go index 17da0e65..6f67f025 100644 --- a/internal/rtmp/message/writer.go +++ b/internal/rtmp/message/writer.go @@ -1,8 +1,8 @@ package message import ( - "github.com/aler9/mediamtx/internal/rtmp/bytecounter" - "github.com/aler9/mediamtx/internal/rtmp/rawmessage" + "github.com/bluenviron/mediamtx/internal/rtmp/bytecounter" + "github.com/bluenviron/mediamtx/internal/rtmp/rawmessage" ) // Writer is a message writer. diff --git a/internal/rtmp/message/writer_test.go b/internal/rtmp/message/writer_test.go index e3b93a29..c26b8744 100644 --- a/internal/rtmp/message/writer_test.go +++ b/internal/rtmp/message/writer_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/aler9/mediamtx/internal/rtmp/bytecounter" + "github.com/bluenviron/mediamtx/internal/rtmp/bytecounter" ) func TestWriter(t *testing.T) { diff --git a/internal/rtmp/rawmessage/reader.go b/internal/rtmp/rawmessage/reader.go index af8c9631..bd097ad2 100644 --- a/internal/rtmp/rawmessage/reader.go +++ b/internal/rtmp/rawmessage/reader.go @@ -6,8 +6,8 @@ import ( "fmt" "time" - "github.com/aler9/mediamtx/internal/rtmp/bytecounter" - "github.com/aler9/mediamtx/internal/rtmp/chunk" + "github.com/bluenviron/mediamtx/internal/rtmp/bytecounter" + "github.com/bluenviron/mediamtx/internal/rtmp/chunk" ) var errMoreChunksNeeded = errors.New("more chunks are needed") diff --git a/internal/rtmp/rawmessage/reader_test.go b/internal/rtmp/rawmessage/reader_test.go index 7c5062fd..51890b6e 100644 --- a/internal/rtmp/rawmessage/reader_test.go +++ b/internal/rtmp/rawmessage/reader_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/aler9/mediamtx/internal/rtmp/bytecounter" - "github.com/aler9/mediamtx/internal/rtmp/chunk" + "github.com/bluenviron/mediamtx/internal/rtmp/bytecounter" + "github.com/bluenviron/mediamtx/internal/rtmp/chunk" ) var cases = []struct { diff --git a/internal/rtmp/rawmessage/writer.go b/internal/rtmp/rawmessage/writer.go index 31dae62c..496e5136 100644 --- a/internal/rtmp/rawmessage/writer.go +++ b/internal/rtmp/rawmessage/writer.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "github.com/aler9/mediamtx/internal/rtmp/bytecounter" - "github.com/aler9/mediamtx/internal/rtmp/chunk" + "github.com/bluenviron/mediamtx/internal/rtmp/bytecounter" + "github.com/bluenviron/mediamtx/internal/rtmp/chunk" ) type writerChunkStream struct { diff --git a/internal/rtmp/rawmessage/writer_test.go b/internal/rtmp/rawmessage/writer_test.go index 0540efdf..7827747c 100644 --- a/internal/rtmp/rawmessage/writer_test.go +++ b/internal/rtmp/rawmessage/writer_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "github.com/aler9/mediamtx/internal/rtmp/bytecounter" - "github.com/aler9/mediamtx/internal/rtmp/chunk" + "github.com/bluenviron/mediamtx/internal/rtmp/bytecounter" + "github.com/bluenviron/mediamtx/internal/rtmp/chunk" "github.com/stretchr/testify/require" ) diff --git a/internal/rtmp/tracks/read.go b/internal/rtmp/tracks/read.go index deb633b7..2026a2b5 100644 --- a/internal/rtmp/tracks/read.go +++ b/internal/rtmp/tracks/read.go @@ -15,8 +15,8 @@ import ( "github.com/bluenviron/mediacommon/pkg/codecs/mpeg4audio" "github.com/notedit/rtmp/format/flv/flvio" - "github.com/aler9/mediamtx/internal/rtmp/h264conf" - "github.com/aler9/mediamtx/internal/rtmp/message" + "github.com/bluenviron/mediamtx/internal/rtmp/h264conf" + "github.com/bluenviron/mediamtx/internal/rtmp/message" ) func h265FindNALU(array []gomp4.HEVCNaluArray, typ h265.NALUType) []byte { diff --git a/internal/rtmp/tracks/read_test.go b/internal/rtmp/tracks/read_test.go index 0a00433b..0c0b87ba 100644 --- a/internal/rtmp/tracks/read_test.go +++ b/internal/rtmp/tracks/read_test.go @@ -11,9 +11,9 @@ import ( "github.com/notedit/rtmp/format/flv/flvio" "github.com/stretchr/testify/require" - "github.com/aler9/mediamtx/internal/rtmp/bytecounter" - "github.com/aler9/mediamtx/internal/rtmp/h264conf" - "github.com/aler9/mediamtx/internal/rtmp/message" + "github.com/bluenviron/mediamtx/internal/rtmp/bytecounter" + "github.com/bluenviron/mediamtx/internal/rtmp/h264conf" + "github.com/bluenviron/mediamtx/internal/rtmp/message" ) func TestRead(t *testing.T) { diff --git a/internal/rtmp/tracks/write.go b/internal/rtmp/tracks/write.go index 5d488936..a304fc24 100644 --- a/internal/rtmp/tracks/write.go +++ b/internal/rtmp/tracks/write.go @@ -4,8 +4,8 @@ import ( "github.com/bluenviron/gortsplib/v3/pkg/formats" "github.com/notedit/rtmp/format/flv/flvio" - "github.com/aler9/mediamtx/internal/rtmp/h264conf" - "github.com/aler9/mediamtx/internal/rtmp/message" + "github.com/bluenviron/mediamtx/internal/rtmp/h264conf" + "github.com/bluenviron/mediamtx/internal/rtmp/message" ) // Write writes track informations. diff --git a/internal/rtmp/tracks/write_test.go b/internal/rtmp/tracks/write_test.go index 68cddb64..f08042fd 100644 --- a/internal/rtmp/tracks/write_test.go +++ b/internal/rtmp/tracks/write_test.go @@ -9,8 +9,8 @@ import ( "github.com/notedit/rtmp/format/flv/flvio" "github.com/stretchr/testify/require" - "github.com/aler9/mediamtx/internal/rtmp/bytecounter" - "github.com/aler9/mediamtx/internal/rtmp/message" + "github.com/bluenviron/mediamtx/internal/rtmp/bytecounter" + "github.com/bluenviron/mediamtx/internal/rtmp/message" ) func TestWrite(t *testing.T) { diff --git a/main.go b/main.go index 036ffe7c..5004854c 100644 --- a/main.go +++ b/main.go @@ -4,7 +4,7 @@ package main import ( "os" - "github.com/aler9/mediamtx/internal/core" + "github.com/bluenviron/mediamtx/internal/core" ) func main() { diff --git a/openwrt.mk b/openwrt.mk index f55a5c36..2f1a8761 100644 --- a/openwrt.mk +++ b/openwrt.mk @@ -5,15 +5,15 @@ PKG_VERSION:=v0.0.0 PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/aler9/mediamtx +PKG_SOURCE_URL:=https://github.com/bluenviron/mediamtx PKG_SOURCE_VERSION:=$(PKG_VERSION) PKG_BUILD_DEPENDS:=golang/host PKG_BUILD_PARALLEL:=1 PKG_USE_MIPS16:=0 -GO_PKG:=github.com/aler9/mediamtx -GO_PKG_LDFLAGS_X:=github.com/aler9/mediamtx/internal/core.version=$(PKG_VERSION) +GO_PKG:=github.com/bluenviron/mediamtx +GO_PKG_LDFLAGS_X:=github.com/bluenviron/mediamtx/internal/core.version=$(PKG_VERSION) include $(INCLUDE_DIR)/package.mk include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk @@ -24,7 +24,7 @@ define Package/mediamtx SECTION:=net CATEGORY:=Network TITLE:=mediamtx - URL:=https://github.com/aler9/mediamtx + URL:=https://github.com/bluenviron/mediamtx DEPENDS:=$(GO_ARCH_DEPENDS) endef diff --git a/scripts/binaries.mk b/scripts/binaries.mk index 44edc7ef..f5a58b69 100644 --- a/scripts/binaries.mk +++ b/scripts/binaries.mk @@ -26,36 +26,36 @@ RUN mkdir tmp binaries RUN cp mediamtx.yml LICENSE tmp/ FROM build-base AS build-windows-amd64 -RUN GOOS=windows GOARCH=amd64 go build -ldflags "-X github.com/aler9/mediamtx/internal/core.version=$$VERSION" -o tmp/mediamtx.exe +RUN GOOS=windows GOARCH=amd64 go build -ldflags "-X github.com/bluenviron/mediamtx/internal/core.version=$$VERSION" -o tmp/mediamtx.exe RUN cd tmp && zip -q ../binaries/mediamtx_$${VERSION}_windows_amd64.zip mediamtx.exe mediamtx.yml LICENSE FROM build-base AS build-linux-amd64 -RUN GOOS=linux GOARCH=amd64 go build -ldflags "-X github.com/aler9/mediamtx/internal/core.version=$$VERSION" -o tmp/mediamtx +RUN GOOS=linux GOARCH=amd64 go build -ldflags "-X github.com/bluenviron/mediamtx/internal/core.version=$$VERSION" -o tmp/mediamtx RUN tar -C tmp -czf binaries/mediamtx_$${VERSION}_linux_amd64.tar.gz --owner=0 --group=0 mediamtx mediamtx.yml LICENSE FROM build-base AS build-darwin-amd64 -RUN GOOS=darwin GOARCH=amd64 go build -ldflags "-X github.com/aler9/mediamtx/internal/core.version=$$VERSION" -o tmp/mediamtx +RUN GOOS=darwin GOARCH=amd64 go build -ldflags "-X github.com/bluenviron/mediamtx/internal/core.version=$$VERSION" -o tmp/mediamtx RUN tar -C tmp -czf binaries/mediamtx_$${VERSION}_darwin_amd64.tar.gz --owner=0 --group=0 mediamtx mediamtx.yml LICENSE FROM build-base AS build-darwin-arm64 -RUN GOOS=darwin GOARCH=arm64 go build -ldflags "-X github.com/aler9/mediamtx/internal/core.version=$$VERSION" -o tmp/mediamtx +RUN GOOS=darwin GOARCH=arm64 go build -ldflags "-X github.com/bluenviron/mediamtx/internal/core.version=$$VERSION" -o tmp/mediamtx RUN tar -C tmp -czf binaries/mediamtx_$${VERSION}_darwin_arm64.tar.gz --owner=0 --group=0 mediamtx mediamtx.yml LICENSE FROM build-base AS build-linux-armv6 COPY --from=rpicamera32 /s/internal/rpicamera/exe/exe internal/rpicamera/exe/ -RUN GOOS=linux GOARCH=arm GOARM=6 go build -ldflags "-X github.com/aler9/mediamtx/internal/core.version=$$VERSION" -o tmp/mediamtx -tags rpicamera +RUN GOOS=linux GOARCH=arm GOARM=6 go build -ldflags "-X github.com/bluenviron/mediamtx/internal/core.version=$$VERSION" -o tmp/mediamtx -tags rpicamera RUN tar -C tmp -czf binaries/mediamtx_$${VERSION}_linux_armv6.tar.gz --owner=0 --group=0 mediamtx mediamtx.yml LICENSE RUN rm internal/rpicamera/exe/exe FROM build-base AS build-linux-armv7 COPY --from=rpicamera32 /s/internal/rpicamera/exe/exe internal/rpicamera/exe/ -RUN GOOS=linux GOARCH=arm GOARM=7 go build -ldflags "-X github.com/aler9/mediamtx/internal/core.version=$$VERSION" -o tmp/mediamtx -tags rpicamera +RUN GOOS=linux GOARCH=arm GOARM=7 go build -ldflags "-X github.com/bluenviron/mediamtx/internal/core.version=$$VERSION" -o tmp/mediamtx -tags rpicamera RUN tar -C tmp -czf binaries/mediamtx_$${VERSION}_linux_armv7.tar.gz --owner=0 --group=0 mediamtx mediamtx.yml LICENSE RUN rm internal/rpicamera/exe/exe FROM build-base AS build-linux-arm64 COPY --from=rpicamera64 /s/internal/rpicamera/exe/exe internal/rpicamera/exe/ -RUN GOOS=linux GOARCH=arm64 go build -ldflags "-X github.com/aler9/mediamtx/internal/core.version=$$VERSION" -o tmp/mediamtx -tags rpicamera +RUN GOOS=linux GOARCH=arm64 go build -ldflags "-X github.com/bluenviron/mediamtx/internal/core.version=$$VERSION" -o tmp/mediamtx -tags rpicamera RUN tar -C tmp -czf binaries/mediamtx_$${VERSION}_linux_arm64v8.tar.gz --owner=0 --group=0 mediamtx mediamtx.yml LICENSE RUN rm internal/rpicamera/exe/exe