Merge branch 'bluenviron:main' into main

Author: markusnygard-priva

.github/workflows/lint.yml

@@ -17,13 +17,13 @@ jobs:
 
     - uses: actions/setup-go@v6
       with:
-        go-version: "1.26"
+        go-version: "1.25"
 
     - run: go generate ./...
 
     - uses: golangci/golangci-lint-action@v9
       with:
-        version: v2.10.1
+        version: v2.11.1
 
   go_mod:
     runs-on: ubuntu-22.04
@@ -33,7 +33,7 @@ jobs:
 
     - uses: actions/setup-go@v6
       with:
-        go-version: "1.26"
+        go-version: "1.25"
 
     - run: make lint-go-mod
 
@@ -45,7 +45,7 @@ jobs:
 
     - uses: actions/setup-go@v6
       with:
-        go-version: "1.26"
+        go-version: "1.25"
 
     - run: make lint-conf
 
@@ -57,7 +57,7 @@ jobs:
 
     - uses: actions/setup-go@v6
       with:
-        go-version: "1.26"
+        go-version: "1.25"
 
     - run: make lint-go2api
 

.github/workflows/nightly_binaries.yml

@@ -14,7 +14,7 @@ jobs:
 
     - run: make binaries
 
-    - uses: actions/upload-artifact@v6
+    - uses: actions/upload-artifact@v7
       with:
         name: binaries
         path: binaries

.github/workflows/release.yml

@@ -8,10 +8,9 @@ on:
 permissions:
   id-token: write
   attestations: write
+  artifact-metadata: write
   contents: write
   issues: write
-  discussions: write
-  pull-requests: write
 
 jobs:
   binaries:
@@ -24,11 +23,11 @@ jobs:
 
     - run: cd binaries && sha256sum -b * > checksums.sha256
 
-    - uses: actions/attest-build-provenance@v3
+    - uses: actions/attest@v4
       with:
         subject-path: '${{ github.workspace }}/binaries/*'
 
-    - uses: actions/upload-artifact@v6
+    - uses: actions/upload-artifact@v7
       with:
         name: binaries
         path: binaries
@@ -38,7 +37,7 @@ jobs:
     runs-on: ubuntu-22.04
 
     steps:
-    - uses: actions/download-artifact@v7
+    - uses: actions/download-artifact@v8
       with:
         name: binaries
         path: binaries
@@ -150,7 +149,7 @@ jobs:
     steps:
     - uses: actions/checkout@v6
 
-    - uses: actions/download-artifact@v7
+    - uses: actions/download-artifact@v8
       with:
         name: binaries
         path: binaries

.github/workflows/test.yml

@@ -41,6 +41,6 @@ jobs:
 
     - uses: actions/setup-go@v6
       with:
-        go-version: "1.26"
+        go-version: "1.25"
 
     - run: make test-e2e-nodocker

Makefile

@@ -1,5 +1,5 @@
-BASE_IMAGE = golang:1.26-alpine3.22
-GOLANGCI_LINT_IMAGE = golangci/golangci-lint:v2.10.1
+BASE_IMAGE = golang:1.25-alpine3.22
+GOLANGCI_LINT_IMAGE = golangci/golangci-lint:v2.11.1
 NODE_IMAGE = node:20-alpine3.22
 
 .PHONY: $(shell ls)

api/openapi.yaml

@@ -382,12 +382,12 @@ components:
         # Always available
         alwaysAvailable:
           type: boolean
-        alwaysAvailableFile:
-          type: string
         alwaysAvailableTracks:
           type: array
           items:
             $ref: '#/components/schemas/AlwaysAvailableTrack'
+        alwaysAvailableFile:
+          type: string
 
         # Record
         record:

docs/1-kickoff/1-introduction.md

@@ -6,21 +6,21 @@ _MediaMTX_ is a ready-to-use and zero-dependency live media server and media pro
 
 Main features:
 
-- [Publish](../2-usage/02-publish.md) live streams to the server with SRT, WebRTC, RTSP, RTMP, HLS, MPEG-TS, RTP
-- [Read](../2-usage/03-read.md) live streams from the server with SRT, WebRTC, RTSP, RTMP, HLS
+- [Publish](../2-publish/01-overview.md) live streams to the server with SRT, WebRTC, RTSP, RTMP, HLS, MPEG-TS, RTP
+- [Read](../3-read/01-overview.md) live streams from the server with SRT, WebRTC, RTSP, RTMP, HLS
 - Streams are automatically converted from a protocol to another
 - Serve several streams at once in separate paths
 - Reload the configuration without disconnecting existing clients (hot reloading)
-- [Serve always-available streams](../2-usage/07-always-available.md) even when the publisher is offline
-- [Record](../2-usage/08-record.md) streams to disk in fMP4 or MPEG-TS format
-- [Playback](../2-usage/09-playback.md) recorded streams
-- [Authenticate](../2-usage/05-authentication.md) users with internal, HTTP or JWT authentication
-- [Forward](../2-usage/10-forward.md) streams to other servers
-- [Proxy](../2-usage/11-proxy.md) requests to other servers
-- [Control](../2-usage/20-control-api.md) the server through the Control API
-- [Extract metrics](../2-usage/21-metrics.md) from the server in a Prometheus-compatible format
-- [Monitor performance](../2-usage/22-performance.md) to investigate CPU and RAM consumption
-- [Run hooks](../2-usage/19-hooks.md) (external commands) when clients connect, disconnect, read or publish streams
+- [Serve always-available streams](../4-other/05-always-available.md) even when the publisher is offline
+- [Record](../4-other/06-record.md) streams to disk in fMP4 or MPEG-TS format
+- [Playback](../4-other/07-playback.md) recorded streams
+- [Authenticate](../4-other/03-authentication.md) users with internal, HTTP or JWT authentication
+- [Forward](../4-other/08-forward.md) streams to other servers
+- [Proxy](../4-other/09-proxy.md) requests to other servers
+- [Control](../4-other/18-control-api.md) the server through the Control API
+- [Extract metrics](../4-other/19-metrics.md) from the server in a Prometheus-compatible format
+- [Monitor performance](../4-other/20-performance.md) to investigate CPU and RAM consumption
+- [Run hooks](../4-other/17-hooks.md) (external commands) when clients connect, disconnect, read or publish streams
 - Compatible with Linux, Windows and macOS, does not require any dependency or interpreter, it's a single executable
 
 Use the menu to navigate through the documentation.

docs/1-kickoff/2-install.md

@@ -90,6 +90,6 @@ pkg install mediamtx
 
 ## OpenWrt binary
 
-If the architecture of the OpenWrt device is amd64, armv6, armv7 or arm64, use the [standalone binary method](2-install.md#standalone-binary) and download a Linux binary that corresponds to your architecture.
+If the architecture of the OpenWrt device is amd64, armv6, armv7 or arm64, use the [standalone binary method](#standalone-binary) and download a Linux binary that corresponds to your architecture.
 
-Otherwise, [compile the server from source](../4-other/1-compile.md).
+Otherwise, [compile the server from source](../6-misc/1-compile.md).

docs/2-usage/01-basic-usage.md docs/1-kickoff/4-basic-usage.mddocs/2-usage/01-basic-usage.md renamed to docs/1-kickoff/4-basic-usage.md

@@ -1,6 +1,6 @@
 # Basic usage
 
-1. [Publish](02-publish.md) a stream. For instance, you can publish a stream from a MP4 file with _FFmpeg_:
+1. [Publish](../2-publish/01-overview.md) a stream. For instance, you can publish a stream from a MP4 file with _FFmpeg_:
 
    ```sh
    ffmpeg -re -stream_loop -1 -i file.mp4 -c copy \
@@ -14,7 +14,7 @@
    ! qtdemux name=d d.video_0 ! queue ! s.sink_0 d.audio_0 ! queue ! s.sink_1
    ```
 
-2. [Read](03-read.md) the stream. For instance, you can read the stream with _VLC_:
+2. [Read](../3-read/01-overview.md) the stream. For instance, you can read the stream with _VLC_:
 
    ```sh
    vlc --network-caching=50 rtsp://localhost:8554/mystream

docs/2-publish/01-overview.md

@@ -0,0 +1,32 @@
+# Publish a stream
+
+Live streams can be published to the server with the following protocols and codecs:
+
+| protocol                                                   | variants                                   | codecs                                                                                                                                                                                                                                                 |
+| ---------------------------------------------------------- | ------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| [SRT clients](02-srt-clients.md)                           |                                            | **Video**: H265, H264, MPEG-4 Video (H263, Xvid), MPEG-1/2 Video<br/>**Audio**: Opus, MPEG-4 Audio (AAC), MPEG-1/2 Audio (MP3), AC-3<br/>**Other**: KLV                                                                                                |
+| [SRT cameras and servers](03-srt-cameras-and-servers.md)   |                                            | **Video**: H265, H264, MPEG-4 Video (H263, Xvid), MPEG-1/2 Video<br/>**Audio**: Opus, MPEG-4 Audio (AAC), MPEG-1/2 Audio (MP3), AC-3<br/>**Other**: KLV                                                                                                |
+| [WebRTC clients](04-webrtc-clients.md)                     | WHIP                                       | **Video**: AV1, VP9, VP8, H265, H264<br/>**Audio**: Opus, G722, G711 (PCMA, PCMU)                                                                                                                                                                      |
+| [WebRTC servers](05-webrtc-servers.md)                     | WHEP                                       | **Video**: AV1, VP9, VP8, H265, H264<br/>**Audio**: Opus, G722, G711 (PCMA, PCMU)                                                                                                                                                                      |
+| [RTSP clients](06-rtsp-clients.md)                         | UDP, TCP, RTSPS                            | **Video**: AV1, VP9, VP8, H265, H264, MPEG-4 Video (H263, Xvid), MPEG-1/2 Video, MJPEG<br/>**Audio**: Opus, MPEG-4 Audio (AAC), MPEG-1/2 Audio (MP3), AC-3, G726, G722, G711 (PCMA, PCMU), LPCM<br/>**Other**: KLV, MPEG-TS, any RTP-compatible codec  |
+| [RTSP cameras and servers](07-rtsp-cameras-and-servers)    | UDP, UDP-Multicast, TCP, RTSPS             | **Video**: AV1, VP9, VP8, H265, H264, MPEG-4 Video (H263, Xvid), MPEG-1/2 Video, MJPEG<br/>**Audio**: Opus, MPEG-4 Audio (AAC), MPEG-1/2 Audio (MP3), AC-3, G726, G722, G711 (PCMA, PCMU), LPCM<br/>**Other**: KLV, MPEG-TS, any RTP-compatible codec  |
+| [RTMP clients](08-rtmp-clients.md)                         | RTMP, RTMPS, Enhanced RTMP                 | **Video**: AV1, VP9, H265, H264<br/>**Audio**: Opus, MPEG-4 Audio (AAC), MPEG-1/2 Audio (MP3), AC-3, G711 (PCMA, PCMU), LPCM                                                                                                                           |
+| [RTMP cameras and servers](09-rtmp-cameras-and-servers.md) | RTMP, RTMPS, Enhanced RTMP                 | **Video**: AV1, VP9, H265, H264<br/>**Audio**: Opus, MPEG-4 Audio (AAC), MPEG-1/2 Audio (MP3), AC-3, G711 (PCMA, PCMU), LPCM                                                                                                                           |
+| [HLS cameras and servers](10-hls-cameras-and-servers.md)   | Low-Latency HLS, MP4-based HLS, legacy HLS | **Video**: AV1, VP9, H265, H264<br/>**Audio**: Opus, MPEG-4 Audio (AAC)                                                                                                                                                                                |
+| [MPEG-TS](11-mpeg-ts.md)                                   | MPEG-TS over UDP, MPEG-TS over Unix socket | **Video**: H265, H264, MPEG-4 Video (H263, Xvid), MPEG-1/2 Video<br/>**Audio**: Opus, MPEG-4 Audio (AAC), MPEG-1/2 Audio (MP3), AC-3<br/>**Other**: KLV                                                                                                |
+| [RTP](12-rtp.md)                                           | RTP over UDP                               | **Video**: AV1, VP9, VP8, H265, H264, MPEG-4 Video (H263, Xvid), MPEG-1/2 Video, M-JPEG<br/>**Audio**: Opus, MPEG-4 Audio (AAC), MPEG-1/2 Audio (MP3), AC-3, G726, G722, G711 (PCMA, PCMU), LPCM<br/>**Other**: KLV, MPEG-TS, any RTP-compatible codec |
+
+We provide instructions for publishing with the following devices:
+
+- [Raspberry Pi Cameras](13-raspberry-pi-cameras.md)
+- [Generic webcams](14-generic-webcams.md)
+
+We provide instructions for publishing with the following software:
+
+- [FFmpeg](15-ffmpeg.md)
+- [GStreamer](16-gstreamer.md)
+- [OBS Studio](17-obs-studio.md)
+- [Python and OpenCV](18-python-opencv.md)
+- [Golang](19-golang.md)
+- [Unity](20-unity.md)
+- [Web browsers](21-web-browsers.md)