diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
index c006ba94..cf7078bc 100644
--- a/.github/ISSUE_TEMPLATE/bug.yml
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -63,8 +63,8 @@ body:
       label: MediaMTX configuration
       description: |
         MediaMTX configuration is often required to replicate the issue.
-      placeholder: Paste or drag the configuration file here
-      # render: shell
+      placeholder: Paste the configuration file here
+      render: yaml
 
   - type: textarea
     id: logs
@@ -73,7 +73,6 @@ body:
       description: |
         MediaMTX logs are often useful to identify the issue. If you think this is the case, set the parameter 'logLevel' to 'debug' and attach logs.
       placeholder: Paste or drag the log file here
-      # render: shell
 
   - type: textarea
     id: network
diff --git a/.github/workflows/code_lint.yml b/.github/workflows/code_lint.yml
index 9d50b91d..63144a0c 100644
--- a/.github/workflows/code_lint.yml
+++ b/.github/workflows/code_lint.yml
@@ -23,7 +23,7 @@ jobs:
 
     - uses: golangci/golangci-lint-action@v9
       with:
-        version: v2.6.1
+        version: v2.8.0
 
   go_mod:
     runs-on: ubuntu-22.04
diff --git a/.github/workflows/nightly_binaries.yml b/.github/workflows/nightly_binaries.yml
index 049e3b17..e70c8f88 100644
--- a/.github/workflows/nightly_binaries.yml
+++ b/.github/workflows/nightly_binaries.yml
@@ -14,7 +14,7 @@ jobs:
 
     - run: make binaries
 
-    - uses: actions/upload-artifact@v5
+    - uses: actions/upload-artifact@v6
       with:
         name: binaries
         path: binaries
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f11377c9..b3912e45 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -28,7 +28,7 @@ jobs:
       with:
         subject-path: '${{ github.workspace }}/binaries/*'
 
-    - uses: actions/upload-artifact@v5
+    - uses: actions/upload-artifact@v6
       with:
         name: binaries
         path: binaries
@@ -38,7 +38,7 @@ jobs:
     runs-on: ubuntu-22.04
 
     steps:
-    - uses: actions/download-artifact@v6
+    - uses: actions/download-artifact@v7
       with:
         name: binaries
         path: binaries
@@ -62,7 +62,7 @@ jobs:
             + `\n`
             + `## Security\n`
             + `\n`
-            + `Binaries are compiled from source through the [Release workflow](https://github.com/${owner}/${repo}/actions/workflows/release.yml) without human intervention,`
+            + `Binaries are compiled from source through the [Release workflow](https://github.com/${owner}/${repo}/actions/workflows/release.yml?query=branch%3Amain) without human intervention,`
             + ` preventing any external interference.\n`
             + `\n`
             + 'You can verify that binaries have been produced by the workflow by using [GitHub Attestations](https://docs.github.com/en/actions/concepts/security/artifact-attestations):\n'
@@ -151,7 +151,7 @@ jobs:
     steps:
     - uses: actions/checkout@v6
 
-    - uses: actions/download-artifact@v6
+    - uses: actions/download-artifact@v7
       with:
         name: binaries
         path: binaries
diff --git a/Makefile b/Makefile
index 5553d83a..dcc97cd0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 BASE_IMAGE = golang:1.25-alpine3.22
-GOLANGCI_LINT_IMAGE = golangci/golangci-lint:v2.7.1
+GOLANGCI_LINT_IMAGE = golangci/golangci-lint:v2.8.0
 NODE_IMAGE = node:20-alpine3.22
 
 .PHONY: $(shell ls)
diff --git a/README.md b/README.md
index e7ae3141..85010774 100644
--- a/README.md
+++ b/README.md
@@ -7,8 +7,8 @@
   <br>
 
   [![Website](https://img.shields.io/badge/website-mediamtx.org-1c94b5)](https://mediamtx.org)
-  [![Test](https://github.com/bluenviron/mediamtx/actions/workflows/code_test.yml/badge.svg)](https://github.com/bluenviron/mediamtx/actions/workflows/code_test.yml)
-  [![Lint](https://github.com/bluenviron/mediamtx/actions/workflows/code_lint.yml/badge.svg)](https://github.com/bluenviron/mediamtx/actions/workflows/code_lint.yml)
+  [![Test](https://github.com/bluenviron/mediamtx/actions/workflows/code_test.yml/badge.svg?branch=main)](https://github.com/bluenviron/mediamtx/actions/workflows/code_test.yml?query=branch%3Amain)
+  [![Lint](https://github.com/bluenviron/mediamtx/actions/workflows/code_lint.yml/badge.svg?branch=main)](https://github.com/bluenviron/mediamtx/actions/workflows/code_lint.yml?query=branch%3Amain)
   [![CodeCov](https://codecov.io/gh/bluenviron/mediamtx/branch/main/graph/badge.svg)](https://app.codecov.io/gh/bluenviron/mediamtx/tree/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-bluenviron/mediamtx-blue)](https://hub.docker.com/r/bluenviron/mediamtx)
diff --git a/api/openapi.yaml b/api/openapi.yaml
index 19835de9..18c46f1b 100644
--- a/api/openapi.yaml
+++ b/api/openapi.yaml
@@ -73,6 +73,8 @@ components:
           type: array
           items:
             type: string
+        logStructured:
+          type: boolean
         logFile:
           type: string
         sysLogPrefix:
diff --git a/docker/ffmpeg-rpi.Dockerfile b/docker/ffmpeg-rpi.Dockerfile
index b5619507..14d19966 100644
--- a/docker/ffmpeg-rpi.Dockerfile
+++ b/docker/ffmpeg-rpi.Dockerfile
@@ -6,15 +6,37 @@ ADD binaries/mediamtx_*_linux_armv7.tar.gz /linux/arm/v7
 ADD binaries/mediamtx_*_linux_arm64.tar.gz /linux/arm64
 
 #################################################################
+FROM --platform=linux/arm/v7 debian:bullseye-slim AS base-arm-v7
 
-FROM --platform=linux/arm/v6 balenalib/raspberry-pi:bullseye-run-20240508 AS base-arm-v6
-FROM --platform=linux/arm/v7 balenalib/raspberry-pi:bullseye-run-20240508 AS base-arm-v7
-FROM --platform=linux/arm64 balenalib/raspberrypi3-64:bullseye-run-20240429 AS base-arm64
+# even though the base image is arm v7,
+# Raspbian libraries and compilers provide arm v6 compatibility.
+
+RUN apt update \
+	&& apt install -y wget gpg \
+	&& echo "deb http://archive.raspbian.org/raspbian bullseye main rpi firmware" > /etc/apt/sources.list \
+	&& echo "deb http://archive.raspberrypi.org/debian bullseye main" > /etc/apt/sources.list.d/raspi.list \
+	&& wget -O- https://archive.raspbian.org/raspbian.public.key | gpg --dearmor -o /etc/apt/trusted.gpg.d/raspbian.gpg \
+	&& wget -O- https://archive.raspberrypi.org/debian/raspberrypi.gpg.key | gpg --dearmor -o /etc/apt/trusted.gpg.d/raspberrypi.gpg \
+	&& rm -rf /var/lib/apt/lists/*
+
+RUN apt update && apt install --reinstall -y \
+    libc6 \
+    libstdc++6 \
+    && rm -rf /var/lib/apt/lists/*
+
+#################################################################
+FROM --platform=linux/arm64 debian:bullseye-slim AS base-arm64
+
+RUN apt update \
+	&& apt install -y wget gpg \
+	&& echo "deb http://archive.raspberrypi.org/debian bullseye main" > /etc/apt/sources.list.d/raspi.list \
+	&& wget -O- https://archive.raspberrypi.org/debian/raspberrypi.gpg.key | gpg --dearmor -o /etc/apt/trusted.gpg.d/raspberrypi.gpg \
+	&& rm -rf /var/lib/apt/lists/*
 
 #################################################################
 FROM --platform=linux/amd64 scratch AS base
 
-COPY --from=base-arm-v6 / /linux/arm/v6
+COPY --from=base-arm-v7 / /linux/arm/v6
 COPY --from=base-arm-v7 / /linux/arm/v7
 COPY --from=base-arm64 / /linux/arm64
 
diff --git a/docker/rpi.Dockerfile b/docker/rpi.Dockerfile
index 16c3736f..6f860fe0 100644
--- a/docker/rpi.Dockerfile
+++ b/docker/rpi.Dockerfile
@@ -6,15 +6,37 @@ ADD binaries/mediamtx_*_linux_armv7.tar.gz /linux/arm/v7
 ADD binaries/mediamtx_*_linux_arm64.tar.gz /linux/arm64
 
 #################################################################
+FROM --platform=linux/arm/v7 debian:bullseye-slim AS base-arm-v7
 
-FROM --platform=linux/arm/v6 balenalib/raspberry-pi:bullseye-run-20240508 AS base-arm-v6
-FROM --platform=linux/arm/v7 balenalib/raspberry-pi:bullseye-run-20240508 AS base-arm-v7
-FROM --platform=linux/arm64 balenalib/raspberrypi3-64:bullseye-run-20240429 AS base-arm64
+# even though the base image is arm v7,
+# Raspbian libraries and compilers provide arm v6 compatibility.
+
+RUN apt update \
+	&& apt install -y wget gpg \
+	&& echo "deb http://archive.raspbian.org/raspbian bullseye main rpi firmware" > /etc/apt/sources.list \
+	&& echo "deb http://archive.raspberrypi.org/debian bullseye main" > /etc/apt/sources.list.d/raspi.list \
+	&& wget -O- https://archive.raspbian.org/raspbian.public.key | gpg --dearmor -o /etc/apt/trusted.gpg.d/raspbian.gpg \
+	&& wget -O- https://archive.raspberrypi.org/debian/raspberrypi.gpg.key | gpg --dearmor -o /etc/apt/trusted.gpg.d/raspberrypi.gpg \
+	&& rm -rf /var/lib/apt/lists/*
+
+RUN apt update && apt install --reinstall -y \
+    libc6 \
+    libstdc++6 \
+    && rm -rf /var/lib/apt/lists/*
+
+#################################################################
+FROM --platform=linux/arm64 debian:bullseye-slim AS base-arm64
+
+RUN apt update \
+	&& apt install -y wget gpg \
+	&& echo "deb http://archive.raspberrypi.org/debian bullseye main" > /etc/apt/sources.list.d/raspi.list \
+	&& wget -O- https://archive.raspberrypi.org/debian/raspberrypi.gpg.key | gpg --dearmor -o /etc/apt/trusted.gpg.d/raspberrypi.gpg \
+	&& rm -rf /var/lib/apt/lists/*
 
 #################################################################
 FROM --platform=linux/amd64 scratch AS base
 
-COPY --from=base-arm-v6 / /linux/arm/v6
+COPY --from=base-arm-v7 / /linux/arm/v6
 COPY --from=base-arm-v7 / /linux/arm/v7
 COPY --from=base-arm64 / /linux/arm64
 
diff --git a/docs/1-kickoff/1-introduction.md b/docs/1-kickoff/1-introduction.md
index 5b610f8d..623ff2c7 100644
--- a/docs/1-kickoff/1-introduction.md
+++ b/docs/1-kickoff/1-introduction.md
@@ -2,7 +2,7 @@
 
 Welcome to the MediaMTX documentation!
 
-MediaMTX is a ready-to-use and zero-dependency live media server and media proxy. It has been conceived as a "media router" that routes media streams from one end to the other.
+_MediaMTX_ is a ready-to-use and zero-dependency live media server and media proxy. It has been conceived as a "media router" that routes media streams from one end to the other.
 
 Main features:
 
diff --git a/docs/1-kickoff/2-install.md b/docs/1-kickoff/2-install.md
index 0e0bc48c..b13618ba 100644
--- a/docs/1-kickoff/2-install.md
+++ b/docs/1-kickoff/2-install.md
@@ -6,7 +6,7 @@ There are several installation methods available: standalone binary, Docker imag
 
 1. Visit the [Releases page](https://github.com/bluenviron/mediamtx/releases) on GitHub, download and extract a standalone binary that corresponds to your operating system and architecture (example: `mediamtx_{version_tag}_linux_amd64.tar.gz`).
 
-2. Start the server:
+2. Start the server by double clicking on `mediamtx` (`mediamtx.exe` on Windows) or writing in the terminal:
 
    ```sh
    ./mediamtx
diff --git a/docs/1-kickoff/3-upgrade.md b/docs/1-kickoff/3-upgrade.md
index 092e421e..73eeaa66 100644
--- a/docs/1-kickoff/3-upgrade.md
+++ b/docs/1-kickoff/3-upgrade.md
@@ -1,6 +1,6 @@
 # Upgrade
 
-If you have an existing MediaMTX installation, you can upgrade it to the latest version. The procedure depends on how MediaMTX was installed.
+If you have an existing _MediaMTX_ installation, you can upgrade it to the latest version. The procedure depends on how _MediaMTX_ was installed.
 
 ## Standalone binary
 
@@ -10,7 +10,7 @@ The standalone binary comes with a upgrade utility that can be launched with:
 ./mediamtx --upgrade
 ```
 
-This will replace the MediaMTX executable with its latest version. Privileges to write to the executable location are required.
+This will replace the _MediaMTX_ executable with its latest version. Privileges to write to the executable location are required.
 
 ## Docker image
 
diff --git a/docs/2-usage/01-basic-usage.md b/docs/2-usage/01-basic-usage.md
index c3bb156a..dd064520 100644
--- a/docs/2-usage/01-basic-usage.md
+++ b/docs/2-usage/01-basic-usage.md
@@ -13,7 +13,7 @@
    ! qtdemux name=d d.video_0 ! queue ! s.sink_0 d.audio_0 ! queue ! s.sink_1
    ```
 
-2. Open the stream. For instance, you can open the stream with _VLC_:
+2. Read the stream. For instance, you can read the stream with _VLC_:
 
    ```sh
    vlc --network-caching=50 rtsp://localhost:8554/mystream
diff --git a/docs/2-usage/02-publish.md b/docs/2-usage/02-publish.md
index af9ea177..131af1f4 100644
--- a/docs/2-usage/02-publish.md
+++ b/docs/2-usage/02-publish.md
@@ -94,7 +94,7 @@ paths:
     source: wheps://host:port/path
 ```
 
-If the remote server is a MediaMTX instance, remember to add a `/whep` suffix after the stream name, since in MediaMTX [it's part of the WHEP URL](read#webrtc):
+If the remote server is a _MediaMTX_ instance, remember to add a `/whep` suffix after the stream name, since in _MediaMTX_ [it's part of the WHEP URL](read#webrtc):
 
 ```yml
 paths:
@@ -287,6 +287,7 @@ paths:
 _MediaMTX_ natively supports most of the Raspberry Pi Camera models, enabling high-quality and low-latency video streaming from the camera to any user, for any purpose. There are some additional requirements:
 
 1. The server must run on a Raspberry Pi, with one of the following operating systems:
+   - Raspberry Pi OS Trixie
    - Raspberry Pi OS Bookworm
    - Raspberry Pi OS Bullseye
 
@@ -452,7 +453,7 @@ ffmpeg -re -stream_loop -1 -i file.ts -c copy -f flv rtmp://localhost:1935/mystr
 
 #### FFmpeg and MPEG-TS over UDP
 
-In MediaMTX configuration, add a path with `source: udp+mpegts://238.0.0.1:1234`. Then:
+In _MediaMTX_ configuration, add a path with `source: udp+mpegts://238.0.0.1:1234`. Then:
 
 ```sh
 ffmpeg -re -stream_loop -1 -i file.ts -c copy -f mpegts 'udp://127.0.0.1:3356?pkt_size=1316'
@@ -468,7 +469,7 @@ ffmpeg -re -f lavfi -i testsrc=size=1280x720:rate=30 \
 
 #### FFmpeg and RTP over UDP
 
-In MediaMTX configuration, add a path with `source: udp+rtp://238.0.0.1:1234` and a valid `rtpSDP` (see [RTP](#rtp)). Then:
+In _MediaMTX_ configuration, add a path with `source: udp+rtp://238.0.0.1:1234` and a valid `rtpSDP` (see [RTP](#rtp)). Then:
 
 ```sh
 ffmpeg -re -f lavfi -i testsrc=size=1280x720:rate=30 \
diff --git a/docs/2-usage/04-configuration.md b/docs/2-usage/04-configuration.md
index 083ac566..f9c104e0 100644
--- a/docs/2-usage/04-configuration.md
+++ b/docs/2-usage/04-configuration.md
@@ -2,6 +2,8 @@
 
 All the configuration parameters are listed and commented in the [configuration file](/docs/references/configuration-file) (`mediamtx.yml`).
 
+## Change the configuration
+
 There are several ways to change the configuration:
 
 1. By editing the configuration file, that is
@@ -46,3 +48,13 @@ There are several ways to change the configuration:
    ```
 
 3. By using the [Control API](control-api).
+
+## Encrypt the configuration
+
+The configuration file can be entirely encrypted for security purposes by using the `crypto_secretbox` function of the NaCL function. An online tool for performing this operation is [available here](https://play.golang.org/p/rX29jwObNe4).
+
+After performing the encryption, put the base64-encoded result into the configuration file, and launch the server with the `MTX_CONFKEY` variable:
+
+```
+MTX_CONFKEY=mykey ./mediamtx
+```
diff --git a/docs/2-usage/05-authentication.md b/docs/2-usage/05-authentication.md
index 2beac485..d9d860b8 100644
--- a/docs/2-usage/05-authentication.md
+++ b/docs/2-usage/05-authentication.md
@@ -2,7 +2,7 @@
 
 ## Overview
 
-MediaMTX can be configured to ask clients for credentials, either in the form of username/password or a string-based token. These credentials are then validated through a chosen method.
+_MediaMTX_ can be configured to ask clients for credentials, either in the form of username/password or a string-based token. These credentials are then validated through a chosen method.
 
 ## Credential validation
 
@@ -306,6 +306,6 @@ Authorization: Bearer MY_JWT
 
 In OBS Studio, this is the "Bearer Token" field.
 
-If the `Authorization: Bearer` token cannot be directly provided (for instance, with web browsers that directly access MediaMTX and show a credential dialog), you can pass the token as password, using an arbitrary user.
+If the `Authorization: Bearer` token cannot be directly provided (for instance, with web browsers that directly access _MediaMTX_ and show a credential dialog), you can pass the token as password, using an arbitrary user.
 
 In web browsers, if you need to automatically fill credentials from a parent web page, see [Embed streams in a website](embed-streams-in-a-website).
diff --git a/docs/2-usage/06-encrypt-the-configuration.md b/docs/2-usage/06-encrypt-the-configuration.md
deleted file mode 100644
index 6be4e630..00000000
--- a/docs/2-usage/06-encrypt-the-configuration.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Encrypt the configuration
-
-The configuration file can be entirely encrypted for security purposes by using the `crypto_secretbox` function of the NaCL function. An online tool for performing this operation is [available here](https://play.golang.org/p/rX29jwObNe4).
-
-After performing the encryption, put the base64-encoded result into the configuration file, and launch the server with the `MTX_CONFKEY` variable:
-
-```
-MTX_CONFKEY=mykey ./mediamtx
-```
diff --git a/docs/2-usage/07-remuxing-reencoding-compression.md b/docs/2-usage/06-remuxing-reencoding-compression.md
similarity index 100%
rename from docs/2-usage/07-remuxing-reencoding-compression.md
rename to docs/2-usage/06-remuxing-reencoding-compression.md
diff --git a/docs/2-usage/08-record.md b/docs/2-usage/07-record.md
similarity index 100%
rename from docs/2-usage/08-record.md
rename to docs/2-usage/07-record.md
diff --git a/docs/2-usage/09-playback.md b/docs/2-usage/08-playback.md
similarity index 100%
rename from docs/2-usage/09-playback.md
rename to docs/2-usage/08-playback.md
diff --git a/docs/2-usage/10-forward.md b/docs/2-usage/09-forward.md
similarity index 100%
rename from docs/2-usage/10-forward.md
rename to docs/2-usage/09-forward.md
diff --git a/docs/2-usage/11-proxy.md b/docs/2-usage/10-proxy.md
similarity index 100%
rename from docs/2-usage/11-proxy.md
rename to docs/2-usage/10-proxy.md
diff --git a/docs/2-usage/12-extract-snapshots.md b/docs/2-usage/11-extract-snapshots.md
similarity index 100%
rename from docs/2-usage/12-extract-snapshots.md
rename to docs/2-usage/11-extract-snapshots.md
diff --git a/docs/2-usage/13-on-demand-publishing.md b/docs/2-usage/12-on-demand-publishing.md
similarity index 100%
rename from docs/2-usage/13-on-demand-publishing.md
rename to docs/2-usage/12-on-demand-publishing.md
diff --git a/docs/2-usage/14-route-absolute-timestamps.md b/docs/2-usage/13-route-absolute-timestamps.md
similarity index 100%
rename from docs/2-usage/14-route-absolute-timestamps.md
rename to docs/2-usage/13-route-absolute-timestamps.md
diff --git a/docs/2-usage/15-expose-the-server-in-a-subfolder.md b/docs/2-usage/14-expose-the-server-in-a-subfolder.md
similarity index 93%
rename from docs/2-usage/15-expose-the-server-in-a-subfolder.md
rename to docs/2-usage/14-expose-the-server-in-a-subfolder.md
index f8d5ad4e..06ceb8d1 100644
--- a/docs/2-usage/15-expose-the-server-in-a-subfolder.md
+++ b/docs/2-usage/14-expose-the-server-in-a-subfolder.md
@@ -1,6 +1,6 @@
 # Expose the server in a subfolder
 
-HTTP-based services (WebRTC, HLS, Control API, Playback Server, Metrics, pprof) can be exposed in a subfolder of an existing HTTP server or reverse proxy. The reverse proxy must be able to intercept HTTP requests addressed to MediaMTX and corresponding responses, and perform the following changes:
+HTTP-based services (WebRTC, HLS, Control API, Playback Server, Metrics, pprof) can be exposed in a subfolder of an existing HTTP server or reverse proxy. The reverse proxy must be able to intercept HTTP requests addressed to _MediaMTX_ and corresponding responses, and perform the following changes:
 
 - The subfolder path must be stripped from request paths. For instance, if the server is exposed behind `/subpath` and the reverse proxy receives a request with path `/subpath/mystream/index.m3u8`, this has to be changed into `/mystream/index.m3u8`.
 
diff --git a/docs/2-usage/16-embed-streams-in-a-website.md b/docs/2-usage/15-embed-streams-in-a-website.md
similarity index 97%
rename from docs/2-usage/16-embed-streams-in-a-website.md
rename to docs/2-usage/15-embed-streams-in-a-website.md
index 58517eb5..c8ee2656 100644
--- a/docs/2-usage/16-embed-streams-in-a-website.md
+++ b/docs/2-usage/15-embed-streams-in-a-website.md
@@ -20,7 +20,7 @@ The iframe can be controlled by adding query parameters to the URL (example: `ht
 
 The iframe method is fit for most use cases, but it has some limitations:
 
-- it doesn't allow to pass credentials (username, password or token) from the website to MediaMTX; credentials are asked directly to users.
+- it doesn't allow to pass credentials (username, password or token) from the website to _MediaMTX_; credentials are asked directly to users.
 - it doesn't allow to directly access the video tag, to extract data from it, or to perform dynamic actions.
 
 In order to overcome these limitations, it is possible to load the stream directly inside a `<video>` tag in the web page, through a JavaScript library.
@@ -94,7 +94,7 @@ The iframe can be controlled by adding query parameters to the URL (example: `ht
 
 The iframe method is fit for most use cases, but it has some limitations:
 
-- it doesn't allow to pass credentials (username, password or token) from the website to MediaMTX; credentials are asked directly to users.
+- it doesn't allow to pass credentials (username, password or token) from the website to _MediaMTX_; credentials are asked directly to users.
 - it doesn't allow to directly access the video tag, to extract data from it, or to perform dynamic actions.
 
 In order to overcome these limitations, it is possible to load the stream directly inside a `<video>` tag in the web page, through the _hls.js_ library.
diff --git a/docs/2-usage/17-start-on-boot.md b/docs/2-usage/16-start-on-boot.md
similarity index 100%
rename from docs/2-usage/17-start-on-boot.md
rename to docs/2-usage/16-start-on-boot.md
diff --git a/docs/2-usage/17-logging.md b/docs/2-usage/17-logging.md
new file mode 100644
index 00000000..f35b95ff
--- /dev/null
+++ b/docs/2-usage/17-logging.md
@@ -0,0 +1,86 @@
+# Logging
+
+## Log verbosity
+
+Log verbosity can be set with the `logLevel` parameter:
+
+```yml
+# Verbosity of the program; available values are "error", "warn", "info", "debug".
+logLevel: info
+```
+
+## Log destinations
+
+Log entries can be sent to multiple destinations. By default, they are printed on the console (stdout).
+
+It is possible to write logs to a file by using these parameters:
+
+```yml
+# Destinations of log messages; available values are "stdout", "file" and "syslog".
+logDestinations: [file]
+# If "file" is in logDestinations, this is the file which will receive the logs.
+logFile: mediamtx.log
+```
+
+It is possible to write logs to the system logging server (syslog) by using these parameters:
+
+```yml
+# Destinations of log messages; available values are "stdout", "file" and "syslog".
+logDestinations: [syslog]
+# If "syslog" is in logDestinations, use prefix for logs.
+sysLogPrefix: mediamtx
+```
+
+Log entries can be queried by using:
+
+```sh
+journalctl SYSLOG_IDENTIFIER=mediamtx
+```
+
+If _MediaMTX_ is also running as a [system service](start-on-boot), log entries can be queried by using:
+
+```sh
+journalctl -u mediamtx
+```
+
+## Structured logging
+
+Log collectors (like Loki, Logstash, CloudWatch and fluentd) parse logs in a more reliable way if they are fed with entries in structured format (JSONL). This can be enabled with the `logStructured` parameter:
+
+```yml
+# When destination is "stdout" or "file", emit logs in structured format (JSON).
+logStructured: true
+```
+
+Obtaining:
+
+```
+{"timestamp":"2003-05-01T20:34:14+01:00","level":"INF","message":"[RTSP] listener opened on :8554 (TCP), :8000 (UDP/RTP), :8001 (UDP/RTCP)"}
+```
+
+## Log file rotation
+
+The log file can be periodically rotated or truncated by using an external utility.
+
+On most Linux distributions, the `logrotate` utility is in charge of managing log files. It can be configured to handle the _MediaMTX_ log file too by creating a configuration file, placed in `/etc/logrotate.d/mediamtx`, with this content:
+
+```
+/my/mediamtx/path/mediamtx.log {
+    daily
+    copytruncate
+    rotate 7
+    compress
+    delaycompress
+    missingok
+    notifempty
+}
+```
+
+This file will rotate the log file every day, adding a `.NUMBER` suffix to older copies:
+
+```
+mediamtx.log.1
+mediamtx.log.2
+mediamtx.log.3
+...
+```
diff --git a/docs/2-usage/19-hooks.md b/docs/2-usage/18-hooks.md
similarity index 100%
rename from docs/2-usage/19-hooks.md
rename to docs/2-usage/18-hooks.md
diff --git a/docs/2-usage/18-log-management.md b/docs/2-usage/18-log-management.md
deleted file mode 100644
index cf0d7ef2..00000000
--- a/docs/2-usage/18-log-management.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# Log management
-
-By default, log entries are printed on the console (stdout). It is possible to write logs to a file by using the `logDestinations` and `logFile` settings:
-
-```yml
-# Destinations of log messages; available values are "stdout", "file" and "syslog".
-logDestinations: [file]
-# If "file" is in logDestinations, this is the file which will receive the logs.
-logFile: mediamtx.log
-```
-
-The log file can be periodically rotated or truncated by using an external utility.
-
-On most Linux distributions, the `logrotate` utility is in charge of managing log files. It can be configured to handle the _MediaMTX_ log file too by creating a configuration file, placed in `/etc/logrotate.d/mediamtx`, with this content:
-
-```
-/my/mediamtx/path/mediamtx.log {
-    daily
-    copytruncate
-    rotate 7
-    compress
-    delaycompress
-    missingok
-    notifempty
-}
-```
-
-This file will rotate the log file every day, adding a `.NUMBER` suffix to older copies:
-
-```
-mediamtx.log.1
-mediamtx.log.2
-mediamtx.log.3
-...
-```
diff --git a/docs/2-usage/20-control-api.md b/docs/2-usage/19-control-api.md
similarity index 100%
rename from docs/2-usage/20-control-api.md
rename to docs/2-usage/19-control-api.md
diff --git a/docs/2-usage/21-metrics.md b/docs/2-usage/20-metrics.md
similarity index 98%
rename from docs/2-usage/21-metrics.md
rename to docs/2-usage/20-metrics.md
index dbfb0a85..92dcd493 100644
--- a/docs/2-usage/21-metrics.md
+++ b/docs/2-usage/20-metrics.md
@@ -1,6 +1,6 @@
 # Extract metrics
 
-MediaMTX provides several metrics through a dedicated HTTP server, in a format compatible with [Prometheus](https://prometheus.io/).
+_MediaMTX_ provides several metrics through a dedicated HTTP server, in a format compatible with [Prometheus](https://prometheus.io/).
 
 This server can be enabled by setting `metrics: yes` in the configuration.
 
diff --git a/docs/2-usage/22-performance.md b/docs/2-usage/21-performance.md
similarity index 100%
rename from docs/2-usage/22-performance.md
rename to docs/2-usage/21-performance.md
diff --git a/docs/2-usage/23-srt-specific-features.md b/docs/2-usage/22-srt-specific-features.md
similarity index 100%
rename from docs/2-usage/23-srt-specific-features.md
rename to docs/2-usage/22-srt-specific-features.md
diff --git a/docs/2-usage/24-webrtc-specific-features.md b/docs/2-usage/23-webrtc-specific-features.md
similarity index 95%
rename from docs/2-usage/24-webrtc-specific-features.md
rename to docs/2-usage/23-webrtc-specific-features.md
index cb35b753..f0d7c044 100644
--- a/docs/2-usage/24-webrtc-specific-features.md
+++ b/docs/2-usage/23-webrtc-specific-features.md
@@ -82,7 +82,7 @@ webrtcICEServers2:
     password: secret
 ```
 
-where secret is the secret of the TURN server. MediaMTX will generate a set of credentials by using the secret, and credentials will be sent to clients before the WebRTC/ICE connection is established.
+where secret is the secret of the TURN server. _MediaMTX_ will generate a set of credentials by using the secret, and credentials will be sent to clients before the WebRTC/ICE connection is established.
 
 In some cases you may want the browser to connect using TURN servers but have mediamtx not using TURN (for example if the TURN server is on the same network as mediamtx). To allow this you can configure the TURN server to be client only:
 
diff --git a/docs/2-usage/25-rtsp-specific-features.md b/docs/2-usage/24-rtsp-specific-features.md
similarity index 100%
rename from docs/2-usage/25-rtsp-specific-features.md
rename to docs/2-usage/24-rtsp-specific-features.md
diff --git a/docs/2-usage/26-rtmp-specific-features.md b/docs/2-usage/25-rtmp-specific-features.md
similarity index 93%
rename from docs/2-usage/26-rtmp-specific-features.md
rename to docs/2-usage/25-rtmp-specific-features.md
index 256b3ef0..ad2481e7 100644
--- a/docs/2-usage/26-rtmp-specific-features.md
+++ b/docs/2-usage/25-rtmp-specific-features.md
@@ -25,7 +25,7 @@ Streams can be published and read with the rtmps scheme and the 1937 port:
 rtmps://localhost:1937/...
 ```
 
-Be aware that RTMPS is currently unsupported by all major players. However, you can use a local _MediaMTX_ instance to decrypt streams before reading them, or alternatively a proxy like [stunnel](https://www.stunnel.org) or [nginx](https://nginx.org/). For instance, you can launch a local MediaMTX instance with this configuration:
+Be aware that RTMPS is currently unsupported by all major players. However, you can use a local _MediaMTX_ instance to decrypt streams before reading them, or alternatively a proxy like [stunnel](https://www.stunnel.org) or [nginx](https://nginx.org/). For instance, you can launch a local _MediaMTX_ instance with this configuration:
 
 ```yml
 paths:
diff --git a/docs/2-usage/27-decrease-packet-loss.md b/docs/2-usage/26-decrease-packet-loss.md
similarity index 72%
rename from docs/2-usage/27-decrease-packet-loss.md
rename to docs/2-usage/26-decrease-packet-loss.md
index eaa4db46..313ace30 100644
--- a/docs/2-usage/27-decrease-packet-loss.md
+++ b/docs/2-usage/26-decrease-packet-loss.md
@@ -3,11 +3,11 @@
 MediaMTX is meant for routing live streams, and makes use of a series of protocols and techniques which try to preserve the real-time aspect of streams and minimize latency at cost of losing packets in transmit, in particular:
 
 - most protocols are built on UDP, which is an "unreliable transport", specifically picked because it allows to drop late packets in case of network congestions.
-- there's a circular buffer that stores outgoing packets and starts dropping packets when full.
+- there's a circular buffer that stores outgoing packets and drops packets if full.
 
-Packet losses are usually detected and printed in MediaMTX logs.
+Packet losses are usually detected and printed in _MediaMTX_ logs.
 
-If you need to improve the stream reliability and decrease packet losses, the first thing to do is to check whether the network between the MediaMTX instance and the intended publishers and readers has sufficient bandwidth for transmitting the media stream. Most of the times, packet losses are caused by a network which is not fit for this scope. This limitation can be overcome by either recompressing the stream with a lower bitrate, or by upgrading the network physical infrastructure (routers, cables, Wi-Fi, firewalls, topology, etc).
+If you need to improve the stream reliability and decrease packet losses, the first thing to do is to check whether the physical network between the _MediaMTX_ instance and the intended publishers and readers has sufficient bandwidth for transmitting the media stream. Most of the times, packet losses are caused by a network which is not fit for this scope. This limitation can be overcome by either recompressing the stream with a lower bitrate, or by upgrading the network infrastructure (routers, cables, Wi-Fi, firewalls, topology, etc).
 
 There are however some parameters that can be tuned to improve the situation, at cost of increasing RAM consumption:
 
diff --git a/docs/3-references/1-configuration-file.md b/docs/3-references/1-configuration-file.md
index 4933a5a7..ef0da57b 100644
--- a/docs/3-references/1-configuration-file.md
+++ b/docs/3-references/1-configuration-file.md
@@ -1,3 +1,3 @@
 # Configuration file reference
 
-This is a copy of the configuration file (`mediamtx.yml`) of the latest MediaMTX release ({version_tag}), that contains all available parameters. Check the [Configuration usage page](/docs/usage/configuration) for instructions on how to change it.
+This is a copy of the configuration file (`mediamtx.yml`) of the latest _MediaMTX_ release ({version_tag}), that contains all available parameters. Check the [Configuration usage page](/docs/usage/configuration) for instructions on how to change it.
diff --git a/docs/3-references/2-control-api.md b/docs/3-references/2-control-api.md
index 15349320..f94a8ab9 100644
--- a/docs/3-references/2-control-api.md
+++ b/docs/3-references/2-control-api.md
@@ -1,3 +1,3 @@
 # Control API reference
 
-This is the reference of the Control API of the latest MediaMTX release ({version_tag}), generated automatically from the [OpenAPI / Swagger file](https://github.com/bluenviron/mediamtx/blob/{version_tag}/api/openapi.yaml) available in the repository. Check the [Control API usage page](/docs/usage/control-api) for instructions on how to use the API.
+This is the reference of the Control API of the latest _MediaMTX_ release ({version_tag}), generated automatically from the [OpenAPI / Swagger file](https://github.com/bluenviron/mediamtx/blob/{version_tag}/api/openapi.yaml) available in the repository. Check the [Control API usage page](/docs/usage/control-api) for instructions on how to use the API.
diff --git a/docs/4-other/2-license.md b/docs/4-other/2-license.md
index 4f0896d7..9c08aaad 100644
--- a/docs/4-other/2-license.md
+++ b/docs/4-other/2-license.md
@@ -1,6 +1,6 @@
 # License
 
-All the code in the main MediaMTX repository is released under the [MIT License](https://github.com/bluenviron/mediamtx/blob/{version_tag}/LICENSE). Compiled binaries include some third-party dependencies:
+All the code in the main _MediaMTX_ repository is released under the [MIT License](https://github.com/bluenviron/mediamtx/blob/{version_tag}/LICENSE). Compiled binaries include some third-party dependencies:
 
 - all the Golang dependencies listed into the [go.mod file](https://github.com/bluenviron/mediamtx/blob/{version_tag}/go.mod), which are all released under either the MIT license, BSD 3-Clause license or Apache License 2.0.
 - hls.js, released under the [Apache License 2.0](https://github.com/video-dev/hls.js/blob/master/LICENSE).
diff --git a/docs/4-other/3-security.md b/docs/4-other/3-security.md
index dd335a6b..57ca746a 100644
--- a/docs/4-other/3-security.md
+++ b/docs/4-other/3-security.md
@@ -4,7 +4,7 @@
 
 Binaries published in the [Releases](https://github.com/bluenviron/mediamtx/releases) section of GitHub are the output of a process which has been designed with a security-first approach. Every step from source code to the intended final destination of binaries is fully visible, immune from external interferences and independently verifiable. This is the process:
 
-1. During every release, the [Release workflow](https://github.com/bluenviron/mediamtx/actions/workflows/release.yml) is triggered on GitHub.
+1. During every release, the [Release workflow](https://github.com/bluenviron/mediamtx/actions/workflows/release.yml?query=branch%3Amain) is triggered on GitHub.
 
 2. The release workflow pulls the source code and builds binaries.
 
diff --git a/go.mod b/go.mod
index b2d3efaa..ceb49be9 100644
--- a/go.mod
+++ b/go.mod
@@ -3,17 +3,17 @@ module github.com/bluenviron/mediamtx
 go 1.25.0
 
 require (
-	code.cloudfoundry.org/bytefmt v0.58.0
+	code.cloudfoundry.org/bytefmt v0.62.0
 	github.com/Masterminds/semver/v3 v3.4.0
 	github.com/MicahParks/jwkset v0.11.0
 	github.com/MicahParks/keyfunc/v3 v3.7.0
 	github.com/abema/go-mp4 v1.4.1
 	github.com/alecthomas/kong v1.13.0
 	github.com/asticode/go-astits v1.14.0
-	github.com/bluenviron/gohlslib/v2 v2.2.4
-	github.com/bluenviron/gortmplib v0.1.2
-	github.com/bluenviron/gortsplib/v5 v5.2.1
-	github.com/bluenviron/mediacommon/v2 v2.5.3
+	github.com/bluenviron/gohlslib/v2 v2.2.5-0.20260117214804-b8c1ff42629d
+	github.com/bluenviron/gortmplib v0.2.0
+	github.com/bluenviron/gortsplib/v5 v5.2.3
+	github.com/bluenviron/mediacommon/v2 v2.6.0
 	github.com/datarhei/gosrt v0.9.0
 	github.com/fsnotify/fsnotify v1.9.0
 	github.com/gin-contrib/pprof v1.5.3
@@ -25,20 +25,20 @@ require (
 	github.com/gookit/color v1.6.0
 	github.com/gorilla/websocket v1.5.3
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
-	github.com/matthewhartstonge/argon2 v1.4.3
+	github.com/matthewhartstonge/argon2 v1.4.4
 	github.com/minio/selfupdate v0.6.0
-	github.com/pion/ice/v4 v4.0.13
-	github.com/pion/interceptor v0.1.42
+	github.com/pion/ice/v4 v4.2.0
+	github.com/pion/interceptor v0.1.43
 	github.com/pion/logging v0.2.4
 	github.com/pion/rtcp v1.2.16
-	github.com/pion/rtp v1.8.26
-	github.com/pion/sdp/v3 v3.0.16
-	github.com/pion/transport/v3 v3.1.1
-	github.com/pion/webrtc/v4 v4.1.7
+	github.com/pion/rtp v1.10.0
+	github.com/pion/sdp/v3 v3.0.17
+	github.com/pion/transport/v4 v4.0.1
+	github.com/pion/webrtc/v4 v4.2.3
 	github.com/stretchr/testify v1.11.1
-	golang.org/x/crypto v0.45.0
-	golang.org/x/sys v0.38.0
-	golang.org/x/term v0.37.0
+	golang.org/x/crypto v0.47.0
+	golang.org/x/sys v0.40.0
+	golang.org/x/term v0.39.0
 	gopkg.in/yaml.v2 v2.4.0
 )
 
@@ -74,18 +74,18 @@ require (
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/pelletier/go-toml/v2 v2.2.4 // indirect
-	github.com/pion/datachannel v1.5.10 // indirect
-	github.com/pion/dtls/v3 v3.0.8 // indirect
+	github.com/pion/datachannel v1.6.0 // indirect
+	github.com/pion/dtls/v3 v3.0.10 // indirect
 	github.com/pion/mdns/v2 v2.1.0 // indirect
 	github.com/pion/randutil v0.1.0 // indirect
-	github.com/pion/sctp v1.8.41 // indirect
-	github.com/pion/srtp/v3 v3.0.9 // indirect
-	github.com/pion/stun/v3 v3.0.1 // indirect
-	github.com/pion/turn/v4 v4.1.3 // indirect
+	github.com/pion/sctp v1.9.2 // indirect
+	github.com/pion/srtp/v3 v3.0.10 // indirect
+	github.com/pion/stun/v3 v3.1.1 // indirect
+	github.com/pion/turn/v4 v4.1.4 // indirect
 	github.com/pjbgf/sha1cd v0.3.2 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/quic-go/qpack v0.5.1 // indirect
-	github.com/quic-go/quic-go v0.54.1 // indirect
+	github.com/quic-go/qpack v0.6.0 // indirect
+	github.com/quic-go/quic-go v0.57.0 // indirect
 	github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
 	github.com/skeema/knownhosts v1.3.1 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
@@ -93,15 +93,13 @@ require (
 	github.com/wlynxg/anet v0.0.5 // indirect
 	github.com/xanzy/ssh-agent v0.3.3 // indirect
 	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
-	go.uber.org/mock v0.5.0 // indirect
 	golang.org/x/arch v0.20.0 // indirect
-	golang.org/x/mod v0.30.0 // indirect
-	golang.org/x/net v0.47.0 // indirect
-	golang.org/x/sync v0.18.0 // indirect
-	golang.org/x/text v0.31.0 // indirect
-	golang.org/x/time v0.9.0 // indirect
-	golang.org/x/tools v0.39.0 // indirect
+	golang.org/x/net v0.49.0 // indirect
+	golang.org/x/text v0.33.0 // indirect
+	golang.org/x/time v0.12.0 // indirect
 	google.golang.org/protobuf v1.36.9 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
+
+replace github.com/datarhei/gosrt => github.com/aler9/gosrt v0.9.1-0.20251222193740-d7fe54d226e5
diff --git a/go.sum b/go.sum
index 32cf0356..d2dbb530 100644
--- a/go.sum
+++ b/go.sum
@@ -1,7 +1,7 @@
 aead.dev/minisign v0.2.0 h1:kAWrq/hBRu4AARY6AlciO83xhNnW9UaC8YipS2uhLPk=
 aead.dev/minisign v0.2.0/go.mod h1:zdq6LdSd9TbuSxchxwhpA9zEb9YXcVGoE8JakuiGaIQ=
-code.cloudfoundry.org/bytefmt v0.58.0 h1:pj/1gobEDZh6PIlNnDmOJMAGnv9hb2NHbw7/PSUY4wY=
-code.cloudfoundry.org/bytefmt v0.58.0/go.mod h1:koEpk4JCe4CXNcULPrdoTcMbkmG87+ZIT+vHqoNMyL0=
+code.cloudfoundry.org/bytefmt v0.62.0 h1:MeIv8SfspydaNWVmZZZGFcE2Bs1PKVfjmA0x2/WQtMU=
+code.cloudfoundry.org/bytefmt v0.62.0/go.mod h1:cV5MEjJxcDcu4oGNGwb3bJK/H3yx0rXhji++YR2rPBY=
 dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
 dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
 github.com/Masterminds/semver/v3 v3.4.0 h1:Zog+i5UMtVoCU8oKka5P7i9q9HgrJeGzI9SA1Xbatp0=
@@ -23,6 +23,8 @@ github.com/alecthomas/kong v1.13.0 h1:5e/7XC3ugvhP1DQBmTS+WuHtCbcv44hsohMgcvVxSr
 github.com/alecthomas/kong v1.13.0/go.mod h1:wrlbXem1CWqUV5Vbmss5ISYhsVPkBb1Yo7YKJghju2I=
 github.com/alecthomas/repr v0.5.2 h1:SU73FTI9D1P5UNtvseffFSGmdNci/O6RsqzeXJtP0Qs=
 github.com/alecthomas/repr v0.5.2/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
+github.com/aler9/gosrt v0.9.1-0.20251222193740-d7fe54d226e5 h1:RJzCu1Srlz876mijSN8gqvVISh7vVpplje/zAT8o6Pk=
+github.com/aler9/gosrt v0.9.1-0.20251222193740-d7fe54d226e5/go.mod h1:SuUdLtWsdOAdcDMMmhT20i5XJ5ErwmX1hDeLCIb+xBk=
 github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8=
 github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
@@ -33,12 +35,12 @@ github.com/asticode/go-astits v1.14.0 h1:zkgnZzipx2XX5mWycqsSBeEyDH58+i4HtyF4j2R
 github.com/asticode/go-astits v1.14.0/go.mod h1:QSHmknZ51pf6KJdHKZHJTLlMegIrhega3LPWz3ND/iI=
 github.com/benburkert/openpgp v0.0.0-20160410205803-c2471f86866c h1:8XZeJrs4+ZYhJeJ2aZxADI2tGADS15AzIF8MQ8XAhT4=
 github.com/benburkert/openpgp v0.0.0-20160410205803-c2471f86866c/go.mod h1:x1vxHcL/9AVzuk5HOloOEPrtJY0MaalYr78afXZ+pWI=
-github.com/bluenviron/gohlslib/v2 v2.2.4 h1:5F/Ud2VuJrrLYCDV0Ham947UIIrd801/GyoCsPYMqiw=
-github.com/bluenviron/gohlslib/v2 v2.2.4/go.mod h1:5J8Ry4xraLs6W0B2gVS0IqhCzcq+CDDJIisfkpoHyxM=
-github.com/bluenviron/gortmplib v0.1.2 h1:bJ+5pUxKnHjEoKPbNs7lDLyYy5R9Z1lISJ1n54DsjWE=
-github.com/bluenviron/gortmplib v0.1.2/go.mod h1:oVOWgfs7wsZNoKYLttyqLar7a71ZTohO1JOVXkNxtHg=
-github.com/bluenviron/mediacommon/v2 v2.5.3 h1:espW+MsV1IYH6WE3QGa1UgPnIp13JuJG4VqGvoqseBU=
-github.com/bluenviron/mediacommon/v2 v2.5.3/go.mod h1:5V15TiOfeaNVmZPVuOqAwqQSWyvMV86/dijDKu5q9Zs=
+github.com/bluenviron/gohlslib/v2 v2.2.5-0.20260117214804-b8c1ff42629d h1:Mm56CDoDBNgVRI4vQHt6+JMQ+yiEX8Fljlh/o2NskaQ=
+github.com/bluenviron/gohlslib/v2 v2.2.5-0.20260117214804-b8c1ff42629d/go.mod h1:iatp6XDIncpGlua8YU2wga01fU7pzp42nWG684GZhbM=
+github.com/bluenviron/gortmplib v0.2.0 h1:j15eeHrgVh6Avg9oAx+r4w0HugTqrIqLBsYnhs3D1dE=
+github.com/bluenviron/gortmplib v0.2.0/go.mod h1:yzobxBF8zusF2nKbEOF69zIIL429j0kaCWc/euNdvO4=
+github.com/bluenviron/mediacommon/v2 v2.6.0 h1:wZAPXwv7V78Cx2x7cToYIHOLToHl6APcvHbdQT+gOkg=
+github.com/bluenviron/mediacommon/v2 v2.6.0/go.mod h1:5V15TiOfeaNVmZPVuOqAwqQSWyvMV86/dijDKu5q9Zs=
 github.com/bytedance/sonic v1.14.0 h1:/OfKt8HFw0kh2rj8N0F6C/qPGRESq0BbaNZgcNXXzQQ=
 github.com/bytedance/sonic v1.14.0/go.mod h1:WoEbx8WTcFJfzCe0hbmyTGrfjt8PzNEBdxlNUO24NhA=
 github.com/bytedance/sonic/loader v0.3.0 h1:dskwH8edlzNMctoruo8FPTJDF3vLtDT0sXZwvZJyqeA=
@@ -50,8 +52,6 @@ github.com/cloudwego/base64x v0.1.6/go.mod h1:OFcloc187FXDaYHvrNIjxSe8ncn0OOM8gE
 github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
 github.com/cyphar/filepath-securejoin v0.4.1 h1:JyxxyPEaktOD+GAnqIqTf9A8tHyAG22rowi7HkoSU1s=
 github.com/cyphar/filepath-securejoin v0.4.1/go.mod h1:Sdj7gXlvMcPZsbhwhQ33GguGLDGQL7h7bg04C/+u9jI=
-github.com/datarhei/gosrt v0.9.0 h1:FW8A+F8tBiv7eIa57EBHjtTJKFX+OjvLogF/tFXoOiA=
-github.com/datarhei/gosrt v0.9.0/go.mod h1:rqTRK8sDZdN2YBgp1EEICSV4297mQk0oglwvpXhaWdk=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -102,8 +102,8 @@ github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8/go.mod h1:wcDNUv
 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
 github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/pprof v0.0.0-20251114195745-4902fdda35c8 h1:3DsUAV+VNEQa2CUVLxCY3f87278uWfIDhJnbdvDjvmE=
-github.com/google/pprof v0.0.0-20251114195745-4902fdda35c8/go.mod h1:I6V7YzU0XDpsHqbsyrghnFZLO1gwK6NPTNvmetQIk9U=
+github.com/google/pprof v0.0.0-20260115054156-294ebfa9ad83 h1:z2ogiKUYzX5Is6zr/vP9vJGqPwcdqsWjOt+V8J7+bTc=
+github.com/google/pprof v0.0.0-20260115054156-294ebfa9ad83/go.mod h1:MxpfABSjhmINe3F1It9d+8exIHFvUqtLIRCdOGNXqiI=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -135,8 +135,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
 github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
-github.com/matthewhartstonge/argon2 v1.4.3 h1:rqbAR3lzzIjQdwQ5V8AyLKRB6F5tk479EiPSsrwH428=
-github.com/matthewhartstonge/argon2 v1.4.3/go.mod h1:yV9Hi7hkRTdHMBUtpaJepCxc0szFRF7g1kE2i1QEy9s=
+github.com/matthewhartstonge/argon2 v1.4.4 h1:IxMnW8Y5/As75hr3zIUAGmHlzqwhYb/cc0wI9QO29JM=
+github.com/matthewhartstonge/argon2 v1.4.4/go.mod h1:3o39C3PfERZZ3sm5hFcYNTaLDz4sz6PVfeJo8yITGf4=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/minio/selfupdate v0.6.0 h1:i76PgT0K5xO9+hjzKcacQtO7+MjJ4JKA8Ak8XQ9DDwU=
@@ -147,22 +147,22 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJ
 github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
-github.com/onsi/ginkgo/v2 v2.27.2 h1:LzwLj0b89qtIy6SSASkzlNvX6WktqurSHwkk2ipF/Ns=
-github.com/onsi/ginkgo/v2 v2.27.2/go.mod h1:ArE1D/XhNXBXCBkKOLkbsb2c81dQHCRcF5zwn/ykDRo=
-github.com/onsi/gomega v1.38.2 h1:eZCjf2xjZAqe+LeWvKb5weQ+NcPwX84kqJ0cZNxok2A=
-github.com/onsi/gomega v1.38.2/go.mod h1:W2MJcYxRGV63b418Ai34Ud0hEdTVXq9NW9+Sx6uXf3k=
+github.com/onsi/ginkgo/v2 v2.27.5 h1:ZeVgZMx2PDMdJm/+w5fE/OyG6ILo1Y3e+QX4zSR0zTE=
+github.com/onsi/ginkgo/v2 v2.27.5/go.mod h1:ArE1D/XhNXBXCBkKOLkbsb2c81dQHCRcF5zwn/ykDRo=
+github.com/onsi/gomega v1.39.0 h1:y2ROC3hKFmQZJNFeGAMeHZKkjBL65mIZcvrLQBF9k6Q=
+github.com/onsi/gomega v1.39.0/go.mod h1:ZCU1pkQcXDO5Sl9/VVEGlDyp+zm0m1cmeG5TOzLgdh4=
 github.com/orcaman/writerseeker v0.0.0-20200621085525-1d3f536ff85e h1:s2RNOM/IGdY0Y6qfTeUKhDawdHDpK9RGBdx80qN4Ttw=
 github.com/orcaman/writerseeker v0.0.0-20200621085525-1d3f536ff85e/go.mod h1:nBdnFKj15wFbf94Rwfq4m30eAcyY9V/IyKAGQFtqkW0=
 github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4=
 github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY=
-github.com/pion/datachannel v1.5.10 h1:ly0Q26K1i6ZkGf42W7D4hQYR90pZwzFOjTq5AuCKk4o=
-github.com/pion/datachannel v1.5.10/go.mod h1:p/jJfC9arb29W7WrxyKbepTU20CFgyx5oLo8Rs4Py/M=
-github.com/pion/dtls/v3 v3.0.8 h1:ZrPUrvPVDaTJDM8Vu1veatzXebLlsIWeT7Vaate/zwM=
-github.com/pion/dtls/v3 v3.0.8/go.mod h1:abApPjgadS/ra1wvUzHLc3o2HvoxppAh+NZkyApL4Os=
-github.com/pion/ice/v4 v4.0.13 h1:1cdmd80gmLdnVTM2bXzw2CBebvXvkGNEaWi/CuDK9WQ=
-github.com/pion/ice/v4 v4.0.13/go.mod h1:Xo5f5DBbEjQac+6pR7i83AGuwoGxnxwXkOOvHFVnfnM=
-github.com/pion/interceptor v0.1.42 h1:0/4tvNtruXflBxLfApMVoMubUMik57VZ+94U0J7cmkQ=
-github.com/pion/interceptor v0.1.42/go.mod h1:g6XYTChs9XyolIQFhRHOOUS+bGVGLRfgTCUzH29EfVU=
+github.com/pion/datachannel v1.6.0 h1:XecBlj+cvsxhAMZWFfFcPyUaDZtd7IJvrXqlXD/53i0=
+github.com/pion/datachannel v1.6.0/go.mod h1:ur+wzYF8mWdC+Mkis5Thosk+u/VOL287apDNEbFpsIk=
+github.com/pion/dtls/v3 v3.0.10 h1:k9ekkq1kaZoxnNEbyLKI8DI37j/Nbk1HWmMuywpQJgg=
+github.com/pion/dtls/v3 v3.0.10/go.mod h1:YEmmBYIoBsY3jmG56dsziTv/Lca9y4Om83370CXfqJ8=
+github.com/pion/ice/v4 v4.2.0 h1:jJC8S+CvXCCvIQUgx+oNZnoUpt6zwc34FhjWwCU4nlw=
+github.com/pion/ice/v4 v4.2.0/go.mod h1:EgjBGxDgmd8xB0OkYEVFlzQuEI7kWSCFu+mULqaisy4=
+github.com/pion/interceptor v0.1.43 h1:6hmRfnmjogSs300xfkR0JxYFZ9k5blTEvCD7wxEDuNQ=
+github.com/pion/interceptor v0.1.43/go.mod h1:BSiC1qKIJt1XVr3l3xQ2GEmCFStk9tx8fwtCZxxgR7M=
 github.com/pion/logging v0.2.4 h1:tTew+7cmQ+Mc1pTBLKH2puKsOvhm32dROumOZ655zB8=
 github.com/pion/logging v0.2.4/go.mod h1:DffhXTKYdNZU+KtJ5pyQDjvOAh/GsNSyv1lbkFbe3so=
 github.com/pion/mdns/v2 v2.1.0 h1:3IJ9+Xio6tWYjhN6WwuY142P/1jA0D5ERaIqawg/fOY=
@@ -171,22 +171,24 @@ github.com/pion/randutil v0.1.0 h1:CFG1UdESneORglEsnimhUjf33Rwjubwj6xfiOXBa3mA=
 github.com/pion/randutil v0.1.0/go.mod h1:XcJrSMMbbMRhASFVOlj/5hQial/Y8oH/HVo7TBZq+j8=
 github.com/pion/rtcp v1.2.16 h1:fk1B1dNW4hsI78XUCljZJlC4kZOPk67mNRuQ0fcEkSo=
 github.com/pion/rtcp v1.2.16/go.mod h1:/as7VKfYbs5NIb4h6muQ35kQF/J0ZVNz2Z3xKoCBYOo=
-github.com/pion/rtp v1.8.26 h1:VB+ESQFQhBXFytD+Gk8cxB6dXeVf2WQzg4aORvAvAAc=
-github.com/pion/rtp v1.8.26/go.mod h1:rF5nS1GqbR7H/TCpKwylzeq6yDM+MM6k+On5EgeThEM=
-github.com/pion/sctp v1.8.41 h1:20R4OHAno4Vky3/iE4xccInAScAa83X6nWUfyc65MIs=
-github.com/pion/sctp v1.8.41/go.mod h1:2wO6HBycUH7iCssuGyc2e9+0giXVW0pyCv3ZuL8LiyY=
-github.com/pion/sdp/v3 v3.0.16 h1:0dKzYO6gTAvuLaAKQkC02eCPjMIi4NuAr/ibAwrGDCo=
-github.com/pion/sdp/v3 v3.0.16/go.mod h1:9tyKzznud3qiweZcD86kS0ff1pGYB3VX+Bcsmkx6IXo=
-github.com/pion/srtp/v3 v3.0.9 h1:lRGF4G61xxj+m/YluB3ZnBpiALSri2lTzba0kGZMrQY=
-github.com/pion/srtp/v3 v3.0.9/go.mod h1:E+AuWd7Ug2Fp5u38MKnhduvpVkveXJX6J4Lq4rxUYt8=
-github.com/pion/stun/v3 v3.0.1 h1:jx1uUq6BdPihF0yF33Jj2mh+C9p0atY94IkdnW174kA=
-github.com/pion/stun/v3 v3.0.1/go.mod h1:RHnvlKFg+qHgoKIqtQWMOJF52wsImCAf/Jh5GjX+4Tw=
+github.com/pion/rtp v1.10.0 h1:XN/xca4ho6ZEcijpdF2VGFbwuHUfiIMf3ew8eAAE43w=
+github.com/pion/rtp v1.10.0/go.mod h1:rF5nS1GqbR7H/TCpKwylzeq6yDM+MM6k+On5EgeThEM=
+github.com/pion/sctp v1.9.2 h1:HxsOzEV9pWoeggv7T5kewVkstFNcGvhMPx0GvUOUQXo=
+github.com/pion/sctp v1.9.2/go.mod h1:OTOlsQ5EDQ6mQ0z4MUGXt2CgQmKyafBEXhUVqLRB6G8=
+github.com/pion/sdp/v3 v3.0.17 h1:9SfLAW/fF1XC8yRqQ3iWGzxkySxup4k4V7yN8Fs8nuo=
+github.com/pion/sdp/v3 v3.0.17/go.mod h1:9tyKzznud3qiweZcD86kS0ff1pGYB3VX+Bcsmkx6IXo=
+github.com/pion/srtp/v3 v3.0.10 h1:tFirkpBb3XccP5VEXLi50GqXhv5SKPxqrdlhDCJlZrQ=
+github.com/pion/srtp/v3 v3.0.10/go.mod h1:3mOTIB0cq9qlbn59V4ozvv9ClW/BSEbRp4cY0VtaR7M=
+github.com/pion/stun/v3 v3.1.1 h1:CkQxveJ4xGQjulGSROXbXq94TAWu8gIX2dT+ePhUkqw=
+github.com/pion/stun/v3 v3.1.1/go.mod h1:qC1DfmcCTQjl9PBaMa5wSn3x9IPmKxSdcCsxBcDBndM=
 github.com/pion/transport/v3 v3.1.1 h1:Tr684+fnnKlhPceU+ICdrw6KKkTms+5qHMgw6bIkYOM=
 github.com/pion/transport/v3 v3.1.1/go.mod h1:+c2eewC5WJQHiAA46fkMMzoYZSuGzA/7E2FPrOYHctQ=
-github.com/pion/turn/v4 v4.1.3 h1:jVNW0iR05AS94ysEtvzsrk3gKs9Zqxf6HmnsLfRvlzA=
-github.com/pion/turn/v4 v4.1.3/go.mod h1:TD/eiBUf5f5LwXbCJa35T7dPtTpCHRJ9oJWmyPLVT3A=
-github.com/pion/webrtc/v4 v4.1.7 h1:sl3vFuVHa1u/7DcFbud7e1zk3sG3RjBS5GI2ckltROg=
-github.com/pion/webrtc/v4 v4.1.7/go.mod h1:y3mRk8wpmOVkTTEGYB/eXAg0DPEfTEdC/Y021zRiOiM=
+github.com/pion/transport/v4 v4.0.1 h1:sdROELU6BZ63Ab7FrOLn13M6YdJLY20wldXW2Cu2k8o=
+github.com/pion/transport/v4 v4.0.1/go.mod h1:nEuEA4AD5lPdcIegQDpVLgNoDGreqM/YqmEx3ovP4jM=
+github.com/pion/turn/v4 v4.1.4 h1:EU11yMXKIsK43FhcUnjLlrhE4nboHZq+TXBIi3QpcxQ=
+github.com/pion/turn/v4 v4.1.4/go.mod h1:ES1DXVFKnOhuDkqn9hn5VJlSWmZPaRJLyBXoOeO/BmQ=
+github.com/pion/webrtc/v4 v4.2.3 h1:RtdWDnkenNQGxUrZqWa5gSkTm5ncsLg5d+zu0M4cXt4=
+github.com/pion/webrtc/v4 v4.2.3/go.mod h1:7vsyFzRzaKP5IELUnj8zLcglPyIT6wWwqTppBZ1k6Kc=
 github.com/pjbgf/sha1cd v0.3.2 h1:a9wb0bp1oC2TGwStyn0Umc/IGKQnEgF0vVaZ8QF8eo4=
 github.com/pjbgf/sha1cd v0.3.2/go.mod h1:zQWigSxVmsHEZow5qaLtPYxpcKMMQpa09ixqBxuCS6A=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
@@ -194,10 +196,10 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
 github.com/pkg/profile v1.4.0/go.mod h1:NWz/XGvpEW1FyYQ7fCx4dqYBLlfTcE+A9FLAkNKqjFE=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/quic-go/qpack v0.5.1 h1:giqksBPnT/HDtZ6VhtFKgoLOWmlyo9Ei6u9PqzIMbhI=
-github.com/quic-go/qpack v0.5.1/go.mod h1:+PC4XFrEskIVkcLzpEkbLqq1uCoxPhQuvK5rH1ZgaEg=
-github.com/quic-go/quic-go v0.54.1 h1:4ZAWm0AhCb6+hE+l5Q1NAL0iRn/ZrMwqHRGQiFwj2eg=
-github.com/quic-go/quic-go v0.54.1/go.mod h1:e68ZEaCdyviluZmy44P6Iey98v/Wfz6HCjQEm+l8zTY=
+github.com/quic-go/qpack v0.6.0 h1:g7W+BMYynC1LbYLSqRt8PBg5Tgwxn214ZZR34VIOjz8=
+github.com/quic-go/qpack v0.6.0/go.mod h1:lUpLKChi8njB4ty2bFLX2x4gzDqXwUpaO1DP9qMDZII=
+github.com/quic-go/quic-go v0.57.0 h1:AsSSrrMs4qI/hLrKlTH/TGQeTMY0ib1pAOX7vA3AdqE=
+github.com/quic-go/quic-go v0.57.0/go.mod h1:ly4QBAjHA2VhdnxhojRsCUOeJwKYg+taDlos92xb1+s=
 github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
 github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
 github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8=
@@ -227,8 +229,8 @@ github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM
 github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw=
 github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no=
 github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM=
-go.uber.org/mock v0.5.0 h1:KAMbZvZPyBPWgD14IrIQ38QCyjwpvVVV6K/bHl1IwQU=
-go.uber.org/mock v0.5.0/go.mod h1:ge71pBPLYDk7QIi1LupWxdAykm7KIEFchiOqd6z7qMM=
+go.uber.org/mock v0.5.2 h1:LbtPTcP8A5k9WPXj54PPPbjcI4Y6lhyOZXn+VS7wNko=
+go.uber.org/mock v0.5.2/go.mod h1:wLlUxC2vVTPTaE3UD51E0BGOAElKrILxhVSDYQLld5o=
 go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
 go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
 golang.org/x/arch v0.20.0 h1:dx1zTU0MAE98U+TQ8BLl7XsJbgze2WnNKF/8tGp/Q6c=
@@ -237,16 +239,16 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
 golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
 golang.org/x/crypto v0.0.0-20211209193657-4570a0811e8b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.46.0 h1:cKRW/pmt1pKAfetfu+RCEvjvZkA9RimPbh7bhFjGVBU=
-golang.org/x/crypto v0.46.0/go.mod h1:Evb/oLKmMraqjZ2iQTwDwvCtJkczlDuTmdJXoZVzqU0=
+golang.org/x/crypto v0.47.0 h1:V6e3FRj+n4dbpw86FJ8Fv7XVOql7TEwpHapKoMJ/GO8=
+golang.org/x/crypto v0.47.0/go.mod h1:ff3Y9VzzKbwSSEzWqJsJVBnWmRwRSHt/6Op5n9bQc4A=
 golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8=
 golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY=
-golang.org/x/mod v0.30.0 h1:fDEXFVZ/fmCKProc/yAXXUijritrDzahmwwefnjoPFk=
-golang.org/x/mod v0.30.0/go.mod h1:lAsf5O2EvJeSFMiBxXDki7sCgAxEUcZHXoXMKT4GJKc=
+golang.org/x/mod v0.32.0 h1:9F4d3PHLljb6x//jOyokMv3eX+YDeepZSEo3mFJy93c=
+golang.org/x/mod v0.32.0/go.mod h1:SgipZ/3h2Ci89DlEtEXWUk/HteuRin+HHhN+WbNhguU=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.48.0 h1:zyQRTTrjc33Lhh0fBgT/H3oZq9WuvRR5gPC70xpDiQU=
-golang.org/x/net v0.48.0/go.mod h1:+ndRgGjkh8FGtu1w1FGbEC31if4VrNVMuKTgcAAnQRY=
+golang.org/x/net v0.49.0 h1:eeHFmOGUTtaaPSGNmjBKpbng9MulQsJURQUAfUwY++o=
+golang.org/x/net v0.49.0/go.mod h1:/ysNB2EvaqvesRkuLAyjI1ycPZlQHM3q01F02UY/MV8=
 golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4=
 golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -259,22 +261,22 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.39.0 h1:CvCKL8MeisomCi6qNZ+wbb0DN9E5AATixKsvNtMoMFk=
-golang.org/x/sys v0.39.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/sys v0.40.0 h1:DBZZqJ2Rkml6QMQsZywtnjnnGvHza6BTfYFWY9kjEWQ=
+golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.38.0 h1:PQ5pkm/rLO6HnxFR7N2lJHOZX6Kez5Y1gDSJla6jo7Q=
-golang.org/x/term v0.38.0/go.mod h1:bSEAKrOT1W+VSu9TSCMtoGEOUcKxOKgl3LE5QEF/xVg=
+golang.org/x/term v0.39.0 h1:RclSuaJf32jOqZz74CkPA9qFuVTX7vhLlpfj/IGWlqY=
+golang.org/x/term v0.39.0/go.mod h1:yxzUCTP/U+FzoxfdKmLaA0RV1WgE0VY7hXBwKtY/4ww=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.32.0 h1:ZD01bjUt1FQ9WJ0ClOL5vxgxOI/sVCNgX1YtKwcY0mU=
-golang.org/x/text v0.32.0/go.mod h1:o/rUWzghvpD5TXrTIBuJU77MTaN0ljMWE47kxGJQ7jY=
-golang.org/x/time v0.9.0 h1:EsRrnYcQiGH+5FfbgvV4AP7qEZstoyrHB0DzarOQ4ZY=
-golang.org/x/time v0.9.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
+golang.org/x/text v0.33.0 h1:B3njUFyqtHDUI5jMn1YIr5B0IE2U0qck04r6d4KPAxE=
+golang.org/x/text v0.33.0/go.mod h1:LuMebE6+rBincTi9+xWTY8TztLzKHc/9C1uBCG27+q8=
+golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE=
+golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.39.0 h1:ik4ho21kwuQln40uelmciQPp9SipgNDdrafrYA4TmQQ=
-golang.org/x/tools v0.39.0/go.mod h1:JnefbkDPyD8UU2kI5fuf8ZX4/yUeh9W877ZeBONxUqQ=
+golang.org/x/tools v0.41.0 h1:a9b8iMweWG+S0OBnlU36rzLp20z1Rp10w+IY2czHTQc=
+golang.org/x/tools v0.41.0/go.mod h1:XSY6eDqxVNiYgezAVqqCeihT4j1U2CCsqvH3WhQpnlg=
 google.golang.org/protobuf v1.36.9 h1:w2gp2mA27hUeUzj9Ex9FBjsBm40zfaDtEWow293U7Iw=
 google.golang.org/protobuf v1.36.9/go.mod h1:fuxRtAxBytpl4zzqUh6/eyUujkJdNiuEkXntxiD/uRU=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
diff --git a/internal/codecprocessor/ac3.go b/internal/codecprocessor/ac3.go
deleted file mode 100644
index aec0f580..00000000
--- a/internal/codecprocessor/ac3.go
+++ /dev/null
@@ -1,100 +0,0 @@
-package codecprocessor
-
-import (
-	"errors"
-	"fmt"
-
-	"github.com/bluenviron/gortsplib/v5/pkg/format"
-	"github.com/bluenviron/gortsplib/v5/pkg/format/rtpac3"
-
-	"github.com/bluenviron/mediamtx/internal/logger"
-	"github.com/bluenviron/mediamtx/internal/unit"
-)
-
-type ac3 struct {
-	RTPMaxPayloadSize  int
-	Format             *format.AC3
-	GenerateRTPPackets bool
-	Parent             logger.Writer
-
-	encoder     *rtpac3.Encoder
-	decoder     *rtpac3.Decoder
-	randomStart uint32
-}
-
-func (t *ac3) initialize() error {
-	if t.GenerateRTPPackets {
-		err := t.createEncoder()
-		if err != nil {
-			return err
-		}
-
-		t.randomStart, err = randUint32()
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (t *ac3) createEncoder() error {
-	t.encoder = &rtpac3.Encoder{
-		PayloadType: t.Format.PayloadTyp,
-	}
-	return t.encoder.Init()
-}
-
-func (t *ac3) ProcessUnit(u *unit.Unit) error { //nolint:dupl
-	pkts, err := t.encoder.Encode(u.Payload.(unit.PayloadAC3))
-	if err != nil {
-		return err
-	}
-	u.RTPPackets = pkts
-
-	for _, pkt := range u.RTPPackets {
-		pkt.Timestamp += t.randomStart + uint32(u.PTS)
-	}
-
-	return nil
-}
-
-func (t *ac3) ProcessRTPPacket( //nolint:dupl
-	u *unit.Unit,
-	hasNonRTSPReaders bool,
-) error {
-	pkt := u.RTPPackets[0]
-
-	// remove padding
-	pkt.Padding = false
-	pkt.PaddingSize = 0
-
-	if len(pkt.Payload) > t.RTPMaxPayloadSize {
-		return fmt.Errorf("RTP payload size (%d) is greater than maximum allowed (%d)",
-			len(pkt.Payload), t.RTPMaxPayloadSize)
-	}
-
-	// decode from RTP
-	if hasNonRTSPReaders || t.decoder != nil {
-		if t.decoder == nil {
-			var err error
-			t.decoder, err = t.Format.CreateDecoder()
-			if err != nil {
-				return err
-			}
-		}
-
-		frames, err := t.decoder.Decode(pkt)
-		if err != nil {
-			if errors.Is(err, rtpac3.ErrNonStartingPacketAndNoPrevious) ||
-				errors.Is(err, rtpac3.ErrMorePacketsNeeded) {
-				return nil
-			}
-			return err
-		}
-
-		u.Payload = unit.PayloadAC3(frames)
-	}
-
-	return nil
-}
diff --git a/internal/codecprocessor/av1.go b/internal/codecprocessor/av1.go
deleted file mode 100644
index f9450555..00000000
--- a/internal/codecprocessor/av1.go
+++ /dev/null
@@ -1,137 +0,0 @@
-package codecprocessor //nolint:dupl
-
-import (
-	"errors"
-	"fmt"
-
-	"github.com/bluenviron/gortsplib/v5/pkg/format"
-	"github.com/bluenviron/gortsplib/v5/pkg/format/rtpav1"
-	mcav1 "github.com/bluenviron/mediacommon/v2/pkg/codecs/av1"
-
-	"github.com/bluenviron/mediamtx/internal/logger"
-	"github.com/bluenviron/mediamtx/internal/unit"
-)
-
-type av1 struct {
-	RTPMaxPayloadSize  int
-	Format             *format.AV1
-	GenerateRTPPackets bool
-	Parent             logger.Writer
-
-	encoder     *rtpav1.Encoder
-	decoder     *rtpav1.Decoder
-	randomStart uint32
-}
-
-func (t *av1) initialize() error {
-	if t.GenerateRTPPackets {
-		err := t.createEncoder()
-		if err != nil {
-			return err
-		}
-
-		t.randomStart, err = randUint32()
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (t *av1) createEncoder() error {
-	t.encoder = &rtpav1.Encoder{
-		PayloadMaxSize: t.RTPMaxPayloadSize,
-		PayloadType:    t.Format.PayloadTyp,
-	}
-	return t.encoder.Init()
-}
-
-func (t *av1) remuxTemporalUnit(tu unit.PayloadAV1) unit.PayloadAV1 {
-	n := 0
-
-	for _, obu := range tu {
-		typ := mcav1.OBUType((obu[0] >> 3) & 0b1111)
-
-		if typ == mcav1.OBUTypeTemporalDelimiter {
-			continue
-		}
-		n++
-	}
-
-	if n == 0 {
-		return nil
-	}
-
-	filteredTU := make([][]byte, n)
-	i := 0
-
-	for _, obu := range tu {
-		typ := mcav1.OBUType((obu[0] >> 3) & 0b1111)
-
-		if typ == mcav1.OBUTypeTemporalDelimiter {
-			continue
-		}
-
-		filteredTU[i] = obu
-		i++
-	}
-
-	return filteredTU
-}
-
-func (t *av1) ProcessUnit(u *unit.Unit) error { //nolint:dupl
-	u.Payload = t.remuxTemporalUnit(u.Payload.(unit.PayloadAV1))
-
-	pkts, err := t.encoder.Encode(u.Payload.(unit.PayloadAV1))
-	if err != nil {
-		return err
-	}
-	u.RTPPackets = pkts
-
-	for _, pkt := range u.RTPPackets {
-		pkt.Timestamp += t.randomStart + uint32(u.PTS)
-	}
-
-	return nil
-}
-
-func (t *av1) ProcessRTPPacket( //nolint:dupl
-	u *unit.Unit,
-	hasNonRTSPReaders bool,
-) error {
-	pkt := u.RTPPackets[0]
-
-	// remove padding
-	pkt.Padding = false
-	pkt.PaddingSize = 0
-
-	if len(pkt.Payload) > t.RTPMaxPayloadSize {
-		return fmt.Errorf("RTP payload size (%d) is greater than maximum allowed (%d)",
-			len(pkt.Payload), t.RTPMaxPayloadSize)
-	}
-
-	// decode from RTP
-	if hasNonRTSPReaders || t.decoder != nil {
-		if t.decoder == nil {
-			var err error
-			t.decoder, err = t.Format.CreateDecoder()
-			if err != nil {
-				return err
-			}
-		}
-
-		tu, err := t.decoder.Decode(pkt)
-		if err != nil {
-			if errors.Is(err, rtpav1.ErrNonStartingPacketAndNoPrevious) ||
-				errors.Is(err, rtpav1.ErrMorePacketsNeeded) {
-				return nil
-			}
-			return err
-		}
-
-		u.Payload = t.remuxTemporalUnit(tu)
-	}
-
-	return nil
-}
diff --git a/internal/codecprocessor/av1_test.go b/internal/codecprocessor/av1_test.go
deleted file mode 100644
index e3775dab..00000000
--- a/internal/codecprocessor/av1_test.go
+++ /dev/null
@@ -1,32 +0,0 @@
-package codecprocessor
-
-import (
-	"testing"
-
-	"github.com/bluenviron/gortsplib/v5/pkg/format"
-	mcav1 "github.com/bluenviron/mediacommon/v2/pkg/codecs/av1"
-	"github.com/bluenviron/mediamtx/internal/unit"
-	"github.com/stretchr/testify/require"
-)
-
-func TestAV1RemoveTUD(t *testing.T) {
-	forma := &format.AV1{}
-
-	p, err := New(1450, forma, true, nil)
-	require.NoError(t, err)
-
-	u := &unit.Unit{
-		PTS: 30000,
-		Payload: unit.PayloadAV1{
-			{byte(mcav1.OBUTypeTemporalDelimiter) << 3},
-			{5},
-		},
-	}
-
-	err = p.ProcessUnit(u)
-	require.NoError(t, err)
-
-	require.Equal(t, unit.PayloadAV1{
-		{5},
-	}, u.Payload)
-}
diff --git a/internal/codecprocessor/g711.go b/internal/codecprocessor/g711.go
deleted file mode 100644
index 3787ef79..00000000
--- a/internal/codecprocessor/g711.go
+++ /dev/null
@@ -1,98 +0,0 @@
-package codecprocessor //nolint:dupl
-
-import (
-	"fmt"
-
-	"github.com/bluenviron/gortsplib/v5/pkg/format"
-	"github.com/bluenviron/gortsplib/v5/pkg/format/rtplpcm"
-
-	"github.com/bluenviron/mediamtx/internal/logger"
-	"github.com/bluenviron/mediamtx/internal/unit"
-)
-
-type g711 struct {
-	RTPMaxPayloadSize  int
-	Format             *format.G711
-	GenerateRTPPackets bool
-	Parent             logger.Writer
-
-	encoder     *rtplpcm.Encoder
-	decoder     *rtplpcm.Decoder
-	randomStart uint32
-}
-
-func (t *g711) initialize() error {
-	if t.GenerateRTPPackets {
-		err := t.createEncoder()
-		if err != nil {
-			return err
-		}
-
-		t.randomStart, err = randUint32()
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (t *g711) createEncoder() error {
-	t.encoder = &rtplpcm.Encoder{
-		PayloadMaxSize: t.RTPMaxPayloadSize,
-		PayloadType:    t.Format.PayloadType(),
-		BitDepth:       8,
-		ChannelCount:   t.Format.ChannelCount,
-	}
-	return t.encoder.Init()
-}
-
-func (t *g711) ProcessUnit(u *unit.Unit) error { //nolint:dupl
-	pkts, err := t.encoder.Encode(u.Payload.(unit.PayloadG711))
-	if err != nil {
-		return err
-	}
-	u.RTPPackets = pkts
-
-	for _, pkt := range u.RTPPackets {
-		pkt.Timestamp += t.randomStart + uint32(u.PTS)
-	}
-
-	return nil
-}
-
-func (t *g711) ProcessRTPPacket( //nolint:dupl
-	u *unit.Unit,
-	hasNonRTSPReaders bool,
-) error {
-	pkt := u.RTPPackets[0]
-
-	// remove padding
-	pkt.Padding = false
-	pkt.PaddingSize = 0
-
-	if len(pkt.Payload) > t.RTPMaxPayloadSize {
-		return fmt.Errorf("RTP payload size (%d) is greater than maximum allowed (%d)",
-			len(pkt.Payload), t.RTPMaxPayloadSize)
-	}
-
-	// decode from RTP
-	if hasNonRTSPReaders || t.decoder != nil {
-		if t.decoder == nil {
-			var err error
-			t.decoder, err = t.Format.CreateDecoder()
-			if err != nil {
-				return err
-			}
-		}
-
-		samples, err := t.decoder.Decode(pkt)
-		if err != nil {
-			return err
-		}
-
-		u.Payload = unit.PayloadG711(samples)
-	}
-
-	return nil
-}
diff --git a/internal/codecprocessor/g711_test.go b/internal/codecprocessor/g711_test.go
deleted file mode 100644
index d08f2b8f..00000000
--- a/internal/codecprocessor/g711_test.go
+++ /dev/null
@@ -1,70 +0,0 @@
-package codecprocessor
-
-import (
-	"testing"
-
-	"github.com/bluenviron/gortsplib/v5/pkg/format"
-	"github.com/bluenviron/mediamtx/internal/unit"
-	"github.com/pion/rtp"
-	"github.com/stretchr/testify/require"
-)
-
-func TestG711ProcessUnit(t *testing.T) {
-	t.Run("alaw", func(t *testing.T) {
-		forma := &format.G711{
-			PayloadTyp:   8,
-			MULaw:        false,
-			SampleRate:   8000,
-			ChannelCount: 1,
-		}
-
-		p, err := New(1450, forma, true, nil)
-		require.NoError(t, err)
-
-		unit := &unit.Unit{
-			Payload: unit.PayloadG711{1, 2, 3, 4},
-		}
-
-		err = p.ProcessUnit(unit)
-		require.NoError(t, err)
-		require.Equal(t, []*rtp.Packet{{
-			Header: rtp.Header{
-				Version:        2,
-				PayloadType:    8,
-				SequenceNumber: unit.RTPPackets[0].SequenceNumber,
-				Timestamp:      unit.RTPPackets[0].Timestamp,
-				SSRC:           unit.RTPPackets[0].SSRC,
-			},
-			Payload: []byte{1, 2, 3, 4},
-		}}, unit.RTPPackets)
-	})
-
-	t.Run("mulaw", func(t *testing.T) {
-		forma := &format.G711{
-			PayloadTyp:   0,
-			MULaw:        true,
-			SampleRate:   8000,
-			ChannelCount: 1,
-		}
-
-		p, err := New(1450, forma, true, nil)
-		require.NoError(t, err)
-
-		unit := &unit.Unit{
-			Payload: unit.PayloadG711{1, 2, 3, 4},
-		}
-
-		err = p.ProcessUnit(unit)
-		require.NoError(t, err)
-		require.Equal(t, []*rtp.Packet{{
-			Header: rtp.Header{
-				Version:        2,
-				PayloadType:    0,
-				SequenceNumber: unit.RTPPackets[0].SequenceNumber,
-				Timestamp:      unit.RTPPackets[0].Timestamp,
-				SSRC:           unit.RTPPackets[0].SSRC,
-			},
-			Payload: []byte{1, 2, 3, 4},
-		}}, unit.RTPPackets)
-	})
-}
diff --git a/internal/codecprocessor/generic.go b/internal/codecprocessor/generic.go
deleted file mode 100644
index 8145e64f..00000000
--- a/internal/codecprocessor/generic.go
+++ /dev/null
@@ -1,47 +0,0 @@
-package codecprocessor
-
-import (
-	"fmt"
-
-	"github.com/bluenviron/gortsplib/v5/pkg/format"
-
-	"github.com/bluenviron/mediamtx/internal/logger"
-	"github.com/bluenviron/mediamtx/internal/unit"
-)
-
-type generic struct {
-	RTPMaxPayloadSize  int
-	Format             format.Format
-	GenerateRTPPackets bool
-	Parent             logger.Writer
-}
-
-func (t *generic) initialize() error {
-	if t.GenerateRTPPackets {
-		return fmt.Errorf("we don't know how to generate RTP packets of format %T", t.Format)
-	}
-
-	return nil
-}
-
-func (t *generic) ProcessUnit(_ *unit.Unit) error {
-	return fmt.Errorf("using a generic unit without RTP is not supported")
-}
-
-func (t *generic) ProcessRTPPacket(
-	u *unit.Unit,
-	_ bool,
-) error {
-	pkt := u.RTPPackets[0]
-
-	// remove padding
-	pkt.Padding = false
-	pkt.PaddingSize = 0
-
-	if len(pkt.Payload) > t.RTPMaxPayloadSize {
-		return fmt.Errorf("RTP payload size (%d) is greater than maximum allowed (%d)",
-			len(pkt.Payload), t.RTPMaxPayloadSize)
-	}
-
-	return nil
-}
diff --git a/internal/codecprocessor/generic_test.go b/internal/codecprocessor/generic_test.go
deleted file mode 100644
index 990fab2b..00000000
--- a/internal/codecprocessor/generic_test.go
+++ /dev/null
@@ -1,53 +0,0 @@
-package codecprocessor
-
-import (
-	"testing"
-
-	"github.com/bluenviron/gortsplib/v5/pkg/format"
-	"github.com/bluenviron/mediamtx/internal/unit"
-	"github.com/pion/rtp"
-	"github.com/stretchr/testify/require"
-)
-
-func TestGenericProcessRTPPacket(t *testing.T) {
-	forma := &format.Generic{
-		PayloadTyp: 96,
-		RTPMa:      "private/90000",
-	}
-	err := forma.Init()
-	require.NoError(t, err)
-
-	p, err := New(1450, forma, false, nil)
-	require.NoError(t, err)
-
-	pkt := &rtp.Packet{
-		Header: rtp.Header{
-			Version:        2,
-			Marker:         true,
-			PayloadType:    96,
-			SequenceNumber: 123,
-			Timestamp:      45343,
-			SSRC:           563423,
-			Padding:        true,
-		},
-		Payload:     []byte{1, 2, 3, 4},
-		PaddingSize: 20,
-	}
-
-	u := &unit.Unit{RTPPackets: []*rtp.Packet{pkt}}
-	err = p.ProcessRTPPacket(u, false)
-	require.NoError(t, err)
-
-	// check that padding has been removed
-	require.Equal(t, &rtp.Packet{
-		Header: rtp.Header{
-			Version:        2,
-			Marker:         true,
-			PayloadType:    96,
-			SequenceNumber: 123,
-			Timestamp:      45343,
-			SSRC:           563423,
-		},
-		Payload: []byte{1, 2, 3, 4},
-	}, pkt)
-}
diff --git a/internal/codecprocessor/h264.go b/internal/codecprocessor/h264.go
deleted file mode 100644
index 7e95c5b1..00000000
--- a/internal/codecprocessor/h264.go
+++ /dev/null
@@ -1,316 +0,0 @@
-package codecprocessor
-
-import (
-	"bytes"
-	"errors"
-
-	"github.com/bluenviron/gortsplib/v5/pkg/format"
-	"github.com/bluenviron/gortsplib/v5/pkg/format/rtph264"
-	mch264 "github.com/bluenviron/mediacommon/v2/pkg/codecs/h264"
-
-	"github.com/bluenviron/mediamtx/internal/logger"
-	"github.com/bluenviron/mediamtx/internal/unit"
-)
-
-// H264-related parameters
-var (
-	H264DefaultSPS = []byte{ // 1920x1080 baseline
-		0x67, 0x42, 0xc0, 0x28, 0xd9, 0x00, 0x78, 0x02,
-		0x27, 0xe5, 0x84, 0x00, 0x00, 0x03, 0x00, 0x04,
-		0x00, 0x00, 0x03, 0x00, 0xf0, 0x3c, 0x60, 0xc9, 0x20,
-	}
-
-	H264DefaultPPS = []byte{0x08, 0x06, 0x07, 0x08}
-)
-
-// extract SPS and PPS without decoding RTP packets
-func rtpH264ExtractParams(payload []byte) ([]byte, []byte) {
-	if len(payload) < 1 {
-		return nil, nil
-	}
-
-	typ := mch264.NALUType(payload[0] & 0x1F)
-
-	switch typ {
-	case mch264.NALUTypeSPS:
-		return payload, nil
-
-	case mch264.NALUTypePPS:
-		return nil, payload
-
-	case mch264.NALUTypeSTAPA:
-		payload = payload[1:]
-		var sps []byte
-		var pps []byte
-
-		for len(payload) > 0 {
-			if len(payload) < 2 {
-				break
-			}
-
-			size := uint16(payload[0])<<8 | uint16(payload[1])
-			payload = payload[2:]
-
-			if size == 0 {
-				break
-			}
-
-			if int(size) > len(payload) {
-				return nil, nil
-			}
-
-			nalu := payload[:size]
-			payload = payload[size:]
-
-			typ = mch264.NALUType(nalu[0] & 0x1F)
-
-			switch typ {
-			case mch264.NALUTypeSPS:
-				sps = nalu
-
-			case mch264.NALUTypePPS:
-				pps = nalu
-			}
-		}
-
-		return sps, pps
-
-	default:
-		return nil, nil
-	}
-}
-
-type h264 struct {
-	RTPMaxPayloadSize  int
-	Format             *format.H264
-	GenerateRTPPackets bool
-	Parent             logger.Writer
-
-	encoder     *rtph264.Encoder
-	decoder     *rtph264.Decoder
-	randomStart uint32
-}
-
-func (t *h264) initialize() error {
-	if t.GenerateRTPPackets {
-		err := t.createEncoder(nil, nil)
-		if err != nil {
-			return err
-		}
-
-		t.randomStart, err = randUint32()
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (t *h264) createEncoder(
-	ssrc *uint32,
-	initialSequenceNumber *uint16,
-) error {
-	t.encoder = &rtph264.Encoder{
-		PayloadMaxSize:        t.RTPMaxPayloadSize,
-		PayloadType:           t.Format.PayloadTyp,
-		SSRC:                  ssrc,
-		InitialSequenceNumber: initialSequenceNumber,
-		PacketizationMode:     t.Format.PacketizationMode,
-	}
-	return t.encoder.Init()
-}
-
-func (t *h264) updateTrackParametersFromRTPPacket(payload []byte) {
-	sps, pps := rtpH264ExtractParams(payload)
-
-	if (sps != nil && !bytes.Equal(sps, t.Format.SPS)) ||
-		(pps != nil && !bytes.Equal(pps, t.Format.PPS)) {
-		if sps == nil {
-			sps = t.Format.SPS
-		}
-		if pps == nil {
-			pps = t.Format.PPS
-		}
-		t.Format.SafeSetParams(sps, pps)
-	}
-}
-
-func (t *h264) updateTrackParametersFromAU(au unit.PayloadH264) {
-	sps := t.Format.SPS
-	pps := t.Format.PPS
-	update := false
-
-	for _, nalu := range au {
-		typ := mch264.NALUType(nalu[0] & 0x1F)
-
-		switch typ {
-		case mch264.NALUTypeSPS:
-			if !bytes.Equal(nalu, sps) {
-				sps = nalu
-				update = true
-			}
-
-		case mch264.NALUTypePPS:
-			if !bytes.Equal(nalu, pps) {
-				pps = nalu
-				update = true
-			}
-		}
-	}
-
-	if update {
-		t.Format.SafeSetParams(sps, pps)
-	}
-}
-
-func (t *h264) remuxAccessUnit(au unit.PayloadH264) unit.PayloadH264 {
-	isKeyFrame := false
-	n := 0
-
-	for _, nalu := range au {
-		typ := mch264.NALUType(nalu[0] & 0x1F)
-
-		switch typ {
-		case mch264.NALUTypeSPS, mch264.NALUTypePPS:
-			continue
-
-		case mch264.NALUTypeAccessUnitDelimiter:
-			continue
-
-		case mch264.NALUTypeIDR:
-			if !isKeyFrame {
-				isKeyFrame = true
-
-				// prepend parameters
-				if t.Format.SPS != nil && t.Format.PPS != nil {
-					n += 2
-				}
-			}
-		}
-		n++
-	}
-
-	if n == 0 {
-		return nil
-	}
-
-	filteredAU := make([][]byte, n)
-	i := 0
-
-	if isKeyFrame && t.Format.SPS != nil && t.Format.PPS != nil {
-		filteredAU[0] = t.Format.SPS
-		filteredAU[1] = t.Format.PPS
-		i = 2
-	}
-
-	for _, nalu := range au {
-		typ := mch264.NALUType(nalu[0] & 0x1F)
-
-		switch typ {
-		case mch264.NALUTypeSPS, mch264.NALUTypePPS:
-			continue
-
-		case mch264.NALUTypeAccessUnitDelimiter:
-			continue
-		}
-
-		filteredAU[i] = nalu
-		i++
-	}
-
-	return filteredAU
-}
-
-func (t *h264) ProcessUnit(u *unit.Unit) error {
-	t.updateTrackParametersFromAU(u.Payload.(unit.PayloadH264))
-	u.Payload = t.remuxAccessUnit(u.Payload.(unit.PayloadH264))
-
-	if !u.NilPayload() {
-		pkts, err := t.encoder.Encode(u.Payload.(unit.PayloadH264))
-		if err != nil {
-			return err
-		}
-		u.RTPPackets = pkts
-
-		for _, pkt := range u.RTPPackets {
-			pkt.Timestamp += t.randomStart + uint32(u.PTS)
-		}
-	}
-
-	return nil
-}
-
-func (t *h264) ProcessRTPPacket( //nolint:dupl
-	u *unit.Unit,
-	hasNonRTSPReaders bool,
-) error {
-	pkt := u.RTPPackets[0]
-
-	t.updateTrackParametersFromRTPPacket(pkt.Payload)
-
-	if t.encoder == nil {
-		// remove padding
-		pkt.Padding = false
-		pkt.PaddingSize = 0
-
-		// RTP packets exceed maximum size: start re-encoding them
-		if len(pkt.Payload) > t.RTPMaxPayloadSize {
-			t.Parent.Log(logger.Info, "RTP packets are too big, remuxing them into smaller ones")
-
-			v1 := pkt.SSRC
-			v2 := pkt.SequenceNumber
-			err := t.createEncoder(&v1, &v2)
-			if err != nil {
-				return err
-			}
-		}
-	}
-
-	// decode from RTP
-	if hasNonRTSPReaders || t.decoder != nil || t.encoder != nil {
-		if t.decoder == nil {
-			var err error
-			t.decoder, err = t.Format.CreateDecoder()
-			if err != nil {
-				return err
-			}
-		}
-
-		au, err := t.decoder.Decode(pkt)
-
-		if t.encoder != nil {
-			u.RTPPackets = nil
-		}
-
-		if err != nil {
-			if errors.Is(err, rtph264.ErrNonStartingPacketAndNoPrevious) ||
-				errors.Is(err, rtph264.ErrMorePacketsNeeded) {
-				return nil
-			}
-			return err
-		}
-
-		u.Payload = t.remuxAccessUnit(au)
-	}
-
-	// route packet as is
-	if t.encoder == nil {
-		return nil
-	}
-
-	// encode into RTP
-	if !u.NilPayload() {
-		pkts, err := t.encoder.Encode(u.Payload.(unit.PayloadH264))
-		if err != nil {
-			return err
-		}
-		u.RTPPackets = pkts
-
-		for _, newPKT := range u.RTPPackets {
-			newPKT.Timestamp = pkt.Timestamp
-		}
-	}
-
-	return nil
-}
diff --git a/internal/codecprocessor/h264_test.go b/internal/codecprocessor/h264_test.go
deleted file mode 100644
index 6f124fb6..00000000
--- a/internal/codecprocessor/h264_test.go
+++ /dev/null
@@ -1,307 +0,0 @@
-package codecprocessor
-
-import (
-	"bytes"
-	"fmt"
-	"testing"
-
-	"github.com/bluenviron/gortsplib/v5/pkg/format"
-	mch264 "github.com/bluenviron/mediacommon/v2/pkg/codecs/h264"
-	"github.com/pion/rtp"
-	"github.com/stretchr/testify/require"
-
-	"github.com/bluenviron/mediamtx/internal/logger"
-	"github.com/bluenviron/mediamtx/internal/unit"
-)
-
-type testLogger struct {
-	cb func(level logger.Level, format string, args ...any)
-}
-
-func (l *testLogger) Log(level logger.Level, format string, args ...any) {
-	l.cb(level, format, args...)
-}
-
-// Logger returns a dummy logger.
-func Logger(cb func(logger.Level, string, ...any)) logger.Writer {
-	return &testLogger{cb: cb}
-}
-
-func TestH264RemoveAUD(t *testing.T) {
-	forma := &format.H264{}
-
-	p, err := New(1450, forma, true, nil)
-	require.NoError(t, err)
-
-	u := &unit.Unit{
-		PTS: 30000,
-		Payload: unit.PayloadH264{
-			{9, 24}, // AUD
-			{5, 1},  // IDR
-		},
-	}
-
-	err = p.ProcessUnit(u)
-	require.NoError(t, err)
-
-	require.Equal(t, unit.PayloadH264{
-		{5, 1}, // IDR
-	}, u.Payload)
-}
-
-func TestH264AddParams(t *testing.T) {
-	forma := &format.H264{}
-
-	p, err := New(1450, forma, true, nil)
-	require.NoError(t, err)
-
-	u1 := &unit.Unit{
-		PTS: 30000,
-		Payload: unit.PayloadH264{
-			{7, 4, 5, 6}, // SPS
-			{8, 1},       // PPS
-			{5, 1},       // IDR
-		},
-	}
-
-	err = p.ProcessUnit(u1)
-	require.NoError(t, err)
-
-	require.Equal(t, unit.PayloadH264{
-		{7, 4, 5, 6}, // SPS
-		{8, 1},       // PPS
-		{5, 1},       // IDR
-	}, u1.Payload)
-
-	u2 := &unit.Unit{
-		PTS: 30000 * 2,
-		Payload: unit.PayloadH264{
-			{5, 2}, // IDR
-		},
-	}
-
-	err = p.ProcessUnit(u2)
-	require.NoError(t, err)
-
-	// test that params have been added to the SDP
-	require.Equal(t, []byte{7, 4, 5, 6}, forma.SPS)
-	require.Equal(t, []byte{8, 1}, forma.PPS)
-
-	// test that params have been added to the frame
-	require.Equal(t, unit.PayloadH264{
-		{7, 4, 5, 6}, // SPS
-		{8, 1},       // PPS
-		{5, 2},       // IDR
-	}, u2.Payload)
-
-	// test that timestamp has increased
-	require.Equal(t, u1.RTPPackets[0].Timestamp+30000, u2.RTPPackets[0].Timestamp)
-}
-
-func TestH264ProcessEmptyUnit(t *testing.T) {
-	forma := &format.H264{
-		PayloadTyp:        96,
-		PacketizationMode: 1,
-	}
-
-	p, err := New(1450, forma, true, nil)
-	require.NoError(t, err)
-
-	unit := &unit.Unit{
-		Payload: unit.PayloadH264{
-			{0x07, 0x01, 0x02, 0x03}, // SPS
-			{0x08, 0x01, 0x02},       // PPS
-		},
-	}
-
-	err = p.ProcessUnit(unit)
-	require.NoError(t, err)
-
-	// if all NALUs have been removed, no RTP packets shall be generated.
-	require.Equal(t, []*rtp.Packet(nil), unit.RTPPackets)
-}
-
-func TestH264RTPExtractParams(t *testing.T) {
-	for _, ca := range []string{"standard", "aggregated"} {
-		t.Run(ca, func(t *testing.T) {
-			forma := &format.H264{
-				PayloadTyp:        96,
-				PacketizationMode: 1,
-			}
-
-			p, err := New(1450, forma, false, nil)
-			require.NoError(t, err)
-
-			enc, err := forma.CreateEncoder()
-			require.NoError(t, err)
-
-			pkts, err := enc.Encode([][]byte{{byte(mch264.NALUTypeIDR)}})
-			require.NoError(t, err)
-
-			u := &unit.Unit{RTPPackets: []*rtp.Packet{pkts[0]}}
-			err = p.ProcessRTPPacket(u, true)
-			require.NoError(t, err)
-
-			require.Equal(t, unit.PayloadH264{
-				{byte(mch264.NALUTypeIDR)},
-			}, u.Payload)
-
-			if ca == "standard" {
-				pkts, err = enc.Encode([][]byte{{7, 4, 5, 6}}) // SPS
-				require.NoError(t, err)
-
-				u = &unit.Unit{RTPPackets: []*rtp.Packet{pkts[0]}}
-				err = p.ProcessRTPPacket(u, false)
-				require.NoError(t, err)
-
-				pkts, err = enc.Encode([][]byte{{8, 1}}) // PPS
-				require.NoError(t, err)
-
-				u = &unit.Unit{RTPPackets: []*rtp.Packet{pkts[0]}}
-				err = p.ProcessRTPPacket(u, false)
-				require.NoError(t, err)
-			} else {
-				pkts, err = enc.Encode([][]byte{
-					{7, 4, 5, 6}, // SPS
-					{8, 1},       // PPS
-				})
-				require.NoError(t, err)
-
-				u = &unit.Unit{RTPPackets: []*rtp.Packet{pkts[0]}}
-				err = p.ProcessRTPPacket(u, false)
-				require.NoError(t, err)
-			}
-
-			require.Equal(t, []byte{7, 4, 5, 6}, forma.SPS)
-			require.Equal(t, []byte{8, 1}, forma.PPS)
-
-			pkts, err = enc.Encode([][]byte{{byte(mch264.NALUTypeIDR)}})
-			require.NoError(t, err)
-
-			u = &unit.Unit{RTPPackets: []*rtp.Packet{pkts[0]}}
-			err = p.ProcessRTPPacket(u, true)
-			require.NoError(t, err)
-
-			require.Equal(t, unit.PayloadH264{
-				{0x07, 4, 5, 6},
-				{0x08, 1},
-				{byte(mch264.NALUTypeIDR)},
-			}, u.Payload)
-		})
-	}
-}
-
-func TestH264RTPOversized(t *testing.T) {
-	forma := &format.H264{
-		PayloadTyp:        96,
-		SPS:               []byte{0x01, 0x02, 0x03, 0x04},
-		PPS:               []byte{0x01, 0x02, 0x03, 0x04},
-		PacketizationMode: 1,
-	}
-
-	logged := false
-
-	p, err := New(1460, forma, false,
-		Logger(func(_ logger.Level, s string, i ...any) {
-			require.Equal(t, "RTP packets are too big, remuxing them into smaller ones", fmt.Sprintf(s, i...))
-			logged = true
-		}))
-	require.NoError(t, err)
-
-	var out []*rtp.Packet
-
-	for _, pkt := range []*rtp.Packet{
-		{
-			Header: rtp.Header{
-				Version:        2,
-				Marker:         true,
-				PayloadType:    96,
-				SequenceNumber: 123,
-				Timestamp:      45343,
-				SSRC:           563423,
-				Padding:        true,
-			},
-			Payload: []byte{0x01, 0x02, 0x03, 0x04},
-		},
-		{
-			Header: rtp.Header{
-				Version:        2,
-				Marker:         false,
-				PayloadType:    96,
-				SequenceNumber: 124,
-				Timestamp:      45343,
-				SSRC:           563423,
-				Padding:        true,
-			},
-			Payload: append([]byte{0x1c, 0b10000000}, bytes.Repeat([]byte{0x01, 0x02, 0x03, 0x04}, 2000/4)...),
-		},
-		{
-			Header: rtp.Header{
-				Version:        2,
-				Marker:         true,
-				PayloadType:    96,
-				SequenceNumber: 125,
-				Timestamp:      45343,
-				SSRC:           563423,
-				Padding:        true,
-			},
-			Payload: []byte{0x1c, 0b01000000, 0x01, 0x02, 0x03, 0x04},
-		},
-	} {
-		u := &unit.Unit{RTPPackets: []*rtp.Packet{pkt}}
-		err = p.ProcessRTPPacket(u, false)
-		require.NoError(t, err)
-
-		out = append(out, u.RTPPackets...)
-	}
-
-	require.Equal(t, []*rtp.Packet{
-		{
-			Header: rtp.Header{
-				Version:        2,
-				Marker:         true,
-				PayloadType:    96,
-				SequenceNumber: 123,
-				Timestamp:      45343,
-				SSRC:           563423,
-			},
-			Payload: []byte{0x01, 0x02, 0x03, 0x04},
-		},
-		{
-			Header: rtp.Header{
-				Version:        2,
-				Marker:         false,
-				PayloadType:    96,
-				SequenceNumber: 124,
-				Timestamp:      45343,
-				SSRC:           563423,
-			},
-			Payload: append(
-				append([]byte{0x1c, 0x80}, bytes.Repeat([]byte{0x01, 0x02, 0x03, 0x04}, 364)...),
-				[]byte{0x01, 0x02}...,
-			),
-		},
-		{
-			Header: rtp.Header{
-				Version:        2,
-				Marker:         true,
-				PayloadType:    96,
-				SequenceNumber: 125,
-				Timestamp:      45343,
-				SSRC:           563423,
-			},
-			Payload: append(
-				[]byte{0x1c, 0x40, 0x03, 0x04},
-				bytes.Repeat([]byte{0x01, 0x02, 0x03, 0x04}, 136)...,
-			),
-		},
-	}, out)
-
-	require.True(t, logged)
-}
-
-func FuzzRTPH264ExtractParams(f *testing.F) {
-	f.Fuzz(func(_ *testing.T, b []byte) {
-		rtpH264ExtractParams(b)
-	})
-}
diff --git a/internal/codecprocessor/h265.go b/internal/codecprocessor/h265.go
deleted file mode 100644
index 557eef1f..00000000
--- a/internal/codecprocessor/h265.go
+++ /dev/null
@@ -1,348 +0,0 @@
-package codecprocessor
-
-import (
-	"bytes"
-	"errors"
-
-	"github.com/bluenviron/gortsplib/v5/pkg/format"
-	"github.com/bluenviron/gortsplib/v5/pkg/format/rtph265"
-	mch265 "github.com/bluenviron/mediacommon/v2/pkg/codecs/h265"
-
-	"github.com/bluenviron/mediamtx/internal/logger"
-	"github.com/bluenviron/mediamtx/internal/unit"
-)
-
-// H265-related parameters
-var (
-	H265DefaultVPS = []byte{
-		0x40, 0x01, 0x0c, 0x01, 0xff, 0xff, 0x02, 0x20,
-		0x00, 0x00, 0x03, 0x00, 0xb0, 0x00, 0x00, 0x03,
-		0x00, 0x00, 0x03, 0x00, 0x7b, 0x18, 0xb0, 0x24,
-	}
-
-	H265DefaultSPS = []byte{
-		0x42, 0x01, 0x01, 0x02, 0x20, 0x00, 0x00, 0x03,
-		0x00, 0xb0, 0x00, 0x00, 0x03, 0x00, 0x00, 0x03,
-		0x00, 0x7b, 0xa0, 0x07, 0x82, 0x00, 0x88, 0x7d,
-		0xb6, 0x71, 0x8b, 0x92, 0x44, 0x80, 0x53, 0x88,
-		0x88, 0x92, 0xcf, 0x24, 0xa6, 0x92, 0x72, 0xc9,
-		0x12, 0x49, 0x22, 0xdc, 0x91, 0xaa, 0x48, 0xfc,
-		0xa2, 0x23, 0xff, 0x00, 0x01, 0x00, 0x01, 0x6a,
-		0x02, 0x02, 0x02, 0x01,
-	}
-
-	H265DefaultPPS = []byte{
-		0x44, 0x01, 0xc0, 0x25, 0x2f, 0x05, 0x32, 0x40,
-	}
-)
-
-// extract VPS, SPS and PPS without decoding RTP packets
-func rtpH265ExtractParams(payload []byte) ([]byte, []byte, []byte) {
-	if len(payload) < 2 {
-		return nil, nil, nil
-	}
-
-	typ := mch265.NALUType((payload[0] >> 1) & 0b111111)
-
-	switch typ {
-	case mch265.NALUType_VPS_NUT:
-		return payload, nil, nil
-
-	case mch265.NALUType_SPS_NUT:
-		return nil, payload, nil
-
-	case mch265.NALUType_PPS_NUT:
-		return nil, nil, payload
-
-	case mch265.NALUType_AggregationUnit:
-		payload = payload[2:]
-		var vps []byte
-		var sps []byte
-		var pps []byte
-
-		for len(payload) > 0 {
-			if len(payload) < 2 {
-				break
-			}
-
-			size := uint16(payload[0])<<8 | uint16(payload[1])
-			payload = payload[2:]
-
-			if size == 0 {
-				break
-			}
-
-			if int(size) > len(payload) {
-				return nil, nil, nil
-			}
-
-			nalu := payload[:size]
-			payload = payload[size:]
-
-			typ = mch265.NALUType((nalu[0] >> 1) & 0b111111)
-
-			switch typ {
-			case mch265.NALUType_VPS_NUT:
-				vps = nalu
-
-			case mch265.NALUType_SPS_NUT:
-				sps = nalu
-
-			case mch265.NALUType_PPS_NUT:
-				pps = nalu
-			}
-		}
-
-		return vps, sps, pps
-
-	default:
-		return nil, nil, nil
-	}
-}
-
-type h265 struct {
-	RTPMaxPayloadSize  int
-	Format             *format.H265
-	GenerateRTPPackets bool
-	Parent             logger.Writer
-
-	encoder     *rtph265.Encoder
-	decoder     *rtph265.Decoder
-	randomStart uint32
-}
-
-func (t *h265) initialize() error {
-	if t.GenerateRTPPackets {
-		err := t.createEncoder(nil, nil)
-		if err != nil {
-			return err
-		}
-
-		t.randomStart, err = randUint32()
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (t *h265) createEncoder(
-	ssrc *uint32,
-	initialSequenceNumber *uint16,
-) error {
-	t.encoder = &rtph265.Encoder{
-		PayloadMaxSize:        t.RTPMaxPayloadSize,
-		PayloadType:           t.Format.PayloadTyp,
-		SSRC:                  ssrc,
-		InitialSequenceNumber: initialSequenceNumber,
-		MaxDONDiff:            t.Format.MaxDONDiff,
-	}
-	return t.encoder.Init()
-}
-
-func (t *h265) updateTrackParametersFromRTPPacket(payload []byte) {
-	vps, sps, pps := rtpH265ExtractParams(payload)
-
-	if (vps != nil && !bytes.Equal(vps, t.Format.VPS)) ||
-		(sps != nil && !bytes.Equal(sps, t.Format.SPS)) ||
-		(pps != nil && !bytes.Equal(pps, t.Format.PPS)) {
-		if vps == nil {
-			vps = t.Format.VPS
-		}
-		if sps == nil {
-			sps = t.Format.SPS
-		}
-		if pps == nil {
-			pps = t.Format.PPS
-		}
-		t.Format.SafeSetParams(vps, sps, pps)
-	}
-}
-
-func (t *h265) updateTrackParametersFromAU(au unit.PayloadH265) {
-	vps := t.Format.VPS
-	sps := t.Format.SPS
-	pps := t.Format.PPS
-	update := false
-
-	for _, nalu := range au {
-		typ := mch265.NALUType((nalu[0] >> 1) & 0b111111)
-
-		switch typ {
-		case mch265.NALUType_VPS_NUT:
-			if !bytes.Equal(nalu, t.Format.VPS) {
-				vps = nalu
-				update = true
-			}
-
-		case mch265.NALUType_SPS_NUT:
-			if !bytes.Equal(nalu, t.Format.SPS) {
-				sps = nalu
-				update = true
-			}
-
-		case mch265.NALUType_PPS_NUT:
-			if !bytes.Equal(nalu, t.Format.PPS) {
-				pps = nalu
-				update = true
-			}
-		}
-	}
-
-	if update {
-		t.Format.SafeSetParams(vps, sps, pps)
-	}
-}
-
-func (t *h265) remuxAccessUnit(au unit.PayloadH265) unit.PayloadH265 {
-	isKeyFrame := false
-	n := 0
-
-	for _, nalu := range au {
-		typ := mch265.NALUType((nalu[0] >> 1) & 0b111111)
-
-		switch typ {
-		case mch265.NALUType_VPS_NUT, mch265.NALUType_SPS_NUT, mch265.NALUType_PPS_NUT:
-			continue
-
-		case mch265.NALUType_AUD_NUT:
-			continue
-
-		case mch265.NALUType_IDR_W_RADL, mch265.NALUType_IDR_N_LP, mch265.NALUType_CRA_NUT:
-			if !isKeyFrame {
-				isKeyFrame = true
-
-				// prepend parameters
-				if t.Format.VPS != nil && t.Format.SPS != nil && t.Format.PPS != nil {
-					n += 3
-				}
-			}
-		}
-		n++
-	}
-
-	if n == 0 {
-		return nil
-	}
-
-	filteredAU := make([][]byte, n)
-	i := 0
-
-	if isKeyFrame && t.Format.VPS != nil && t.Format.SPS != nil && t.Format.PPS != nil {
-		filteredAU[0] = t.Format.VPS
-		filteredAU[1] = t.Format.SPS
-		filteredAU[2] = t.Format.PPS
-		i = 3
-	}
-
-	for _, nalu := range au {
-		typ := mch265.NALUType((nalu[0] >> 1) & 0b111111)
-
-		switch typ {
-		case mch265.NALUType_VPS_NUT, mch265.NALUType_SPS_NUT, mch265.NALUType_PPS_NUT:
-			continue
-
-		case mch265.NALUType_AUD_NUT:
-			continue
-		}
-
-		filteredAU[i] = nalu
-		i++
-	}
-
-	return filteredAU
-}
-
-func (t *h265) ProcessUnit(u *unit.Unit) error { //nolint:dupl
-	t.updateTrackParametersFromAU(u.Payload.(unit.PayloadH265))
-	u.Payload = t.remuxAccessUnit(u.Payload.(unit.PayloadH265))
-
-	if !u.NilPayload() {
-		pkts, err := t.encoder.Encode(u.Payload.(unit.PayloadH265))
-		if err != nil {
-			return err
-		}
-		u.RTPPackets = pkts
-
-		for _, pkt := range u.RTPPackets {
-			pkt.Timestamp += t.randomStart + uint32(u.PTS)
-		}
-	}
-
-	return nil
-}
-
-func (t *h265) ProcessRTPPacket( //nolint:dupl
-	u *unit.Unit,
-	hasNonRTSPReaders bool,
-) error {
-	pkt := u.RTPPackets[0]
-
-	t.updateTrackParametersFromRTPPacket(pkt.Payload)
-
-	if t.encoder == nil {
-		// remove padding
-		pkt.Padding = false
-		pkt.PaddingSize = 0
-
-		// RTP packets exceed maximum size: start re-encoding them
-		if len(pkt.Payload) > t.RTPMaxPayloadSize {
-			t.Parent.Log(logger.Info, "RTP packets are too big, remuxing them into smaller ones")
-
-			v1 := pkt.SSRC
-			v2 := pkt.SequenceNumber
-			err := t.createEncoder(&v1, &v2)
-			if err != nil {
-				return err
-			}
-		}
-	}
-
-	// decode from RTP
-	if hasNonRTSPReaders || t.decoder != nil || t.encoder != nil {
-		if t.decoder == nil {
-			var err error
-			t.decoder, err = t.Format.CreateDecoder()
-			if err != nil {
-				return err
-			}
-		}
-
-		au, err := t.decoder.Decode(pkt)
-
-		if t.encoder != nil {
-			u.RTPPackets = nil
-		}
-
-		if err != nil {
-			if errors.Is(err, rtph265.ErrNonStartingPacketAndNoPrevious) ||
-				errors.Is(err, rtph265.ErrMorePacketsNeeded) {
-				return nil
-			}
-			return err
-		}
-
-		u.Payload = t.remuxAccessUnit(au)
-	}
-
-	// route packet as is
-	if t.encoder == nil {
-		return nil
-	}
-
-	// encode into RTP
-	if !u.NilPayload() {
-		pkts, err := t.encoder.Encode(u.Payload.(unit.PayloadH265))
-		if err != nil {
-			return err
-		}
-		u.RTPPackets = pkts
-
-		for _, newPKT := range u.RTPPackets {
-			newPKT.Timestamp = pkt.Timestamp
-		}
-	}
-
-	return nil
-}
diff --git a/internal/codecprocessor/h265_test.go b/internal/codecprocessor/h265_test.go
deleted file mode 100644
index 67767ace..00000000
--- a/internal/codecprocessor/h265_test.go
+++ /dev/null
@@ -1,295 +0,0 @@
-package codecprocessor
-
-import (
-	"bytes"
-	"fmt"
-	"testing"
-
-	"github.com/bluenviron/gortsplib/v5/pkg/format"
-	mch265 "github.com/bluenviron/mediacommon/v2/pkg/codecs/h265"
-	"github.com/pion/rtp"
-	"github.com/stretchr/testify/require"
-
-	"github.com/bluenviron/mediamtx/internal/logger"
-	"github.com/bluenviron/mediamtx/internal/unit"
-)
-
-func TestH265RemoveAUD(t *testing.T) {
-	forma := &format.H265{}
-
-	p, err := New(1450, forma, true, nil)
-	require.NoError(t, err)
-
-	u := &unit.Unit{
-		PTS: 30000,
-		Payload: unit.PayloadH265{
-			{byte(mch265.NALUType_AUD_NUT) << 1, 0},
-			{byte(mch265.NALUType_CRA_NUT) << 1, 0},
-		},
-	}
-
-	err = p.ProcessUnit(u)
-	require.NoError(t, err)
-
-	require.Equal(t, unit.PayloadH265{
-		{byte(mch265.NALUType_CRA_NUT) << 1, 0},
-	}, u.Payload)
-}
-
-func TestH265AddParams(t *testing.T) {
-	forma := &format.H265{}
-
-	p, err := New(1450, forma, true, nil)
-	require.NoError(t, err)
-
-	u1 := &unit.Unit{
-		PTS: 30000,
-		Payload: unit.PayloadH265{
-			{byte(mch265.NALUType_VPS_NUT) << 1, 1, 2, 3},
-			{byte(mch265.NALUType_SPS_NUT) << 1, 4, 5, 6},
-			{byte(mch265.NALUType_PPS_NUT) << 1, 7, 8, 9},
-			{byte(mch265.NALUType_CRA_NUT) << 1, 0},
-		},
-	}
-
-	err = p.ProcessUnit(u1)
-	require.NoError(t, err)
-
-	require.Equal(t, unit.PayloadH265{
-		{byte(mch265.NALUType_VPS_NUT) << 1, 1, 2, 3},
-		{byte(mch265.NALUType_SPS_NUT) << 1, 4, 5, 6},
-		{byte(mch265.NALUType_PPS_NUT) << 1, 7, 8, 9},
-		{byte(mch265.NALUType_CRA_NUT) << 1, 0},
-	}, u1.Payload)
-
-	u2 := &unit.Unit{
-		PTS: 30000 * 2,
-		Payload: unit.PayloadH265{
-			{byte(mch265.NALUType_CRA_NUT) << 1, 1},
-		},
-	}
-
-	err = p.ProcessUnit(u2)
-	require.NoError(t, err)
-
-	// test that params have been added to the SDP
-	require.Equal(t, []byte{byte(mch265.NALUType_VPS_NUT) << 1, 1, 2, 3}, forma.VPS)
-	require.Equal(t, []byte{byte(mch265.NALUType_SPS_NUT) << 1, 4, 5, 6}, forma.SPS)
-	require.Equal(t, []byte{byte(mch265.NALUType_PPS_NUT) << 1, 7, 8, 9}, forma.PPS)
-
-	// test that params have been added to the frame
-	require.Equal(t, unit.PayloadH265{
-		{byte(mch265.NALUType_VPS_NUT) << 1, 1, 2, 3},
-		{byte(mch265.NALUType_SPS_NUT) << 1, 4, 5, 6},
-		{byte(mch265.NALUType_PPS_NUT) << 1, 7, 8, 9},
-		{byte(mch265.NALUType_CRA_NUT) << 1, 1},
-	}, u2.Payload)
-
-	// test that timestamp has increased
-	require.Equal(t, u1.RTPPackets[0].Timestamp+30000, u2.RTPPackets[0].Timestamp)
-}
-
-func TestH265ProcessEmptyUnit(t *testing.T) {
-	forma := &format.H265{
-		PayloadTyp: 96,
-	}
-
-	p, err := New(1450, forma, true, nil)
-	require.NoError(t, err)
-
-	unit := &unit.Unit{
-		Payload: unit.PayloadH265{
-			{byte(mch265.NALUType_VPS_NUT) << 1, 10, 11, 12}, // VPS
-			{byte(mch265.NALUType_SPS_NUT) << 1, 13, 14, 15}, // SPS
-			{byte(mch265.NALUType_PPS_NUT) << 1, 16, 17, 18}, // PPS
-		},
-	}
-
-	err = p.ProcessUnit(unit)
-	require.NoError(t, err)
-
-	// if all NALUs have been removed, no RTP packets shall be generated.
-	require.Equal(t, []*rtp.Packet(nil), unit.RTPPackets)
-}
-
-func TestH265RTPExtractParams(t *testing.T) {
-	for _, ca := range []string{"standard", "aggregated"} {
-		t.Run(ca, func(t *testing.T) {
-			forma := &format.H265{
-				PayloadTyp: 96,
-			}
-
-			p, err := New(1450, forma, false, nil)
-			require.NoError(t, err)
-
-			enc, err := forma.CreateEncoder()
-			require.NoError(t, err)
-
-			pkts, err := enc.Encode([][]byte{{byte(mch265.NALUType_CRA_NUT) << 1, 0}})
-			require.NoError(t, err)
-
-			u := &unit.Unit{RTPPackets: []*rtp.Packet{pkts[0]}}
-			err = p.ProcessRTPPacket(u, true)
-			require.NoError(t, err)
-
-			require.Equal(t, unit.PayloadH265{
-				{byte(mch265.NALUType_CRA_NUT) << 1, 0},
-			}, u.Payload)
-
-			if ca == "standard" {
-				pkts, err = enc.Encode([][]byte{{byte(mch265.NALUType_VPS_NUT) << 1, 1, 2, 3}})
-				require.NoError(t, err)
-
-				u = &unit.Unit{RTPPackets: []*rtp.Packet{pkts[0]}}
-				err = p.ProcessRTPPacket(u, false)
-				require.NoError(t, err)
-
-				pkts, err = enc.Encode([][]byte{{byte(mch265.NALUType_SPS_NUT) << 1, 4, 5, 6}})
-				require.NoError(t, err)
-
-				u = &unit.Unit{RTPPackets: []*rtp.Packet{pkts[0]}}
-				err = p.ProcessRTPPacket(u, false)
-				require.NoError(t, err)
-
-				pkts, err = enc.Encode([][]byte{{byte(mch265.NALUType_PPS_NUT) << 1, 7, 8, 9}})
-				require.NoError(t, err)
-
-				u = &unit.Unit{RTPPackets: []*rtp.Packet{pkts[0]}}
-				err = p.ProcessRTPPacket(u, false)
-				require.NoError(t, err)
-			} else {
-				pkts, err = enc.Encode([][]byte{
-					{byte(mch265.NALUType_VPS_NUT) << 1, 1, 2, 3},
-					{byte(mch265.NALUType_SPS_NUT) << 1, 4, 5, 6},
-					{byte(mch265.NALUType_PPS_NUT) << 1, 7, 8, 9},
-				})
-				require.NoError(t, err)
-
-				u = &unit.Unit{RTPPackets: []*rtp.Packet{pkts[0]}}
-				err = p.ProcessRTPPacket(u, false)
-				require.NoError(t, err)
-			}
-
-			require.Equal(t, []byte{byte(mch265.NALUType_VPS_NUT) << 1, 1, 2, 3}, forma.VPS)
-			require.Equal(t, []byte{byte(mch265.NALUType_SPS_NUT) << 1, 4, 5, 6}, forma.SPS)
-			require.Equal(t, []byte{byte(mch265.NALUType_PPS_NUT) << 1, 7, 8, 9}, forma.PPS)
-
-			pkts, err = enc.Encode([][]byte{{byte(mch265.NALUType_CRA_NUT) << 1, 0}})
-			require.NoError(t, err)
-
-			u = &unit.Unit{RTPPackets: []*rtp.Packet{pkts[0]}}
-			err = p.ProcessRTPPacket(u, true)
-			require.NoError(t, err)
-
-			require.Equal(t, unit.PayloadH265{
-				{byte(mch265.NALUType_VPS_NUT) << 1, 1, 2, 3},
-				{byte(mch265.NALUType_SPS_NUT) << 1, 4, 5, 6},
-				{byte(mch265.NALUType_PPS_NUT) << 1, 7, 8, 9},
-				{byte(mch265.NALUType_CRA_NUT) << 1, 0},
-			}, u.Payload)
-		})
-	}
-}
-
-func TestH265RTPOversized(t *testing.T) {
-	forma := &format.H265{
-		PayloadTyp: 96,
-		VPS:        []byte{byte(mch265.NALUType_VPS_NUT) << 1, 10, 11, 12},
-		SPS:        []byte{byte(mch265.NALUType_SPS_NUT) << 1, 13, 14, 15},
-		PPS:        []byte{byte(mch265.NALUType_PPS_NUT) << 1, 16, 17, 18},
-	}
-
-	logged := false
-
-	p, err := New(1460, forma, false,
-		Logger(func(_ logger.Level, s string, i ...any) {
-			require.Equal(t, "RTP packets are too big, remuxing them into smaller ones", fmt.Sprintf(s, i...))
-			logged = true
-		}))
-	require.NoError(t, err)
-
-	var out []*rtp.Packet
-
-	for _, pkt := range []*rtp.Packet{
-		{
-			Header: rtp.Header{
-				Version:        2,
-				Marker:         true,
-				PayloadType:    96,
-				SequenceNumber: 123,
-				Timestamp:      45343,
-				SSRC:           563423,
-				Padding:        true,
-			},
-			Payload: []byte{0x01, 0x02, 0x03, 0x04},
-		},
-		{
-			Header: rtp.Header{
-				Version:        2,
-				Marker:         true,
-				PayloadType:    96,
-				SequenceNumber: 124,
-				Timestamp:      45343,
-				SSRC:           563423,
-				Padding:        true,
-			},
-			Payload: bytes.Repeat([]byte{0x01, 0x02, 0x03, 0x04}, 2000/4),
-		},
-	} {
-		u := &unit.Unit{RTPPackets: []*rtp.Packet{pkt}}
-		err = p.ProcessRTPPacket(u, false)
-		require.NoError(t, err)
-
-		out = append(out, u.RTPPackets...)
-	}
-
-	require.Equal(t, []*rtp.Packet{
-		{
-			Header: rtp.Header{
-				Version:        2,
-				Marker:         true,
-				PayloadType:    96,
-				SequenceNumber: 123,
-				Timestamp:      45343,
-				SSRC:           563423,
-			},
-			Payload: []byte{0x01, 0x02, 0x03, 0x04},
-		},
-		{
-			Header: rtp.Header{
-				Version:        2,
-				Marker:         false,
-				PayloadType:    96,
-				SequenceNumber: 124,
-				Timestamp:      45343,
-				SSRC:           563423,
-			},
-			Payload: append(
-				append([]byte{0x63, 0x02, 0x80, 0x03, 0x04}, bytes.Repeat([]byte{0x01, 0x02, 0x03, 0x04}, 363)...),
-				[]byte{0x01, 0x02, 0x03}...,
-			),
-		},
-		{
-			Header: rtp.Header{
-				Version:        2,
-				Marker:         true,
-				PayloadType:    96,
-				SequenceNumber: 125,
-				Timestamp:      45343,
-				SSRC:           563423,
-			},
-			Payload: append(
-				[]byte{0x63, 0x02, 0x40, 0x04},
-				bytes.Repeat([]byte{0x01, 0x02, 0x03, 0x04}, 135)...,
-			),
-		},
-	}, out)
-
-	require.True(t, logged)
-}
-
-func FuzzRTPH265ExtractParams(f *testing.F) {
-	f.Fuzz(func(_ *testing.T, b []byte) {
-		rtpH265ExtractParams(b)
-	})
-}
diff --git a/internal/codecprocessor/klv.go b/internal/codecprocessor/klv.go
deleted file mode 100644
index c767e0e8..00000000
--- a/internal/codecprocessor/klv.go
+++ /dev/null
@@ -1,103 +0,0 @@
-package codecprocessor
-
-import (
-	"fmt"
-
-	"github.com/bluenviron/gortsplib/v5/pkg/format"
-	"github.com/bluenviron/gortsplib/v5/pkg/format/rtpklv"
-
-	"github.com/bluenviron/mediamtx/internal/logger"
-	"github.com/bluenviron/mediamtx/internal/unit"
-)
-
-type klv struct {
-	RTPMaxPayloadSize  int
-	Format             *format.KLV
-	GenerateRTPPackets bool
-	Parent             logger.Writer
-
-	encoder     *rtpklv.Encoder
-	decoder     *rtpklv.Decoder
-	randomStart uint32
-}
-
-func (t *klv) initialize() error {
-	if t.GenerateRTPPackets {
-		err := t.createEncoder()
-		if err != nil {
-			return err
-		}
-
-		t.randomStart, err = randUint32()
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (t *klv) createEncoder() error {
-	t.encoder = &rtpklv.Encoder{
-		PayloadMaxSize: t.RTPMaxPayloadSize,
-		PayloadType:    t.Format.PayloadTyp,
-	}
-	return t.encoder.Init()
-}
-
-func (t *klv) ProcessUnit(u *unit.Unit) error { //nolint:dupl
-	if t.encoder == nil {
-		err := t.createEncoder()
-		if err != nil {
-			return err
-		}
-	}
-
-	pkts, err := t.encoder.Encode(u.Payload.(unit.PayloadKLV))
-	if err != nil {
-		return err
-	}
-	u.RTPPackets = pkts
-
-	for _, pkt := range u.RTPPackets {
-		pkt.Timestamp += t.randomStart + uint32(u.PTS)
-	}
-
-	return nil
-}
-
-func (t *klv) ProcessRTPPacket( //nolint:dupl
-	u *unit.Unit,
-	hasNonRTSPReaders bool,
-) error {
-	pkt := u.RTPPackets[0]
-
-	// remove padding
-	pkt.Padding = false
-	pkt.PaddingSize = 0
-
-	if len(pkt.Payload) > t.RTPMaxPayloadSize {
-		return fmt.Errorf("RTP payload size (%d) is greater than maximum allowed (%d)",
-			len(pkt.Payload), t.RTPMaxPayloadSize)
-	}
-
-	// decode from RTP
-	if hasNonRTSPReaders || t.decoder != nil {
-		if t.decoder == nil {
-			var err error
-			t.decoder, err = t.Format.CreateDecoder()
-			if err != nil {
-				return err
-			}
-		}
-
-		un, err := t.decoder.Decode(pkt)
-		if err != nil {
-			return err
-		}
-
-		u.Payload = unit.PayloadKLV(un)
-	}
-
-	return nil
-}
diff --git a/internal/codecprocessor/klv_test.go b/internal/codecprocessor/klv_test.go
deleted file mode 100644
index f2d1fb45..00000000
--- a/internal/codecprocessor/klv_test.go
+++ /dev/null
@@ -1,80 +0,0 @@
-package codecprocessor
-
-import (
-	"testing"
-
-	"github.com/bluenviron/gortsplib/v5/pkg/format"
-	"github.com/bluenviron/mediamtx/internal/unit"
-	"github.com/pion/rtp"
-	"github.com/stretchr/testify/require"
-)
-
-func TestKlvCreateEncoder(t *testing.T) {
-	forma := &format.KLV{
-		PayloadTyp: 96,
-	}
-	p, err := New(1472, forma, false, nil)
-	require.NoError(t, err)
-
-	klvProc := p.(*klv)
-	err = klvProc.createEncoder()
-	require.NoError(t, err)
-}
-
-func TestKlvProcessUnit(t *testing.T) {
-	forma := &format.KLV{
-		PayloadTyp: 96,
-	}
-	p, err := New(1472, forma, true, nil)
-	require.NoError(t, err)
-
-	// create test Unit
-	when := int64(5000000000) // 5 seconds in nanoseconds
-	u := unit.Unit{
-		RTPPackets: nil,
-		PTS:        when,
-		Payload:    unit.PayloadKLV{1, 2, 3, 4},
-	}
-	uu := &u
-
-	// process the unit
-	err = p.ProcessUnit(uu)
-	require.NoError(t, err)
-}
-
-func TestKlvProcessRTPPacket(t *testing.T) {
-	forma := &format.KLV{
-		PayloadTyp: 96,
-	}
-	p, err := New(1472, forma, false, nil)
-	require.NoError(t, err)
-
-	pkt := &rtp.Packet{
-		Header: rtp.Header{
-			Version:        2,
-			Marker:         true,
-			PayloadType:    96,
-			SequenceNumber: 3446,
-			Timestamp:      175349,
-			SSRC:           563423,
-			Padding:        true,
-		},
-		Payload:     []byte{1, 2, 3, 4},
-		PaddingSize: 20,
-	}
-	u := &unit.Unit{RTPPackets: []*rtp.Packet{pkt}}
-	err = p.ProcessRTPPacket(u, false)
-	require.NoError(t, err)
-
-	require.Equal(t, &rtp.Packet{
-		Header: rtp.Header{
-			Version:        2,
-			Marker:         true,
-			PayloadType:    96,
-			SequenceNumber: 3446,
-			Timestamp:      175349,
-			SSRC:           563423,
-		},
-		Payload: []byte{1, 2, 3, 4},
-	}, pkt)
-}
diff --git a/internal/codecprocessor/lpcm.go b/internal/codecprocessor/lpcm.go
deleted file mode 100644
index 82ac7fac..00000000
--- a/internal/codecprocessor/lpcm.go
+++ /dev/null
@@ -1,98 +0,0 @@
-package codecprocessor //nolint:dupl
-
-import (
-	"fmt"
-
-	"github.com/bluenviron/gortsplib/v5/pkg/format"
-	"github.com/bluenviron/gortsplib/v5/pkg/format/rtplpcm"
-
-	"github.com/bluenviron/mediamtx/internal/logger"
-	"github.com/bluenviron/mediamtx/internal/unit"
-)
-
-type lpcm struct {
-	RTPMaxPayloadSize  int
-	Format             *format.LPCM
-	GenerateRTPPackets bool
-	Parent             logger.Writer
-
-	encoder     *rtplpcm.Encoder
-	decoder     *rtplpcm.Decoder
-	randomStart uint32
-}
-
-func (t *lpcm) initialize() error {
-	if t.GenerateRTPPackets {
-		err := t.createEncoder()
-		if err != nil {
-			return err
-		}
-
-		t.randomStart, err = randUint32()
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (t *lpcm) createEncoder() error {
-	t.encoder = &rtplpcm.Encoder{
-		PayloadMaxSize: t.RTPMaxPayloadSize,
-		PayloadType:    t.Format.PayloadTyp,
-		BitDepth:       t.Format.BitDepth,
-		ChannelCount:   t.Format.ChannelCount,
-	}
-	return t.encoder.Init()
-}
-
-func (t *lpcm) ProcessUnit(u *unit.Unit) error { //nolint:dupl
-	pkts, err := t.encoder.Encode(u.Payload.(unit.PayloadLPCM))
-	if err != nil {
-		return err
-	}
-	u.RTPPackets = pkts
-
-	for _, pkt := range u.RTPPackets {
-		pkt.Timestamp += t.randomStart + uint32(u.PTS)
-	}
-
-	return nil
-}
-
-func (t *lpcm) ProcessRTPPacket( //nolint:dupl
-	u *unit.Unit,
-	hasNonRTSPReaders bool,
-) error {
-	pkt := u.RTPPackets[0]
-
-	// remove padding
-	pkt.Padding = false
-	pkt.PaddingSize = 0
-
-	if len(pkt.Payload) > t.RTPMaxPayloadSize {
-		return fmt.Errorf("RTP payload size (%d) is greater than maximum allowed (%d)",
-			len(pkt.Payload), t.RTPMaxPayloadSize)
-	}
-
-	// decode from RTP
-	if hasNonRTSPReaders || t.decoder != nil {
-		if t.decoder == nil {
-			var err error
-			t.decoder, err = t.Format.CreateDecoder()
-			if err != nil {
-				return err
-			}
-		}
-
-		samples, err := t.decoder.Decode(pkt)
-		if err != nil {
-			return err
-		}
-
-		u.Payload = unit.PayloadLPCM(samples)
-	}
-
-	return nil
-}
diff --git a/internal/codecprocessor/lpcm_test.go b/internal/codecprocessor/lpcm_test.go
deleted file mode 100644
index 4a100823..00000000
--- a/internal/codecprocessor/lpcm_test.go
+++ /dev/null
@@ -1,39 +0,0 @@
-package codecprocessor
-
-import (
-	"testing"
-
-	"github.com/bluenviron/gortsplib/v5/pkg/format"
-	"github.com/bluenviron/mediamtx/internal/unit"
-	"github.com/pion/rtp"
-	"github.com/stretchr/testify/require"
-)
-
-func TestLPCMProcessUnit(t *testing.T) {
-	forma := &format.LPCM{
-		PayloadTyp:   96,
-		BitDepth:     16,
-		SampleRate:   44100,
-		ChannelCount: 2,
-	}
-
-	p, err := New(1450, forma, true, nil)
-	require.NoError(t, err)
-
-	unit := &unit.Unit{
-		Payload: unit.PayloadLPCM{1, 2, 3, 4},
-	}
-
-	err = p.ProcessUnit(unit)
-	require.NoError(t, err)
-	require.Equal(t, []*rtp.Packet{{
-		Header: rtp.Header{
-			Version:        2,
-			PayloadType:    96,
-			SequenceNumber: unit.RTPPackets[0].SequenceNumber,
-			Timestamp:      unit.RTPPackets[0].Timestamp,
-			SSRC:           unit.RTPPackets[0].SSRC,
-		},
-		Payload: []byte{1, 2, 3, 4},
-	}}, unit.RTPPackets)
-}
diff --git a/internal/codecprocessor/mjpeg.go b/internal/codecprocessor/mjpeg.go
deleted file mode 100644
index b9c2be95..00000000
--- a/internal/codecprocessor/mjpeg.go
+++ /dev/null
@@ -1,101 +0,0 @@
-package codecprocessor //nolint:dupl
-
-import (
-	"errors"
-	"fmt"
-
-	"github.com/bluenviron/gortsplib/v5/pkg/format"
-	"github.com/bluenviron/gortsplib/v5/pkg/format/rtpmjpeg"
-
-	"github.com/bluenviron/mediamtx/internal/logger"
-	"github.com/bluenviron/mediamtx/internal/unit"
-)
-
-type mjpeg struct {
-	RTPMaxPayloadSize  int
-	Format             *format.MJPEG
-	GenerateRTPPackets bool
-	Parent             logger.Writer
-
-	encoder     *rtpmjpeg.Encoder
-	decoder     *rtpmjpeg.Decoder
-	randomStart uint32
-}
-
-func (t *mjpeg) initialize() error {
-	if t.GenerateRTPPackets {
-		err := t.createEncoder()
-		if err != nil {
-			return err
-		}
-
-		t.randomStart, err = randUint32()
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (t *mjpeg) createEncoder() error {
-	t.encoder = &rtpmjpeg.Encoder{
-		PayloadMaxSize: t.RTPMaxPayloadSize,
-	}
-	return t.encoder.Init()
-}
-
-func (t *mjpeg) ProcessUnit(u *unit.Unit) error { //nolint:dupl
-	// encode into RTP
-	pkts, err := t.encoder.Encode(u.Payload.(unit.PayloadMJPEG))
-	if err != nil {
-		return err
-	}
-	u.RTPPackets = pkts
-
-	for _, pkt := range u.RTPPackets {
-		pkt.Timestamp += t.randomStart + uint32(u.PTS)
-	}
-
-	return nil
-}
-
-func (t *mjpeg) ProcessRTPPacket( //nolint:dupl
-	u *unit.Unit,
-	hasNonRTSPReaders bool,
-) error {
-	pkt := u.RTPPackets[0]
-
-	// remove padding
-	pkt.Padding = false
-	pkt.PaddingSize = 0
-
-	if len(pkt.Payload) > t.RTPMaxPayloadSize {
-		return fmt.Errorf("RTP payload size (%d) is greater than maximum allowed (%d)",
-			len(pkt.Payload), t.RTPMaxPayloadSize)
-	}
-
-	// decode from RTP
-	if hasNonRTSPReaders || t.decoder != nil {
-		if t.decoder == nil {
-			var err error
-			t.decoder, err = t.Format.CreateDecoder()
-			if err != nil {
-				return err
-			}
-		}
-
-		frame, err := t.decoder.Decode(pkt)
-		if err != nil {
-			if errors.Is(err, rtpmjpeg.ErrNonStartingPacketAndNoPrevious) ||
-				errors.Is(err, rtpmjpeg.ErrMorePacketsNeeded) {
-				return nil
-			}
-			return err
-		}
-
-		u.Payload = unit.PayloadMJPEG(frame)
-	}
-
-	return nil
-}
diff --git a/internal/codecprocessor/mpeg1_audio.go b/internal/codecprocessor/mpeg1_audio.go
deleted file mode 100644
index 2a19fae9..00000000
--- a/internal/codecprocessor/mpeg1_audio.go
+++ /dev/null
@@ -1,100 +0,0 @@
-package codecprocessor //nolint:dupl
-
-import (
-	"errors"
-	"fmt"
-
-	"github.com/bluenviron/gortsplib/v5/pkg/format"
-	"github.com/bluenviron/gortsplib/v5/pkg/format/rtpmpeg1audio"
-
-	"github.com/bluenviron/mediamtx/internal/logger"
-	"github.com/bluenviron/mediamtx/internal/unit"
-)
-
-type mpeg1Audio struct {
-	RTPMaxPayloadSize  int
-	Format             *format.MPEG1Audio
-	GenerateRTPPackets bool
-	Parent             logger.Writer
-
-	encoder     *rtpmpeg1audio.Encoder
-	decoder     *rtpmpeg1audio.Decoder
-	randomStart uint32
-}
-
-func (t *mpeg1Audio) initialize() error {
-	if t.GenerateRTPPackets {
-		err := t.createEncoder()
-		if err != nil {
-			return err
-		}
-
-		t.randomStart, err = randUint32()
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (t *mpeg1Audio) createEncoder() error {
-	t.encoder = &rtpmpeg1audio.Encoder{
-		PayloadMaxSize: t.RTPMaxPayloadSize,
-	}
-	return t.encoder.Init()
-}
-
-func (t *mpeg1Audio) ProcessUnit(u *unit.Unit) error { //nolint:dupl
-	pkts, err := t.encoder.Encode(u.Payload.(unit.PayloadMPEG1Audio))
-	if err != nil {
-		return err
-	}
-	u.RTPPackets = pkts
-
-	for _, pkt := range u.RTPPackets {
-		pkt.Timestamp += t.randomStart + uint32(u.PTS)
-	}
-
-	return nil
-}
-
-func (t *mpeg1Audio) ProcessRTPPacket( //nolint:dupl
-	u *unit.Unit,
-	hasNonRTSPReaders bool,
-) error {
-	pkt := u.RTPPackets[0]
-
-	// remove padding
-	pkt.Padding = false
-	pkt.PaddingSize = 0
-
-	if len(pkt.Payload) > t.RTPMaxPayloadSize {
-		return fmt.Errorf("RTP payload size (%d) is greater than maximum allowed (%d)",
-			len(pkt.Payload), t.RTPMaxPayloadSize)
-	}
-
-	// decode from RTP
-	if hasNonRTSPReaders || t.decoder != nil {
-		if t.decoder == nil {
-			var err error
-			t.decoder, err = t.Format.CreateDecoder()
-			if err != nil {
-				return err
-			}
-		}
-
-		frames, err := t.decoder.Decode(pkt)
-		if err != nil {
-			if errors.Is(err, rtpmpeg1audio.ErrNonStartingPacketAndNoPrevious) ||
-				errors.Is(err, rtpmpeg1audio.ErrMorePacketsNeeded) {
-				return nil
-			}
-			return err
-		}
-
-		u.Payload = unit.PayloadMPEG1Audio(frames)
-	}
-
-	return nil
-}
diff --git a/internal/codecprocessor/mpeg1_video.go b/internal/codecprocessor/mpeg1_video.go
deleted file mode 100644
index 8923c379..00000000
--- a/internal/codecprocessor/mpeg1_video.go
+++ /dev/null
@@ -1,110 +0,0 @@
-package codecprocessor //nolint:dupl
-
-import (
-	"errors"
-	"fmt"
-
-	"github.com/bluenviron/gortsplib/v5/pkg/format"
-	"github.com/bluenviron/gortsplib/v5/pkg/format/rtpmpeg1video"
-
-	"github.com/bluenviron/mediamtx/internal/logger"
-	"github.com/bluenviron/mediamtx/internal/unit"
-)
-
-// MPEG-1 video related parameters
-var (
-	MPEG1VideoDefaultConfig = []byte{
-		0x00, 0x00, 0x01, 0xb3, 0x78, 0x04, 0x38, 0x35,
-		0xff, 0xff, 0xe0, 0x18, 0x00, 0x00, 0x01, 0xb5,
-		0x14, 0x4a, 0x00, 0x01, 0x00, 0x00,
-	}
-)
-
-type mpeg1Video struct {
-	RTPMaxPayloadSize  int
-	Format             *format.MPEG1Video
-	GenerateRTPPackets bool
-	Parent             logger.Writer
-
-	encoder     *rtpmpeg1video.Encoder
-	decoder     *rtpmpeg1video.Decoder
-	randomStart uint32
-}
-
-func (t *mpeg1Video) initialize() error {
-	if t.GenerateRTPPackets {
-		err := t.createEncoder()
-		if err != nil {
-			return err
-		}
-
-		t.randomStart, err = randUint32()
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (t *mpeg1Video) createEncoder() error {
-	t.encoder = &rtpmpeg1video.Encoder{
-		PayloadMaxSize: t.RTPMaxPayloadSize,
-	}
-	return t.encoder.Init()
-}
-
-func (t *mpeg1Video) ProcessUnit(u *unit.Unit) error { //nolint:dupl
-	// encode into RTP
-	pkts, err := t.encoder.Encode(u.Payload.(unit.PayloadMPEG1Video))
-	if err != nil {
-		return err
-	}
-	u.RTPPackets = pkts
-
-	for _, pkt := range u.RTPPackets {
-		pkt.Timestamp += t.randomStart + uint32(u.PTS)
-	}
-
-	return nil
-}
-
-func (t *mpeg1Video) ProcessRTPPacket( //nolint:dupl
-	u *unit.Unit,
-	hasNonRTSPReaders bool,
-) error {
-	pkt := u.RTPPackets[0]
-
-	// remove padding
-	pkt.Padding = false
-	pkt.PaddingSize = 0
-
-	if len(pkt.Payload) > t.RTPMaxPayloadSize {
-		return fmt.Errorf("RTP payload size (%d) is greater than maximum allowed (%d)",
-			len(pkt.Payload), t.RTPMaxPayloadSize)
-	}
-
-	// decode from RTP
-	if hasNonRTSPReaders || t.decoder != nil {
-		if t.decoder == nil {
-			var err error
-			t.decoder, err = t.Format.CreateDecoder()
-			if err != nil {
-				return err
-			}
-		}
-
-		frame, err := t.decoder.Decode(pkt)
-		if err != nil {
-			if errors.Is(err, rtpmpeg1video.ErrNonStartingPacketAndNoPrevious) ||
-				errors.Is(err, rtpmpeg1video.ErrMorePacketsNeeded) {
-				return nil
-			}
-			return err
-		}
-
-		u.Payload = unit.PayloadMPEG1Video(frame)
-	}
-
-	return nil
-}
diff --git a/internal/codecprocessor/mpeg4_audio.go b/internal/codecprocessor/mpeg4_audio.go
deleted file mode 100644
index b4d01816..00000000
--- a/internal/codecprocessor/mpeg4_audio.go
+++ /dev/null
@@ -1,103 +0,0 @@
-package codecprocessor
-
-import (
-	"errors"
-	"fmt"
-
-	"github.com/bluenviron/gortsplib/v5/pkg/format"
-	"github.com/bluenviron/gortsplib/v5/pkg/format/rtpmpeg4audio"
-
-	"github.com/bluenviron/mediamtx/internal/logger"
-	"github.com/bluenviron/mediamtx/internal/unit"
-)
-
-type mpeg4Audio struct {
-	RTPMaxPayloadSize  int
-	Format             *format.MPEG4Audio
-	GenerateRTPPackets bool
-	Parent             logger.Writer
-
-	encoder     *rtpmpeg4audio.Encoder
-	decoder     *rtpmpeg4audio.Decoder
-	randomStart uint32
-}
-
-func (t *mpeg4Audio) initialize() error {
-	if t.GenerateRTPPackets {
-		err := t.createEncoder()
-		if err != nil {
-			return err
-		}
-
-		t.randomStart, err = randUint32()
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (t *mpeg4Audio) createEncoder() error {
-	t.encoder = &rtpmpeg4audio.Encoder{
-		PayloadMaxSize:   t.RTPMaxPayloadSize,
-		PayloadType:      t.Format.PayloadTyp,
-		SizeLength:       t.Format.SizeLength,
-		IndexLength:      t.Format.IndexLength,
-		IndexDeltaLength: t.Format.IndexDeltaLength,
-	}
-	return t.encoder.Init()
-}
-
-func (t *mpeg4Audio) ProcessUnit(u *unit.Unit) error { //nolint:dupl
-	pkts, err := t.encoder.Encode(u.Payload.(unit.PayloadMPEG4Audio))
-	if err != nil {
-		return err
-	}
-	u.RTPPackets = pkts
-
-	for _, pkt := range u.RTPPackets {
-		pkt.Timestamp += t.randomStart + uint32(u.PTS)
-	}
-
-	return nil
-}
-
-func (t *mpeg4Audio) ProcessRTPPacket( //nolint:dupl
-	u *unit.Unit,
-	hasNonRTSPReaders bool,
-) error {
-	pkt := u.RTPPackets[0]
-
-	// remove padding
-	pkt.Padding = false
-	pkt.PaddingSize = 0
-
-	if len(pkt.Payload) > t.RTPMaxPayloadSize {
-		return fmt.Errorf("RTP payload size (%d) is greater than maximum allowed (%d)",
-			len(pkt.Payload), t.RTPMaxPayloadSize)
-	}
-
-	// decode from RTP
-	if hasNonRTSPReaders || t.decoder != nil {
-		if t.decoder == nil {
-			var err error
-			t.decoder, err = t.Format.CreateDecoder()
-			if err != nil {
-				return err
-			}
-		}
-
-		aus, err := t.decoder.Decode(pkt)
-		if err != nil {
-			if errors.Is(err, rtpmpeg4audio.ErrMorePacketsNeeded) {
-				return nil
-			}
-			return err
-		}
-
-		u.Payload = unit.PayloadMPEG4Audio(aus)
-	}
-
-	return nil
-}
diff --git a/internal/codecprocessor/mpeg4_audio_latm.go b/internal/codecprocessor/mpeg4_audio_latm.go
deleted file mode 100644
index 9a511955..00000000
--- a/internal/codecprocessor/mpeg4_audio_latm.go
+++ /dev/null
@@ -1,101 +0,0 @@
-package codecprocessor
-
-import (
-	"errors"
-	"fmt"
-
-	"github.com/bluenviron/gortsplib/v5/pkg/format"
-	"github.com/bluenviron/gortsplib/v5/pkg/format/rtpfragmented"
-	"github.com/bluenviron/gortsplib/v5/pkg/format/rtpmpeg4audio"
-
-	"github.com/bluenviron/mediamtx/internal/logger"
-	"github.com/bluenviron/mediamtx/internal/unit"
-)
-
-type mpeg4AudioLATM struct {
-	RTPMaxPayloadSize  int
-	Format             *format.MPEG4AudioLATM
-	GenerateRTPPackets bool
-	Parent             logger.Writer
-
-	encoder     *rtpfragmented.Encoder
-	decoder     *rtpfragmented.Decoder
-	randomStart uint32
-}
-
-func (t *mpeg4AudioLATM) initialize() error {
-	if t.GenerateRTPPackets {
-		err := t.createEncoder()
-		if err != nil {
-			return err
-		}
-
-		t.randomStart, err = randUint32()
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (t *mpeg4AudioLATM) createEncoder() error {
-	t.encoder = &rtpfragmented.Encoder{
-		PayloadMaxSize: t.RTPMaxPayloadSize,
-		PayloadType:    t.Format.PayloadTyp,
-	}
-	return t.encoder.Init()
-}
-
-func (t *mpeg4AudioLATM) ProcessUnit(u *unit.Unit) error { //nolint:dupl
-	pkts, err := t.encoder.Encode(u.Payload.(unit.PayloadMPEG4AudioLATM))
-	if err != nil {
-		return err
-	}
-	u.RTPPackets = pkts
-
-	for _, pkt := range u.RTPPackets {
-		pkt.Timestamp += t.randomStart + uint32(u.PTS)
-	}
-
-	return nil
-}
-
-func (t *mpeg4AudioLATM) ProcessRTPPacket( //nolint:dupl
-	u *unit.Unit,
-	hasNonRTSPReaders bool,
-) error {
-	pkt := u.RTPPackets[0]
-
-	// remove padding
-	pkt.Padding = false
-	pkt.PaddingSize = 0
-
-	if len(pkt.Payload) > t.RTPMaxPayloadSize {
-		return fmt.Errorf("RTP payload size (%d) is greater than maximum allowed (%d)",
-			len(pkt.Payload), t.RTPMaxPayloadSize)
-	}
-
-	// decode from RTP
-	if hasNonRTSPReaders || t.decoder != nil {
-		if t.decoder == nil {
-			var err error
-			t.decoder, err = t.Format.CreateDecoder()
-			if err != nil {
-				return err
-			}
-		}
-
-		el, err := t.decoder.Decode(pkt)
-		if err != nil {
-			if errors.Is(err, rtpmpeg4audio.ErrMorePacketsNeeded) {
-				return nil
-			}
-			return err
-		}
-
-		u.Payload = unit.PayloadMPEG4AudioLATM(el)
-	}
-
-	return nil
-}
diff --git a/internal/codecprocessor/mpeg4_video.go b/internal/codecprocessor/mpeg4_video.go
deleted file mode 100644
index 4cf7a9fc..00000000
--- a/internal/codecprocessor/mpeg4_video.go
+++ /dev/null
@@ -1,159 +0,0 @@
-package codecprocessor //nolint:dupl
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-
-	"github.com/bluenviron/gortsplib/v5/pkg/format"
-	"github.com/bluenviron/gortsplib/v5/pkg/format/rtpfragmented"
-	"github.com/bluenviron/mediacommon/v2/pkg/codecs/mpeg4video"
-
-	"github.com/bluenviron/mediamtx/internal/logger"
-	"github.com/bluenviron/mediamtx/internal/unit"
-)
-
-// MPEG-4 video related parameters
-var (
-	MPEG4VideoDefaultConfig = []byte{
-		0x00, 0x00, 0x01, 0xb0, 0x01, 0x00, 0x00, 0x01,
-		0xb5, 0x89, 0x13, 0x00, 0x00, 0x01, 0x00, 0x00,
-		0x00, 0x01, 0x20, 0x00, 0xc4, 0x8d, 0x88, 0x00,
-		0xf5, 0x3c, 0x04, 0x87, 0x14, 0x63, 0x00, 0x00,
-		0x01, 0xb2, 0x4c, 0x61, 0x76, 0x63, 0x35, 0x38,
-		0x2e, 0x31, 0x33, 0x34, 0x2e, 0x31, 0x30, 0x30,
-	}
-)
-
-type mpeg4Video struct {
-	RTPMaxPayloadSize  int
-	Format             *format.MPEG4Video
-	GenerateRTPPackets bool
-	Parent             logger.Writer
-
-	encoder     *rtpfragmented.Encoder
-	decoder     *rtpfragmented.Decoder
-	randomStart uint32
-}
-
-func (t *mpeg4Video) initialize() error {
-	if t.GenerateRTPPackets {
-		err := t.createEncoder()
-		if err != nil {
-			return err
-		}
-
-		t.randomStart, err = randUint32()
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (t *mpeg4Video) createEncoder() error {
-	t.encoder = &rtpfragmented.Encoder{
-		PayloadMaxSize: t.RTPMaxPayloadSize,
-		PayloadType:    t.Format.PayloadTyp,
-	}
-	return t.encoder.Init()
-}
-
-func (t *mpeg4Video) updateTrackParameters(frame unit.PayloadMPEG4Video) {
-	if bytes.HasPrefix(frame, []byte{0, 0, 1, byte(mpeg4video.VisualObjectSequenceStartCode)}) {
-		end := bytes.Index(frame[4:], []byte{0, 0, 1, byte(mpeg4video.GroupOfVOPStartCode)})
-		if end < 0 {
-			return
-		}
-		conf := frame[:end+4]
-
-		if !bytes.Equal(conf, t.Format.Config) {
-			t.Format.SafeSetParams(conf)
-		}
-	}
-}
-
-func (t *mpeg4Video) remuxFrame(frame unit.PayloadMPEG4Video) unit.PayloadMPEG4Video {
-	// remove config
-	if bytes.HasPrefix(frame, []byte{0, 0, 1, byte(mpeg4video.VisualObjectSequenceStartCode)}) {
-		end := bytes.Index(frame[4:], []byte{0, 0, 1, byte(mpeg4video.GroupOfVOPStartCode)})
-		if end >= 0 {
-			frame = frame[end+4:]
-		}
-	}
-
-	// add config
-	if bytes.Contains(frame, []byte{0, 0, 1, byte(mpeg4video.GroupOfVOPStartCode)}) {
-		f := make([]byte, len(t.Format.Config)+len(frame))
-		n := copy(f, t.Format.Config)
-		copy(f[n:], frame)
-		frame = f
-	}
-
-	if len(frame) == 0 {
-		return nil
-	}
-
-	return frame
-}
-
-func (t *mpeg4Video) ProcessUnit(u *unit.Unit) error { //nolint:dupl
-	t.updateTrackParameters(u.Payload.(unit.PayloadMPEG4Video))
-	u.Payload = t.remuxFrame(u.Payload.(unit.PayloadMPEG4Video))
-
-	if !u.NilPayload() {
-		pkts, err := t.encoder.Encode(u.Payload.(unit.PayloadMPEG4Video))
-		if err != nil {
-			return err
-		}
-		u.RTPPackets = pkts
-
-		for _, pkt := range u.RTPPackets {
-			pkt.Timestamp += t.randomStart + uint32(u.PTS)
-		}
-	}
-
-	return nil
-}
-
-func (t *mpeg4Video) ProcessRTPPacket( //nolint:dupl
-	u *unit.Unit,
-	hasNonRTSPReaders bool,
-) error {
-	pkt := u.RTPPackets[0]
-
-	t.updateTrackParameters(pkt.Payload)
-
-	// remove padding
-	pkt.Padding = false
-	pkt.PaddingSize = 0
-
-	if len(pkt.Payload) > t.RTPMaxPayloadSize {
-		return fmt.Errorf("RTP payload size (%d) is greater than maximum allowed (%d)",
-			len(pkt.Payload), t.RTPMaxPayloadSize)
-	}
-
-	// decode from RTP
-	if hasNonRTSPReaders || t.decoder != nil {
-		if t.decoder == nil {
-			var err error
-			t.decoder, err = t.Format.CreateDecoder()
-			if err != nil {
-				return err
-			}
-		}
-
-		frame, err := t.decoder.Decode(pkt)
-		if err != nil {
-			if errors.Is(err, rtpfragmented.ErrMorePacketsNeeded) {
-				return nil
-			}
-			return err
-		}
-
-		u.Payload = t.remuxFrame(frame)
-	}
-
-	return nil
-}
diff --git a/internal/codecprocessor/mpeg4_video_test.go b/internal/codecprocessor/mpeg4_video_test.go
deleted file mode 100644
index db66e398..00000000
--- a/internal/codecprocessor/mpeg4_video_test.go
+++ /dev/null
@@ -1,67 +0,0 @@
-package codecprocessor
-
-import (
-	"testing"
-
-	"github.com/bluenviron/gortsplib/v5/pkg/format"
-	"github.com/bluenviron/mediacommon/v2/pkg/codecs/mpeg4video"
-	"github.com/bluenviron/mediamtx/internal/unit"
-	"github.com/stretchr/testify/require"
-)
-
-func TestMPEG4VideoProcessUnit(t *testing.T) {
-	forma := &format.MPEG4Video{
-		PayloadTyp: 96,
-	}
-
-	p, err := New(1450, forma, true, nil)
-	require.NoError(t, err)
-
-	u1 := &unit.Unit{
-		PTS: 30000,
-		Payload: unit.PayloadMPEG4Video{
-			0, 0, 1, byte(mpeg4video.VisualObjectSequenceStartCode),
-			0, 0, 1, 0xFF,
-			0, 0, 1, byte(mpeg4video.GroupOfVOPStartCode),
-			0, 0, 1, 0xF0,
-		},
-	}
-
-	err = p.ProcessUnit(u1)
-	require.NoError(t, err)
-
-	require.Equal(t, unit.PayloadMPEG4Video{
-		0, 0, 1, byte(mpeg4video.VisualObjectSequenceStartCode),
-		0, 0, 1, 0xFF,
-		0, 0, 1, byte(mpeg4video.GroupOfVOPStartCode),
-		0, 0, 1, 0xF0,
-	}, u1.Payload)
-
-	u2 := &unit.Unit{
-		PTS: 30000 * 2,
-		Payload: unit.PayloadMPEG4Video{
-			0, 0, 1, byte(mpeg4video.GroupOfVOPStartCode),
-			0, 0, 1, 0xF1,
-		},
-	}
-
-	err = p.ProcessUnit(u2)
-	require.NoError(t, err)
-
-	// test that params have been added to the SDP
-	require.Equal(t, []byte{
-		0, 0, 1, byte(mpeg4video.VisualObjectSequenceStartCode),
-		0, 0, 1, 0xFF,
-	}, forma.Config)
-
-	// test that params have been added to the frame
-	require.Equal(t, unit.PayloadMPEG4Video{
-		0, 0, 1, byte(mpeg4video.VisualObjectSequenceStartCode),
-		0, 0, 1, 0xFF,
-		0, 0, 1, byte(mpeg4video.GroupOfVOPStartCode),
-		0, 0, 1, 0xF1,
-	}, u2.Payload)
-
-	// test that timestamp has increased
-	require.Equal(t, u1.RTPPackets[0].Timestamp+30000, u2.RTPPackets[0].Timestamp)
-}
diff --git a/internal/codecprocessor/opus.go b/internal/codecprocessor/opus.go
deleted file mode 100644
index 055d1748..00000000
--- a/internal/codecprocessor/opus.go
+++ /dev/null
@@ -1,105 +0,0 @@
-package codecprocessor
-
-import (
-	"fmt"
-
-	"github.com/bluenviron/gortsplib/v5/pkg/format"
-	"github.com/bluenviron/gortsplib/v5/pkg/format/rtpsimpleaudio"
-	mcopus "github.com/bluenviron/mediacommon/v2/pkg/codecs/opus"
-	"github.com/pion/rtp"
-
-	"github.com/bluenviron/mediamtx/internal/logger"
-	"github.com/bluenviron/mediamtx/internal/unit"
-)
-
-type opus struct {
-	RTPMaxPayloadSize  int
-	Format             *format.Opus
-	GenerateRTPPackets bool
-	Parent             logger.Writer
-
-	encoder     *rtpsimpleaudio.Encoder
-	decoder     *rtpsimpleaudio.Decoder
-	randomStart uint32
-}
-
-func (t *opus) initialize() error {
-	if t.GenerateRTPPackets {
-		err := t.createEncoder()
-		if err != nil {
-			return err
-		}
-
-		t.randomStart, err = randUint32()
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (t *opus) createEncoder() error {
-	t.encoder = &rtpsimpleaudio.Encoder{
-		PayloadMaxSize: t.RTPMaxPayloadSize,
-		PayloadType:    t.Format.PayloadTyp,
-	}
-	return t.encoder.Init()
-}
-
-func (t *opus) ProcessUnit(u *unit.Unit) error { //nolint:dupl
-	var rtpPackets []*rtp.Packet //nolint:prealloc
-	pts := u.PTS
-
-	for _, packet := range u.Payload.(unit.PayloadOpus) {
-		pkt, err := t.encoder.Encode(packet)
-		if err != nil {
-			return err
-		}
-
-		pkt.Timestamp += t.randomStart + uint32(pts)
-
-		rtpPackets = append(rtpPackets, pkt)
-		pts += mcopus.PacketDuration2(packet)
-	}
-
-	u.RTPPackets = rtpPackets
-
-	return nil
-}
-
-func (t *opus) ProcessRTPPacket(
-	u *unit.Unit,
-	hasNonRTSPReaders bool,
-) error {
-	pkt := u.RTPPackets[0]
-
-	// remove padding
-	pkt.Padding = false
-	pkt.PaddingSize = 0
-
-	if len(pkt.Payload) > t.RTPMaxPayloadSize {
-		return fmt.Errorf("RTP payload size (%d) is greater than maximum allowed (%d)",
-			len(pkt.Payload), t.RTPMaxPayloadSize)
-	}
-
-	// decode from RTP
-	if hasNonRTSPReaders || t.decoder != nil {
-		if t.decoder == nil {
-			var err error
-			t.decoder, err = t.Format.CreateDecoder()
-			if err != nil {
-				return err
-			}
-		}
-
-		packet, err := t.decoder.Decode(pkt)
-		if err != nil {
-			return err
-		}
-
-		u.Payload = unit.PayloadOpus{packet}
-	}
-
-	return nil
-}
diff --git a/internal/codecprocessor/opus_test.go b/internal/codecprocessor/opus_test.go
deleted file mode 100644
index e1f3e4e9..00000000
--- a/internal/codecprocessor/opus_test.go
+++ /dev/null
@@ -1,139 +0,0 @@
-package codecprocessor
-
-import (
-	"testing"
-
-	"github.com/bluenviron/gortsplib/v5/pkg/format"
-	"github.com/bluenviron/mediamtx/internal/unit"
-	"github.com/pion/rtp"
-	"github.com/stretchr/testify/require"
-)
-
-func TestOpusProcessUnit(t *testing.T) {
-	forma := &format.Opus{
-		PayloadTyp:   96,
-		ChannelCount: 2,
-	}
-
-	p, err := New(1450, forma, true, nil)
-	require.NoError(t, err)
-
-	unit := &unit.Unit{
-		Payload: unit.PayloadOpus{
-			{
-				0xfc, 0x1e, 0x61, 0x96, 0xfc, 0xf7, 0x9b, 0x23,
-				0x5b, 0xc9, 0x56, 0xad, 0x05, 0x12, 0x2f, 0x6c,
-				0xc0, 0x0c, 0x2c, 0x17, 0x7b, 0x1a, 0xde, 0x1b,
-				0x37, 0x89, 0xc5, 0xbb, 0x34, 0xbb, 0x1c, 0x74,
-				0x7c, 0x18, 0x0a, 0xde, 0xa1, 0x2b, 0x86, 0x1d,
-				0x60, 0xa2, 0xb6, 0xce, 0xe7, 0x0e, 0x17, 0x1b,
-				0xc7, 0xd4, 0xd1, 0x2a, 0x68, 0x1f, 0x05, 0x2b,
-				0x22, 0x80, 0x68, 0x12, 0x0c, 0x45, 0xbc, 0x3a,
-				0xd2, 0x1b, 0xf2, 0x8a, 0x77, 0x5f, 0x2b, 0x34,
-				0x97, 0x34, 0x09, 0x6d, 0x05, 0x5f, 0x48, 0x0c,
-				0x45, 0xb5, 0xae, 0x2a, 0x90, 0x21, 0xda, 0xfb,
-				0x5b, 0x10,
-			},
-			{
-				0xfc, 0x1d, 0x61, 0x96, 0xfa, 0x7a, 0x90, 0x59,
-				0xb7, 0x10, 0xd7, 0x03, 0x84, 0x27, 0x3f, 0x52,
-				0x9f, 0xd7, 0x38, 0x9f, 0xbc, 0xff, 0x7d, 0x62,
-				0xe8, 0x60, 0x64, 0x54, 0x9d, 0x1a, 0xd1, 0x7c,
-				0x1a, 0x0a, 0x76, 0xd2, 0x30, 0x9b, 0xbe, 0xc7,
-				0x5d, 0x37, 0x42, 0xe7, 0xdd, 0xfc, 0xc7, 0x03,
-				0xab, 0x90, 0xd9, 0x9b, 0xad, 0xf4, 0x88, 0xd3,
-				0x81, 0xbf, 0xd0, 0x68, 0x10, 0x0c, 0x46, 0xa4,
-				0xe8, 0x83, 0xd9, 0x6b, 0x7a, 0x25, 0xed, 0x81,
-				0xf6, 0x92, 0x14, 0x70, 0x6c, 0x48, 0x0c, 0x45,
-				0xb4, 0xf2, 0x61, 0x9b, 0xd7, 0x62, 0x58, 0x87,
-			},
-			{
-				0xfc, 0x1e, 0x61, 0x96, 0xfa, 0x7f, 0x61, 0x51,
-				0x2f, 0x10, 0x81, 0x22, 0x01, 0x81, 0x46, 0x5e,
-				0xbd, 0xb0, 0x87, 0xcb, 0x0a, 0xa6, 0xd6, 0xd3,
-				0xec, 0x7c, 0x9e, 0xf5, 0x07, 0x5a, 0x07, 0x1b,
-				0x7c, 0x19, 0x0a, 0xde, 0xa1, 0x38, 0xe4, 0x51,
-				0x7f, 0x54, 0x6f, 0x91, 0x9f, 0xda, 0x2b, 0x40,
-				0x80, 0x36, 0xeb, 0xe3, 0xc2, 0x58, 0x12, 0x55,
-				0x80, 0x65, 0x14, 0x68, 0x12, 0x0c, 0x46, 0xa4,
-				0xdc, 0x6e, 0x62, 0x79, 0xf9, 0x09, 0x28, 0x11,
-				0xab, 0xab, 0xd3, 0x84, 0x7d, 0x93, 0x34, 0x48,
-				0x0c, 0x46, 0x9a, 0x0c, 0xb0, 0xfe, 0x7a, 0x5b,
-				0x22, 0x85, 0x4a, 0x73, 0x0d, 0xd0,
-			},
-		},
-	}
-
-	err = p.ProcessUnit(unit)
-	require.NoError(t, err)
-	require.Equal(t, []*rtp.Packet{
-		{
-			Header: rtp.Header{
-				Version:        2,
-				PayloadType:    96,
-				SequenceNumber: unit.RTPPackets[0].SequenceNumber,
-				Timestamp:      unit.RTPPackets[0].Timestamp,
-				SSRC:           unit.RTPPackets[0].SSRC,
-			},
-			Payload: []byte{
-				0xfc, 0x1e, 0x61, 0x96, 0xfc, 0xf7, 0x9b, 0x23,
-				0x5b, 0xc9, 0x56, 0xad, 0x05, 0x12, 0x2f, 0x6c,
-				0xc0, 0x0c, 0x2c, 0x17, 0x7b, 0x1a, 0xde, 0x1b,
-				0x37, 0x89, 0xc5, 0xbb, 0x34, 0xbb, 0x1c, 0x74,
-				0x7c, 0x18, 0x0a, 0xde, 0xa1, 0x2b, 0x86, 0x1d,
-				0x60, 0xa2, 0xb6, 0xce, 0xe7, 0x0e, 0x17, 0x1b,
-				0xc7, 0xd4, 0xd1, 0x2a, 0x68, 0x1f, 0x05, 0x2b,
-				0x22, 0x80, 0x68, 0x12, 0x0c, 0x45, 0xbc, 0x3a,
-				0xd2, 0x1b, 0xf2, 0x8a, 0x77, 0x5f, 0x2b, 0x34,
-				0x97, 0x34, 0x09, 0x6d, 0x05, 0x5f, 0x48, 0x0c,
-				0x45, 0xb5, 0xae, 0x2a, 0x90, 0x21, 0xda, 0xfb,
-				0x5b, 0x10,
-			},
-		},
-		{
-			Header: rtp.Header{
-				Version:        2,
-				PayloadType:    96,
-				SequenceNumber: unit.RTPPackets[0].SequenceNumber + 1,
-				Timestamp:      unit.RTPPackets[0].Timestamp + 960,
-				SSRC:           unit.RTPPackets[0].SSRC,
-			},
-			Payload: []byte{
-				0xfc, 0x1d, 0x61, 0x96, 0xfa, 0x7a, 0x90, 0x59,
-				0xb7, 0x10, 0xd7, 0x03, 0x84, 0x27, 0x3f, 0x52,
-				0x9f, 0xd7, 0x38, 0x9f, 0xbc, 0xff, 0x7d, 0x62,
-				0xe8, 0x60, 0x64, 0x54, 0x9d, 0x1a, 0xd1, 0x7c,
-				0x1a, 0x0a, 0x76, 0xd2, 0x30, 0x9b, 0xbe, 0xc7,
-				0x5d, 0x37, 0x42, 0xe7, 0xdd, 0xfc, 0xc7, 0x03,
-				0xab, 0x90, 0xd9, 0x9b, 0xad, 0xf4, 0x88, 0xd3,
-				0x81, 0xbf, 0xd0, 0x68, 0x10, 0x0c, 0x46, 0xa4,
-				0xe8, 0x83, 0xd9, 0x6b, 0x7a, 0x25, 0xed, 0x81,
-				0xf6, 0x92, 0x14, 0x70, 0x6c, 0x48, 0x0c, 0x45,
-				0xb4, 0xf2, 0x61, 0x9b, 0xd7, 0x62, 0x58, 0x87,
-			},
-		},
-		{
-			Header: rtp.Header{
-				Version:        2,
-				PayloadType:    96,
-				SequenceNumber: unit.RTPPackets[0].SequenceNumber + 2,
-				Timestamp:      unit.RTPPackets[0].Timestamp + 960*2,
-				SSRC:           unit.RTPPackets[0].SSRC,
-			},
-			Payload: []byte{
-				0xfc, 0x1e, 0x61, 0x96, 0xfa, 0x7f, 0x61, 0x51,
-				0x2f, 0x10, 0x81, 0x22, 0x01, 0x81, 0x46, 0x5e,
-				0xbd, 0xb0, 0x87, 0xcb, 0x0a, 0xa6, 0xd6, 0xd3,
-				0xec, 0x7c, 0x9e, 0xf5, 0x07, 0x5a, 0x07, 0x1b,
-				0x7c, 0x19, 0x0a, 0xde, 0xa1, 0x38, 0xe4, 0x51,
-				0x7f, 0x54, 0x6f, 0x91, 0x9f, 0xda, 0x2b, 0x40,
-				0x80, 0x36, 0xeb, 0xe3, 0xc2, 0x58, 0x12, 0x55,
-				0x80, 0x65, 0x14, 0x68, 0x12, 0x0c, 0x46, 0xa4,
-				0xdc, 0x6e, 0x62, 0x79, 0xf9, 0x09, 0x28, 0x11,
-				0xab, 0xab, 0xd3, 0x84, 0x7d, 0x93, 0x34, 0x48,
-				0x0c, 0x46, 0x9a, 0x0c, 0xb0, 0xfe, 0x7a, 0x5b,
-				0x22, 0x85, 0x4a, 0x73, 0x0d, 0xd0,
-			},
-		},
-	}, unit.RTPPackets)
-}
diff --git a/internal/codecprocessor/processor.go b/internal/codecprocessor/processor.go
deleted file mode 100644
index c99e6d81..00000000
--- a/internal/codecprocessor/processor.go
+++ /dev/null
@@ -1,185 +0,0 @@
-// Package codecprocessor contains codec-specific processing.
-package codecprocessor
-
-import (
-	"crypto/rand"
-
-	"github.com/bluenviron/gortsplib/v5/pkg/format"
-
-	"github.com/bluenviron/mediamtx/internal/logger"
-	"github.com/bluenviron/mediamtx/internal/unit"
-)
-
-func randUint32() (uint32, error) {
-	var b [4]byte
-	_, err := rand.Read(b[:])
-	if err != nil {
-		return 0, err
-	}
-	return uint32(b[0])<<24 | uint32(b[1])<<16 | uint32(b[2])<<8 | uint32(b[3]), nil
-}
-
-// Processor is the codec-specific part of the processing that happens inside stream.Stream.
-type Processor interface {
-	// process a Unit.
-	ProcessUnit(*unit.Unit) error
-
-	// process a RTP packet.
-	ProcessRTPPacket(
-		u *unit.Unit,
-		hasNonRTSPReaders bool,
-	) error
-
-	initialize() error
-}
-
-// New allocates a Processor.
-func New(
-	rtpMaxPayloadSize int,
-	forma format.Format,
-	generateRTPPackets bool,
-	parent logger.Writer,
-) (Processor, error) {
-	var proc Processor
-
-	switch forma := forma.(type) {
-	case *format.AV1:
-		proc = &av1{
-			RTPMaxPayloadSize:  rtpMaxPayloadSize,
-			Format:             forma,
-			GenerateRTPPackets: generateRTPPackets,
-			Parent:             parent,
-		}
-
-	case *format.VP9:
-		proc = &vp9{
-			RTPMaxPayloadSize:  rtpMaxPayloadSize,
-			Format:             forma,
-			GenerateRTPPackets: generateRTPPackets,
-			Parent:             parent,
-		}
-
-	case *format.VP8:
-		proc = &vp8{
-			RTPMaxPayloadSize:  rtpMaxPayloadSize,
-			Format:             forma,
-			GenerateRTPPackets: generateRTPPackets,
-			Parent:             parent,
-		}
-
-	case *format.H265:
-		proc = &h265{
-			RTPMaxPayloadSize:  rtpMaxPayloadSize,
-			Format:             forma,
-			GenerateRTPPackets: generateRTPPackets,
-			Parent:             parent,
-		}
-
-	case *format.H264:
-		proc = &h264{
-			RTPMaxPayloadSize:  rtpMaxPayloadSize,
-			Format:             forma,
-			GenerateRTPPackets: generateRTPPackets,
-			Parent:             parent,
-		}
-
-	case *format.MPEG4Video:
-		proc = &mpeg4Video{
-			RTPMaxPayloadSize:  rtpMaxPayloadSize,
-			Format:             forma,
-			GenerateRTPPackets: generateRTPPackets,
-			Parent:             parent,
-		}
-
-	case *format.MPEG1Video:
-		proc = &mpeg1Video{
-			RTPMaxPayloadSize:  rtpMaxPayloadSize,
-			Format:             forma,
-			GenerateRTPPackets: generateRTPPackets,
-			Parent:             parent,
-		}
-
-	case *format.MJPEG:
-		proc = &mjpeg{
-			RTPMaxPayloadSize:  rtpMaxPayloadSize,
-			Format:             forma,
-			GenerateRTPPackets: generateRTPPackets,
-			Parent:             parent,
-		}
-
-	case *format.Opus:
-		proc = &opus{
-			RTPMaxPayloadSize:  rtpMaxPayloadSize,
-			Format:             forma,
-			GenerateRTPPackets: generateRTPPackets,
-			Parent:             parent,
-		}
-
-	case *format.KLV:
-		proc = &klv{
-			RTPMaxPayloadSize:  rtpMaxPayloadSize,
-			Format:             forma,
-			GenerateRTPPackets: generateRTPPackets,
-			Parent:             parent,
-		}
-
-	case *format.MPEG4Audio:
-		proc = &mpeg4Audio{
-			RTPMaxPayloadSize:  rtpMaxPayloadSize,
-			Format:             forma,
-			GenerateRTPPackets: generateRTPPackets,
-			Parent:             parent,
-		}
-
-	case *format.MPEG4AudioLATM:
-		proc = &mpeg4AudioLATM{
-			RTPMaxPayloadSize:  rtpMaxPayloadSize,
-			Format:             forma,
-			GenerateRTPPackets: generateRTPPackets,
-			Parent:             parent,
-		}
-
-	case *format.MPEG1Audio:
-		proc = &mpeg1Audio{
-			RTPMaxPayloadSize:  rtpMaxPayloadSize,
-			Format:             forma,
-			GenerateRTPPackets: generateRTPPackets,
-			Parent:             parent,
-		}
-
-	case *format.AC3:
-		proc = &ac3{
-			RTPMaxPayloadSize:  rtpMaxPayloadSize,
-			Format:             forma,
-			GenerateRTPPackets: generateRTPPackets,
-			Parent:             parent,
-		}
-
-	case *format.G711:
-		proc = &g711{
-			RTPMaxPayloadSize:  rtpMaxPayloadSize,
-			Format:             forma,
-			GenerateRTPPackets: generateRTPPackets,
-			Parent:             parent,
-		}
-
-	case *format.LPCM:
-		proc = &lpcm{
-			RTPMaxPayloadSize:  rtpMaxPayloadSize,
-			Format:             forma,
-			GenerateRTPPackets: generateRTPPackets,
-			Parent:             parent,
-		}
-
-	default:
-		proc = &generic{
-			RTPMaxPayloadSize:  rtpMaxPayloadSize,
-			Format:             forma,
-			GenerateRTPPackets: generateRTPPackets,
-			Parent:             parent,
-		}
-	}
-
-	err := proc.initialize()
-	return proc, err
-}
diff --git a/internal/codecprocessor/processor_test.go b/internal/codecprocessor/processor_test.go
deleted file mode 100644
index fd33e5e5..00000000
--- a/internal/codecprocessor/processor_test.go
+++ /dev/null
@@ -1,105 +0,0 @@
-package codecprocessor
-
-import (
-	"testing"
-
-	"github.com/bluenviron/gortsplib/v5/pkg/format"
-	"github.com/stretchr/testify/require"
-)
-
-func TestNew(t *testing.T) {
-	for _, ca := range []struct {
-		name string
-		in   format.Format
-		out  Processor
-	}{
-		{
-			"av1",
-			&format.AV1{},
-			&av1{},
-		},
-		{
-			"vp9",
-			&format.VP9{},
-			&vp9{},
-		},
-		{
-			"vp8",
-			&format.VP8{},
-			&vp8{},
-		},
-		{
-			"h265",
-			&format.H265{},
-			&h265{},
-		},
-		{
-			"h264",
-			&format.H264{},
-			&h264{},
-		},
-		{
-			"mpeg4 video",
-			&format.MPEG4Video{},
-			&mpeg4Video{},
-		},
-		{
-			"mpeg1 video",
-			&format.MPEG1Video{},
-			&mpeg1Video{},
-		},
-		{
-			"mpeg1 mjpeg",
-			&format.MPEG1Audio{},
-			&mpeg1Audio{},
-		},
-		{
-			"opus",
-			&format.Opus{},
-			&opus{},
-		},
-		{
-			"mpeg4 audio",
-			&format.MPEG4Audio{},
-			&mpeg4Audio{},
-		},
-		{
-			"mpeg1 audio",
-			&format.MPEG1Audio{},
-			&mpeg1Audio{},
-		},
-		{
-			"ac3",
-			&format.AC3{},
-			&ac3{},
-		},
-		{
-			"g711",
-			&format.G711{},
-			&g711{},
-		},
-		{
-			"lpcm",
-			&format.LPCM{},
-			&lpcm{},
-		},
-		{
-			"klv",
-			&format.KLV{
-				PayloadTyp: 96,
-			},
-			&klv{},
-		},
-		{
-			"generic",
-			&format.Generic{},
-			&generic{},
-		},
-	} {
-		t.Run(ca.name, func(t *testing.T) {
-			p, err := New(1450, ca.in, false, nil)
-			require.NoError(t, err)
-			require.IsType(t, ca.out, p)
-		})
-	}
-}
diff --git a/internal/codecprocessor/testdata/fuzz/FuzzRTPH264ExtractSPSPPS/048b606517c23baf b/internal/codecprocessor/testdata/fuzz/FuzzRTPH264ExtractSPSPPS/048b606517c23baf
deleted file mode 100644
index d4bdeb53..00000000
--- a/internal/codecprocessor/testdata/fuzz/FuzzRTPH264ExtractSPSPPS/048b606517c23baf
+++ /dev/null
@@ -1,2 +0,0 @@
-go test fuzz v1
-[]byte("800")
diff --git a/internal/codecprocessor/testdata/fuzz/FuzzRTPH264ExtractSPSPPS/32e7782636603e29 b/internal/codecprocessor/testdata/fuzz/FuzzRTPH264ExtractSPSPPS/32e7782636603e29
deleted file mode 100644
index c487badc..00000000
--- a/internal/codecprocessor/testdata/fuzz/FuzzRTPH264ExtractSPSPPS/32e7782636603e29
+++ /dev/null
@@ -1,2 +0,0 @@
-go test fuzz v1
-[]byte("8\x00\x00")
diff --git a/internal/codecprocessor/testdata/fuzz/FuzzRTPH264ExtractSPSPPS/caf81e9797b19c76 b/internal/codecprocessor/testdata/fuzz/FuzzRTPH264ExtractSPSPPS/caf81e9797b19c76
deleted file mode 100644
index 67322c70..00000000
--- a/internal/codecprocessor/testdata/fuzz/FuzzRTPH264ExtractSPSPPS/caf81e9797b19c76
+++ /dev/null
@@ -1,2 +0,0 @@
-go test fuzz v1
-[]byte("")
diff --git a/internal/codecprocessor/testdata/fuzz/FuzzRTPH264ExtractSPSPPS/f428976a5b2917c0 b/internal/codecprocessor/testdata/fuzz/FuzzRTPH264ExtractSPSPPS/f428976a5b2917c0
deleted file mode 100644
index 9756ef63..00000000
--- a/internal/codecprocessor/testdata/fuzz/FuzzRTPH264ExtractSPSPPS/f428976a5b2917c0
+++ /dev/null
@@ -1,2 +0,0 @@
-go test fuzz v1
-[]byte("80")
diff --git a/internal/codecprocessor/testdata/fuzz/FuzzRTPH265ExtractParams/353ba911ad2dc191 b/internal/codecprocessor/testdata/fuzz/FuzzRTPH265ExtractParams/353ba911ad2dc191
deleted file mode 100644
index 955f0420..00000000
--- a/internal/codecprocessor/testdata/fuzz/FuzzRTPH265ExtractParams/353ba911ad2dc191
+++ /dev/null
@@ -1,2 +0,0 @@
-go test fuzz v1
-[]byte("a00")
diff --git a/internal/codecprocessor/testdata/fuzz/FuzzRTPH265ExtractParams/3c3a72c00adac0b3 b/internal/codecprocessor/testdata/fuzz/FuzzRTPH265ExtractParams/3c3a72c00adac0b3
deleted file mode 100644
index 79752f98..00000000
--- a/internal/codecprocessor/testdata/fuzz/FuzzRTPH265ExtractParams/3c3a72c00adac0b3
+++ /dev/null
@@ -1,2 +0,0 @@
-go test fuzz v1
-[]byte("a0\x00\x00")
diff --git a/internal/codecprocessor/testdata/fuzz/FuzzRTPH265ExtractParams/582528ddfad69eb5 b/internal/codecprocessor/testdata/fuzz/FuzzRTPH265ExtractParams/582528ddfad69eb5
deleted file mode 100644
index a96f5599..00000000
--- a/internal/codecprocessor/testdata/fuzz/FuzzRTPH265ExtractParams/582528ddfad69eb5
+++ /dev/null
@@ -1,2 +0,0 @@
-go test fuzz v1
-[]byte("0")
diff --git a/internal/codecprocessor/testdata/fuzz/FuzzRTPH265ExtractParams/c4389a565e828050 b/internal/codecprocessor/testdata/fuzz/FuzzRTPH265ExtractParams/c4389a565e828050
deleted file mode 100644
index 81d331a2..00000000
--- a/internal/codecprocessor/testdata/fuzz/FuzzRTPH265ExtractParams/c4389a565e828050
+++ /dev/null
@@ -1,2 +0,0 @@
-go test fuzz v1
-[]byte("a000")
diff --git a/internal/codecprocessor/vp8.go b/internal/codecprocessor/vp8.go
deleted file mode 100644
index bd4a21eb..00000000
--- a/internal/codecprocessor/vp8.go
+++ /dev/null
@@ -1,101 +0,0 @@
-package codecprocessor //nolint:dupl
-
-import (
-	"errors"
-	"fmt"
-
-	"github.com/bluenviron/gortsplib/v5/pkg/format"
-	"github.com/bluenviron/gortsplib/v5/pkg/format/rtpvp8"
-
-	"github.com/bluenviron/mediamtx/internal/logger"
-	"github.com/bluenviron/mediamtx/internal/unit"
-)
-
-type vp8 struct {
-	RTPMaxPayloadSize  int
-	Format             *format.VP8
-	GenerateRTPPackets bool
-	Parent             logger.Writer
-
-	encoder     *rtpvp8.Encoder
-	decoder     *rtpvp8.Decoder
-	randomStart uint32
-}
-
-func (t *vp8) initialize() error {
-	if t.GenerateRTPPackets {
-		err := t.createEncoder()
-		if err != nil {
-			return err
-		}
-
-		t.randomStart, err = randUint32()
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (t *vp8) createEncoder() error {
-	t.encoder = &rtpvp8.Encoder{
-		PayloadMaxSize: t.RTPMaxPayloadSize,
-		PayloadType:    t.Format.PayloadTyp,
-	}
-	return t.encoder.Init()
-}
-
-func (t *vp8) ProcessUnit(u *unit.Unit) error { //nolint:dupl
-	pkts, err := t.encoder.Encode(u.Payload.(unit.PayloadVP8))
-	if err != nil {
-		return err
-	}
-	u.RTPPackets = pkts
-
-	for _, pkt := range u.RTPPackets {
-		pkt.Timestamp += t.randomStart + uint32(u.PTS)
-	}
-
-	return nil
-}
-
-func (t *vp8) ProcessRTPPacket( //nolint:dupl
-	u *unit.Unit,
-	hasNonRTSPReaders bool,
-) error {
-	pkt := u.RTPPackets[0]
-
-	// remove padding
-	pkt.Padding = false
-	pkt.PaddingSize = 0
-
-	if len(pkt.Payload) > t.RTPMaxPayloadSize {
-		return fmt.Errorf("RTP payload size (%d) is greater than maximum allowed (%d)",
-			len(pkt.Payload), t.RTPMaxPayloadSize)
-	}
-
-	// decode from RTP
-	if hasNonRTSPReaders || t.decoder != nil {
-		if t.decoder == nil {
-			var err error
-			t.decoder, err = t.Format.CreateDecoder()
-			if err != nil {
-				return err
-			}
-		}
-
-		frame, err := t.decoder.Decode(pkt)
-		if err != nil {
-			if errors.Is(err, rtpvp8.ErrNonStartingPacketAndNoPrevious) ||
-				errors.Is(err, rtpvp8.ErrMorePacketsNeeded) {
-				return nil
-			}
-			return err
-		}
-
-		u.Payload = unit.PayloadVP8(frame)
-	}
-
-	return nil
-}
diff --git a/internal/codecprocessor/vp9.go b/internal/codecprocessor/vp9.go
deleted file mode 100644
index c03ab8af..00000000
--- a/internal/codecprocessor/vp9.go
+++ /dev/null
@@ -1,101 +0,0 @@
-package codecprocessor //nolint:dupl
-
-import (
-	"errors"
-	"fmt"
-
-	"github.com/bluenviron/gortsplib/v5/pkg/format"
-	"github.com/bluenviron/gortsplib/v5/pkg/format/rtpvp9"
-
-	"github.com/bluenviron/mediamtx/internal/logger"
-	"github.com/bluenviron/mediamtx/internal/unit"
-)
-
-type vp9 struct {
-	RTPMaxPayloadSize  int
-	Format             *format.VP9
-	GenerateRTPPackets bool
-	Parent             logger.Writer
-
-	encoder     *rtpvp9.Encoder
-	decoder     *rtpvp9.Decoder
-	randomStart uint32
-}
-
-func (t *vp9) initialize() error {
-	if t.GenerateRTPPackets {
-		err := t.createEncoder()
-		if err != nil {
-			return err
-		}
-
-		t.randomStart, err = randUint32()
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (t *vp9) createEncoder() error {
-	t.encoder = &rtpvp9.Encoder{
-		PayloadMaxSize: t.RTPMaxPayloadSize,
-		PayloadType:    t.Format.PayloadTyp,
-	}
-	return t.encoder.Init()
-}
-
-func (t *vp9) ProcessUnit(u *unit.Unit) error { //nolint:dupl
-	pkts, err := t.encoder.Encode(u.Payload.(unit.PayloadVP9))
-	if err != nil {
-		return err
-	}
-	u.RTPPackets = pkts
-
-	for _, pkt := range u.RTPPackets {
-		pkt.Timestamp += t.randomStart + uint32(u.PTS)
-	}
-
-	return nil
-}
-
-func (t *vp9) ProcessRTPPacket( //nolint:dupl
-	u *unit.Unit,
-	hasNonRTSPReaders bool,
-) error {
-	pkt := u.RTPPackets[0]
-
-	// remove padding
-	pkt.Padding = false
-	pkt.PaddingSize = 0
-
-	if len(pkt.Payload) > t.RTPMaxPayloadSize {
-		return fmt.Errorf("RTP payload size (%d) is greater than maximum allowed (%d)",
-			len(pkt.Payload), t.RTPMaxPayloadSize)
-	}
-
-	// decode from RTP
-	if hasNonRTSPReaders || t.decoder != nil {
-		if t.decoder == nil {
-			var err error
-			t.decoder, err = t.Format.CreateDecoder()
-			if err != nil {
-				return err
-			}
-		}
-
-		frame, err := t.decoder.Decode(pkt)
-		if err != nil {
-			if errors.Is(err, rtpvp9.ErrNonStartingPacketAndNoPrevious) ||
-				errors.Is(err, rtpvp9.ErrMorePacketsNeeded) {
-				return nil
-			}
-			return err
-		}
-
-		u.Payload = unit.PayloadVP9(frame)
-	}
-
-	return nil
-}
diff --git a/internal/conf/conf.go b/internal/conf/conf.go
index 32b850a4..6d93a413 100644
--- a/internal/conf/conf.go
+++ b/internal/conf/conf.go
@@ -152,6 +152,7 @@ type Conf struct {
 	// General
 	LogLevel            LogLevel        `json:"logLevel"`
 	LogDestinations     LogDestinations `json:"logDestinations"`
+	LogStructured       bool            `json:"logStructured"`
 	LogFile             string          `json:"logFile"`
 	SysLogPrefix        string          `json:"sysLogPrefix"`
 	ReadTimeout         Duration        `json:"readTimeout"`
@@ -321,6 +322,7 @@ func (conf *Conf) setDefaults() {
 	// General
 	conf.LogLevel = LogLevel(logger.Info)
 	conf.LogDestinations = LogDestinations{logger.DestinationStdout}
+	conf.LogStructured = false
 	conf.LogFile = "mediamtx.log"
 	conf.SysLogPrefix = "mediamtx"
 	conf.ReadTimeout = 10 * Duration(time.Second)
diff --git a/internal/core/api_test.go b/internal/core/api_test.go
index bb363358..27b65dc9 100644
--- a/internal/core/api_test.go
+++ b/internal/core/api_test.go
@@ -15,10 +15,11 @@ import (
 	"time"
 
 	"github.com/bluenviron/gortmplib"
+	rtmpcodecs "github.com/bluenviron/gortmplib/pkg/codecs"
 	"github.com/bluenviron/gortsplib/v5"
 	"github.com/bluenviron/gortsplib/v5/pkg/description"
-	"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"
 	srt "github.com/datarhei/gosrt"
 	"github.com/google/uuid"
 	"github.com/pion/rtp"
@@ -440,14 +441,21 @@ func TestAPIProtocolListGet(t *testing.T) {
 				require.NoError(t, err)
 				defer conn.Close()
 
+				track := &gortmplib.Track{
+					Codec: &rtmpcodecs.H264{
+						SPS: test.FormatH264.SPS,
+						PPS: test.FormatH264.PPS,
+					},
+				}
+
 				w := &gortmplib.Writer{
 					Conn:   conn,
-					Tracks: []format.Format{test.FormatH264},
+					Tracks: []*gortmplib.Track{track},
 				}
 				err = w.Initialize()
 				require.NoError(t, err)
 
-				err = w.WriteH264(test.FormatH264, 2*time.Second, 2*time.Second, [][]byte{{5, 2, 3, 4}})
+				err = w.WriteH264(track, 2*time.Second, 2*time.Second, [][]byte{{5, 2, 3, 4}})
 				require.NoError(t, err)
 
 				time.Sleep(500 * time.Millisecond)
@@ -557,7 +565,7 @@ func TestAPIProtocolListGet(t *testing.T) {
 				defer conn.Close()
 
 				track := &mpegts.Track{
-					Codec: &mpegts.CodecH264{},
+					Codec: &tscodecs.H264{},
 				}
 
 				bw := bufio.NewWriter(conn)
@@ -1037,14 +1045,21 @@ func TestAPIProtocolKick(t *testing.T) {
 				require.NoError(t, err)
 				defer conn.Close()
 
+				track := &gortmplib.Track{
+					Codec: &rtmpcodecs.H264{
+						SPS: test.FormatH264.SPS,
+						PPS: test.FormatH264.PPS,
+					},
+				}
+
 				w := &gortmplib.Writer{
 					Conn:   conn,
-					Tracks: []format.Format{test.FormatH264},
+					Tracks: []*gortmplib.Track{track},
 				}
 				err = w.Initialize()
 				require.NoError(t, err)
 
-				err = w.WriteH264(test.FormatH264, 2*time.Second, 2*time.Second, [][]byte{{5, 2, 3, 4}})
+				err = w.WriteH264(track, 2*time.Second, 2*time.Second, [][]byte{{5, 2, 3, 4}})
 				require.NoError(t, err)
 
 			case "webrtc":
@@ -1084,7 +1099,7 @@ func TestAPIProtocolKick(t *testing.T) {
 				defer conn.Close()
 
 				track := &mpegts.Track{
-					Codec: &mpegts.CodecH264{},
+					Codec: &tscodecs.H264{},
 				}
 
 				bw := bufio.NewWriter(conn)
diff --git a/internal/core/core.go b/internal/core/core.go
index 2c7b0811..45892b96 100644
--- a/internal/core/core.go
+++ b/internal/core/core.go
@@ -10,6 +10,7 @@ import (
 	"path/filepath"
 	"reflect"
 	"runtime"
+	"runtime/debug"
 	"slices"
 	"strings"
 	"syscall"
@@ -55,10 +56,24 @@ var defaultConfPathsNotWin = []string{
 	"/etc/mediamtx/mediamtx.yml",
 }
 
-var cli struct {
-	Confpath string `arg:"" default:""`
-	Version  bool   `help:"print version"`
-	Upgrade  bool   `help:"upgrade executable to the latest version"`
+func goArm() string {
+	bi, _ := debug.ReadBuildInfo()
+	for _, bs := range bi.Settings {
+		if bs.Key == "GOARM" {
+			return bs.Value
+		}
+	}
+	return ""
+}
+
+func getArch() string {
+	var arch string
+	if runtime.GOARCH == "arm" {
+		arch = "armv" + goArm()
+	} else {
+		arch = runtime.GOARCH
+	}
+	return arch
 }
 
 func atLeastOneRecordDeleteAfter(pathConfs map[string]*conf.Path) bool {
@@ -82,6 +97,12 @@ func getRTPMaxPayloadSize(udpMaxPayloadSize int, rtspEncryption conf.Encryption)
 	return v
 }
 
+var cli struct {
+	Confpath string `arg:"" default:""`
+	Version  bool   `help:"print version"`
+	Upgrade  bool   `help:"upgrade executable to the latest version"`
+}
+
 // Core is an instance of MediaMTX.
 type Core struct {
 	ctx             context.Context
@@ -116,7 +137,7 @@ type Core struct {
 // New allocates a Core.
 func New(args []string) (*Core, bool) {
 	parser, err := kong.New(&cli,
-		kong.Description("MediaMTX "+string(version)),
+		kong.Description("MediaMTX "+string(version)+", "+runtime.GOOS+", "+getArch()),
 		kong.UsageOnError(),
 		kong.ValueFormatter(func(value *kong.Value) string {
 			switch value.Name {
@@ -157,7 +178,14 @@ func New(args []string) (*Core, bool) {
 		done:           make(chan struct{}),
 	}
 
-	tempLogger, _ := logger.New(logger.Warn, []logger.Destination{logger.DestinationStdout}, "", "")
+	tempLogger := &logger.Logger{
+		Level:        logger.Warn,
+		Destinations: []logger.Destination{logger.DestinationStdout},
+		Structured:   false,
+		File:         "",
+		SysLogPrefix: "",
+	}
+	tempLogger.Initialize() //nolint:errcheck
 
 	confPaths := append([]string(nil), defaultConfPaths...)
 	if runtime.GOOS != "windows" {
@@ -263,19 +291,22 @@ func (p *Core) createResources(initial bool) error {
 	var err error
 
 	if p.logger == nil {
-		p.logger, err = logger.New(
-			logger.Level(p.conf.LogLevel),
-			p.conf.LogDestinations,
-			p.conf.LogFile,
-			p.conf.SysLogPrefix,
-		)
+		i := &logger.Logger{
+			Level:        logger.Level(p.conf.LogLevel),
+			Destinations: p.conf.LogDestinations,
+			Structured:   p.conf.LogStructured,
+			File:         p.conf.LogFile,
+			SysLogPrefix: p.conf.SysLogPrefix,
+		}
+		err = i.Initialize()
 		if err != nil {
 			return err
 		}
+		p.logger = i
 	}
 
 	if initial {
-		p.Log(logger.Info, "MediaMTX %s", version)
+		p.Log(logger.Info, "MediaMTX "+string(version)+", "+runtime.GOOS+", "+getArch())
 
 		if p.confPath != "" {
 			a, _ := filepath.Abs(p.confPath)
@@ -692,7 +723,8 @@ func (p *Core) closeResources(newConf *conf.Conf, calledByAPI bool) {
 		newConf.LogLevel != p.conf.LogLevel ||
 		!reflect.DeepEqual(newConf.LogDestinations, p.conf.LogDestinations) ||
 		newConf.LogFile != p.conf.LogFile ||
-		newConf.SysLogPrefix != p.conf.SysLogPrefix
+		newConf.SysLogPrefix != p.conf.SysLogPrefix ||
+		newConf.LogStructured != p.conf.LogStructured
 
 	closeAuthManager := newConf == nil ||
 		newConf.AuthMethod != p.conf.AuthMethod ||
diff --git a/internal/core/metrics_test.go b/internal/core/metrics_test.go
index d4e44ebd..1391dfea 100644
--- a/internal/core/metrics_test.go
+++ b/internal/core/metrics_test.go
@@ -13,10 +13,11 @@ import (
 	"time"
 
 	"github.com/bluenviron/gortmplib"
+	rtmpcodecs "github.com/bluenviron/gortmplib/pkg/codecs"
 	"github.com/bluenviron/gortsplib/v5"
 	"github.com/bluenviron/gortsplib/v5/pkg/description"
-	"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"
 	srt "github.com/datarhei/gosrt"
 	"github.com/pion/rtp"
 	pwebrtc "github.com/pion/webrtc/v4"
@@ -217,14 +218,21 @@ webrtc_sessions_rtcp_packets_sent 0
 			require.NoError(t, err2)
 			defer conn.Close()
 
+			track := &gortmplib.Track{
+				Codec: &rtmpcodecs.H264{
+					SPS: test.FormatH264.SPS,
+					PPS: test.FormatH264.PPS,
+				},
+			}
+
 			w := &gortmplib.Writer{
 				Conn:   conn,
-				Tracks: []format.Format{test.FormatH264},
+				Tracks: []*gortmplib.Track{track},
 			}
 			err2 = w.Initialize()
 			require.NoError(t, err2)
 
-			err2 = w.WriteH264(test.FormatH264, 2*time.Second, 2*time.Second, [][]byte{{5, 2, 3, 4}})
+			err2 = w.WriteH264(track, 2*time.Second, 2*time.Second, [][]byte{{5, 2, 3, 4}})
 			require.NoError(t, err2)
 
 			<-terminate
@@ -245,14 +253,21 @@ webrtc_sessions_rtcp_packets_sent 0
 			require.NoError(t, err2)
 			defer conn.Close()
 
+			track := &gortmplib.Track{
+				Codec: &rtmpcodecs.H264{
+					SPS: test.FormatH264.SPS,
+					PPS: test.FormatH264.PPS,
+				},
+			}
+
 			w := &gortmplib.Writer{
 				Conn:   conn,
-				Tracks: []format.Format{test.FormatH264},
+				Tracks: []*gortmplib.Track{track},
 			}
 			err2 = w.Initialize()
 			require.NoError(t, err2)
 
-			err2 = w.WriteH264(test.FormatH264, 2*time.Second, 2*time.Second, [][]byte{{5, 2, 3, 4}})
+			err2 = w.WriteH264(track, 2*time.Second, 2*time.Second, [][]byte{{5, 2, 3, 4}})
 			require.NoError(t, err2)
 
 			<-terminate
@@ -318,7 +333,7 @@ webrtc_sessions_rtcp_packets_sent 0
 			defer publisher.Close()
 
 			track := &mpegts.Track{
-				Codec: &mpegts.CodecH264{},
+				Codec: &tscodecs.H264{},
 			}
 
 			bw := bufio.NewWriter(publisher)
diff --git a/internal/core/path.go b/internal/core/path.go
index 123bb21e..ad702a98 100644
--- a/internal/core/path.go
+++ b/internal/core/path.go
@@ -381,7 +381,7 @@ func (pa *path) doReloadConf(newConf *conf.Path) {
 }
 
 func (pa *path) doSourceStaticSetReady(req defs.PathSourceStaticSetReadyReq) {
-	err := pa.setReady(req.Desc, req.GenerateRTPPackets, req.FillNTP)
+	err := pa.setReady(req.Desc, req.UseRTPPackets, req.ReplaceNTP)
 	if err != nil {
 		req.Res <- defs.PathSourceStaticSetReadyRes{Err: err}
 		return
@@ -478,7 +478,7 @@ func (pa *path) doAddPublisher(req defs.PathAddPublisherReq) {
 	pa.source = req.Author
 	pa.publisherQuery = req.AccessRequest.Query
 
-	err := pa.setReady(req.Desc, req.GenerateRTPPackets, req.FillNTP)
+	err := pa.setReady(req.Desc, req.UseRTPPackets, req.ReplaceNTP)
 	if err != nil {
 		pa.source = nil
 		req.Res <- defs.PathAddPublisherRes{Err: err}
@@ -586,9 +586,11 @@ func (pa *path) doAPIPathsGet(req pathAPIPathsGetReq) {
 				return pa.stream.BytesSent()
 			}(),
 			Readers: func() []defs.APIPathSourceOrReader {
-				ret := []defs.APIPathSourceOrReader{}
+				ret := make([]defs.APIPathSourceOrReader, len(pa.readers))
+				i := 0
 				for r := range pa.readers {
-					ret = append(ret, r.APIReaderDescribe())
+					ret[i] = r.APIReaderDescribe()
+					i++
 				}
 				return ret
 			}(),
@@ -688,14 +690,14 @@ func (pa *path) onDemandPublisherStop(reason string) {
 	pa.onDemandPublisherState = pathOnDemandStateInitial
 }
 
-func (pa *path) setReady(desc *description.Session, generateRTPPackets bool, fillNTP bool) error {
+func (pa *path) setReady(desc *description.Session, useRTPPackets bool, replaceNTP bool) error {
 	pa.stream = &stream.Stream{
-		WriteQueueSize:     pa.writeQueueSize,
-		RTPMaxPayloadSize:  pa.rtpMaxPayloadSize,
-		Desc:               desc,
-		GenerateRTPPackets: generateRTPPackets,
-		FillNTP:            fillNTP,
-		Parent:             pa.source,
+		Desc:              desc,
+		UseRTPPackets:     useRTPPackets,
+		WriteQueueSize:    pa.writeQueueSize,
+		RTPMaxPayloadSize: pa.rtpMaxPayloadSize,
+		ReplaceNTP:        replaceNTP,
+		Parent:            pa.source,
 	}
 	err := pa.stream.Initialize()
 	if err != nil {
@@ -805,10 +807,7 @@ func (pa *path) executeRemoveReader(r defs.Reader) {
 }
 
 func (pa *path) executeRemovePublisher() {
-	if pa.stream != nil {
-		pa.setNotReady()
-	}
-
+	pa.setNotReady()
 	pa.source = nil
 }
 
diff --git a/internal/core/path_test.go b/internal/core/path_test.go
index 42deecc1..93278efb 100644
--- a/internal/core/path_test.go
+++ b/internal/core/path_test.go
@@ -842,7 +842,7 @@ func TestPathFallback(t *testing.T) {
 }
 
 func TestPathResolveSource(t *testing.T) {
-	var stream *gortsplib.ServerStream
+	var strm *gortsplib.ServerStream
 
 	s := gortsplib.Server{
 		Handler: &testServer{
@@ -852,12 +852,12 @@ func TestPathResolveSource(t *testing.T) {
 				require.Equal(t, "/a", ctx.Path)
 				return &base.Response{
 					StatusCode: base.StatusOK,
-				}, stream, nil
+				}, strm, nil
 			},
 			onSetup: func(_ *gortsplib.ServerHandlerOnSetupCtx) (*base.Response, *gortsplib.ServerStream, error) {
 				return &base.Response{
 					StatusCode: base.StatusOK,
-				}, stream, nil
+				}, strm, nil
 			},
 			onPlay: func(_ *gortsplib.ServerHandlerOnPlayCtx) (*base.Response, error) {
 				return &base.Response{
@@ -872,13 +872,13 @@ func TestPathResolveSource(t *testing.T) {
 	require.NoError(t, err)
 	defer s.Close()
 
-	stream = &gortsplib.ServerStream{
+	strm = &gortsplib.ServerStream{
 		Server: &s,
 		Desc:   &description.Session{Medias: []*description.Media{test.MediaH264}},
 	}
-	err = stream.Initialize()
+	err = strm.Initialize()
 	require.NoError(t, err)
-	defer stream.Close()
+	defer strm.Close()
 
 	p, ok := newInstance(
 		"paths:\n" +
diff --git a/internal/core/upgrade.go b/internal/core/upgrade.go
index d1ce7d65..fd7805d7 100644
--- a/internal/core/upgrade.go
+++ b/internal/core/upgrade.go
@@ -12,7 +12,6 @@ import (
 	"net/http"
 	"regexp"
 	"runtime"
-	"runtime/debug"
 	"sort"
 
 	"github.com/Masterminds/semver/v3"
@@ -62,16 +61,6 @@ func latestRemoteVersion() (*semver.Version, error) {
 	return versions[0], nil
 }
 
-func goArm() string {
-	bi, _ := debug.ReadBuildInfo()
-	for _, bs := range bi.Settings {
-		if bs.Key == "GOARM" {
-			return bs.Value
-		}
-	}
-	return ""
-}
-
 func extractExecutable(r io.Reader) ([]byte, error) {
 	gzReader, err := gzip.NewReader(r)
 	if err != nil {
@@ -152,13 +141,6 @@ func upgrade() error {
 
 	fmt.Printf("downloading version %v...\n", "v"+latest.String())
 
-	var arch string
-	if runtime.GOARCH == "arm" {
-		arch = "armv" + goArm()
-	} else {
-		arch = runtime.GOARCH
-	}
-
 	var extension string
 	if runtime.GOOS == "windows" {
 		extension = "zip"
@@ -166,7 +148,7 @@ func upgrade() error {
 		extension = "tar.gz"
 	}
 
-	ur := fmt.Sprintf(downloadURL, "v"+latest.String(), "v"+latest.String(), runtime.GOOS, arch, extension)
+	ur := fmt.Sprintf(downloadURL, "v"+latest.String(), "v"+latest.String(), runtime.GOOS, getArch(), extension)
 
 	res, err := http.Get(ur)
 	if err != nil {
diff --git a/internal/counterdumper/counterdumper.go b/internal/counterdumper/dumper.go
similarity index 74%
rename from internal/counterdumper/counterdumper.go
rename to internal/counterdumper/dumper.go
index 63ddafd9..eb58ca6c 100644
--- a/internal/counterdumper/counterdumper.go
+++ b/internal/counterdumper/dumper.go
@@ -10,8 +10,8 @@ const (
 	callbackPeriod = 1 * time.Second
 )
 
-// CounterDumper is a counter that periodically invokes a callback if the counter is not zero.
-type CounterDumper struct {
+// Dumper is a counter that periodically invokes a callback if the counter is not zero.
+type Dumper struct {
 	OnReport func(v uint64)
 
 	counter *uint64
@@ -21,7 +21,7 @@ type CounterDumper struct {
 }
 
 // Start starts the counter.
-func (c *CounterDumper) Start() {
+func (c *Dumper) Start() {
 	c.counter = new(uint64)
 	c.terminate = make(chan struct{})
 	c.done = make(chan struct{})
@@ -30,22 +30,22 @@ func (c *CounterDumper) Start() {
 }
 
 // Stop stops the counter.
-func (c *CounterDumper) Stop() {
+func (c *Dumper) Stop() {
 	close(c.terminate)
 	<-c.done
 }
 
 // Increase increases the counter value by 1.
-func (c *CounterDumper) Increase() {
+func (c *Dumper) Increase() {
 	atomic.AddUint64(c.counter, 1)
 }
 
 // Add adds value to the counter.
-func (c *CounterDumper) Add(v uint64) {
+func (c *Dumper) Add(v uint64) {
 	atomic.AddUint64(c.counter, v)
 }
 
-func (c *CounterDumper) run() {
+func (c *Dumper) run() {
 	defer close(c.done)
 
 	t := time.NewTicker(callbackPeriod)
diff --git a/internal/counterdumper/counterdumper_test.go b/internal/counterdumper/dumper_test.go
similarity index 78%
rename from internal/counterdumper/counterdumper_test.go
rename to internal/counterdumper/dumper_test.go
index 1323ea4e..ba8654a4 100644
--- a/internal/counterdumper/counterdumper_test.go
+++ b/internal/counterdumper/dumper_test.go
@@ -7,10 +7,10 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func TestCounterDumperReport(t *testing.T) {
+func TestDumperReport(t *testing.T) {
 	done := make(chan struct{})
 
-	c := &CounterDumper{
+	c := &Dumper{
 		OnReport: func(v uint64) {
 			require.Equal(t, uint64(3), v)
 			close(done)
@@ -29,8 +29,8 @@ func TestCounterDumperReport(t *testing.T) {
 	}
 }
 
-func TestCounterDumperDoNotReport(t *testing.T) {
-	c := &CounterDumper{
+func TestDumperDoNotReport(t *testing.T) {
+	c := &Dumper{
 		OnReport: func(_ uint64) {
 			t.Errorf("should not happen")
 		},
diff --git a/internal/defs/path.go b/internal/defs/path.go
index bac443c6..b774af5c 100644
--- a/internal/defs/path.go
+++ b/internal/defs/path.go
@@ -64,13 +64,13 @@ type PathAddPublisherRes struct {
 
 // PathAddPublisherReq contains arguments of AddPublisher().
 type PathAddPublisherReq struct {
-	Author             Publisher
-	Desc               *description.Session
-	GenerateRTPPackets bool
-	FillNTP            bool
-	ConfToCompare      *conf.Path
-	AccessRequest      PathAccessRequest
-	Res                chan PathAddPublisherRes
+	Author        Publisher
+	Desc          *description.Session
+	UseRTPPackets bool
+	ReplaceNTP    bool
+	ConfToCompare *conf.Path
+	AccessRequest PathAccessRequest
+	Res           chan PathAddPublisherRes
 }
 
 // PathRemovePublisherReq contains arguments of RemovePublisher().
@@ -107,10 +107,10 @@ type PathSourceStaticSetReadyRes struct {
 
 // PathSourceStaticSetReadyReq contains arguments of SetReady().
 type PathSourceStaticSetReadyReq struct {
-	Desc               *description.Session
-	GenerateRTPPackets bool
-	FillNTP            bool
-	Res                chan PathSourceStaticSetReadyRes
+	Desc          *description.Session
+	UseRTPPackets bool
+	ReplaceNTP    bool
+	Res           chan PathSourceStaticSetReadyRes
 }
 
 // PathSourceStaticSetNotReadyReq contains arguments of SetNotReady().
diff --git a/internal/defs/source.go b/internal/defs/source.go
index ae5fd893..0a0d39e4 100644
--- a/internal/defs/source.go
+++ b/internal/defs/source.go
@@ -42,22 +42,32 @@ func FormatsInfo(formats []format.Format) string {
 		strings.Join(FormatsToCodecs(formats), ", "))
 }
 
-// MediasToCodecs returns the name of codecs of given formats.
-func MediasToCodecs(medias []*description.Media) []string {
-	var formats []format.Format
+func gatherFormats(medias []*description.Media) []format.Format {
+	n := 0
 	for _, media := range medias {
-		formats = append(formats, media.Formats...)
+		n += len(media.Formats)
 	}
 
-	return FormatsToCodecs(formats)
+	if n == 0 {
+		return nil
+	}
+
+	formats := make([]format.Format, n)
+	n = 0
+
+	for _, media := range medias {
+		n += copy(formats[n:], media.Formats)
+	}
+
+	return formats
+}
+
+// MediasToCodecs returns the name of codecs of given formats.
+func MediasToCodecs(medias []*description.Media) []string {
+	return FormatsToCodecs(gatherFormats(medias))
 }
 
 // MediasInfo returns a description of medias.
 func MediasInfo(medias []*description.Media) string {
-	var formats []format.Format
-	for _, media := range medias {
-		formats = append(formats, media.Formats...)
-	}
-
-	return FormatsInfo(formats)
+	return FormatsInfo(gatherFormats(medias))
 }
diff --git a/internal/errordumper/dumper.go b/internal/errordumper/dumper.go
new file mode 100644
index 00000000..0075154a
--- /dev/null
+++ b/internal/errordumper/dumper.go
@@ -0,0 +1,70 @@
+// Package errordumper contains a counter that that periodically invokes a callback if the counter is not zero.
+package errordumper
+
+import (
+	"sync"
+	"time"
+)
+
+const (
+	callbackPeriod = 1 * time.Second
+)
+
+// Dumper is a counter that periodically invokes a callback if errors were added.
+type Dumper struct {
+	OnReport func(v uint64, last error)
+
+	mutex   sync.Mutex
+	counter uint64
+	last    error
+
+	terminate chan struct{}
+	done      chan struct{}
+}
+
+// Start starts the counter.
+func (c *Dumper) Start() {
+	c.terminate = make(chan struct{})
+	c.done = make(chan struct{})
+
+	go c.run()
+}
+
+// Stop stops the counter.
+func (c *Dumper) Stop() {
+	close(c.terminate)
+	<-c.done
+}
+
+// Add adds an error to the counter.
+func (c *Dumper) Add(err error) {
+	c.mutex.Lock()
+	defer c.mutex.Unlock()
+	c.counter++
+	c.last = err
+}
+
+func (c *Dumper) run() {
+	defer close(c.done)
+
+	t := time.NewTicker(callbackPeriod)
+	defer t.Stop()
+
+	for {
+		select {
+		case <-c.terminate:
+			return
+
+		case <-t.C:
+			c.mutex.Lock()
+			var counter uint64
+			counter, c.counter = c.counter, 0
+			last := c.last
+			c.mutex.Unlock()
+
+			if counter != 0 {
+				c.OnReport(counter, last)
+			}
+		}
+	}
+}
diff --git a/internal/errordumper/dumper_test.go b/internal/errordumper/dumper_test.go
new file mode 100644
index 00000000..c0c87a81
--- /dev/null
+++ b/internal/errordumper/dumper_test.go
@@ -0,0 +1,43 @@
+package errordumper
+
+import (
+	"fmt"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestDumperReport(t *testing.T) {
+	done := make(chan struct{})
+
+	c := &Dumper{
+		OnReport: func(v uint64, last error) {
+			require.Equal(t, uint64(1), v)
+			require.EqualError(t, last, "test error")
+			close(done)
+		},
+	}
+	c.Start()
+	defer c.Stop()
+
+	c.Add(fmt.Errorf("test error"))
+
+	select {
+	case <-done:
+	case <-time.After(2 * time.Second):
+		t.Errorf("should not happen")
+	}
+}
+
+func TestDumperDoNotReport(t *testing.T) {
+	c := &Dumper{
+		OnReport: func(_ uint64, _ error) {
+			t.Errorf("should not happen")
+		},
+	}
+	c.Start()
+	defer c.Stop()
+
+	<-time.After(2 * time.Second)
+}
diff --git a/internal/logger/destination_file.go b/internal/logger/destination_file.go
index 08e8a89a..848b90e1 100644
--- a/internal/logger/destination_file.go
+++ b/internal/logger/destination_file.go
@@ -2,31 +2,50 @@ package logger
 
 import (
 	"bytes"
+	"fmt"
 	"os"
+	"strconv"
 	"time"
 )
 
 type destinationFile struct {
-	file *os.File
-	buf  bytes.Buffer
+	structured bool
+	file       *os.File
+	buf        bytes.Buffer
 }
 
-func newDestinationFile(filePath string) (destination, error) {
+func newDestinationFile(structured bool, filePath string) (destination, error) {
 	f, err := os.OpenFile(filePath, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0o644)
 	if err != nil {
 		return nil, err
 	}
 
 	return &destinationFile{
-		file: f,
+		structured: structured,
+		file:       f,
 	}, nil
 }
 
 func (d *destinationFile) log(t time.Time, level Level, format string, args ...any) {
 	d.buf.Reset()
-	writeTime(&d.buf, t, false)
-	writeLevel(&d.buf, level, false)
-	writeContent(&d.buf, format, args)
+
+	if d.structured {
+		d.buf.WriteString(`{"timestamp":"`)
+		d.buf.WriteString(t.Format(time.RFC3339))
+		d.buf.WriteString(`","level":"`)
+		writeLevel(&d.buf, level, false)
+		d.buf.WriteString(`","message":`)
+		d.buf.WriteString(strconv.Quote(fmt.Sprintf(format, args...)))
+		d.buf.WriteString(`}`)
+		d.buf.WriteByte('\n')
+	} else {
+		writePlainTime(&d.buf, t, false)
+		writeLevel(&d.buf, level, false)
+		d.buf.WriteByte(' ')
+		fmt.Fprintf(&d.buf, format, args...)
+		d.buf.WriteByte('\n')
+	}
+
 	d.file.Write(d.buf.Bytes()) //nolint:errcheck
 }
 
diff --git a/internal/logger/destination_stdout.go b/internal/logger/destination_stdout.go
index 43c11bed..74abaaa7 100644
--- a/internal/logger/destination_stdout.go
+++ b/internal/logger/destination_stdout.go
@@ -2,30 +2,51 @@ package logger
 
 import (
 	"bytes"
+	"fmt"
+	"io"
 	"os"
+	"strconv"
 	"time"
 
 	"golang.org/x/term"
 )
 
 type destinationStdout struct {
-	useColor bool
-
-	buf bytes.Buffer
+	structured bool
+	stdout     io.Writer
+	useColor   bool
+	buf        bytes.Buffer
 }
 
-func newDestionationStdout() destination {
+func newDestionationStdout(structured bool, stdout io.Writer) destination {
 	return &destinationStdout{
-		useColor: term.IsTerminal(int(os.Stdout.Fd())),
+		structured: structured,
+		stdout:     stdout,
+		useColor:   term.IsTerminal(int(os.Stdout.Fd())),
 	}
 }
 
 func (d *destinationStdout) log(t time.Time, level Level, format string, args ...any) {
 	d.buf.Reset()
-	writeTime(&d.buf, t, d.useColor)
-	writeLevel(&d.buf, level, d.useColor)
-	writeContent(&d.buf, format, args)
-	os.Stdout.Write(d.buf.Bytes()) //nolint:errcheck
+
+	if d.structured {
+		d.buf.WriteString(`{"timestamp":"`)
+		d.buf.WriteString(t.Format(time.RFC3339))
+		d.buf.WriteString(`","level":"`)
+		writeLevel(&d.buf, level, false)
+		d.buf.WriteString(`","message":`)
+		d.buf.WriteString(strconv.Quote(fmt.Sprintf(format, args...)))
+		d.buf.WriteString(`}`)
+		d.buf.WriteByte('\n')
+	} else {
+		writePlainTime(&d.buf, t, d.useColor)
+		writeLevel(&d.buf, level, d.useColor)
+		d.buf.WriteByte(' ')
+		fmt.Fprintf(&d.buf, format, args...)
+		d.buf.WriteByte('\n')
+	}
+
+	d.stdout.Write(d.buf.Bytes()) //nolint:errcheck
 }
 
 func (d *destinationStdout) close() {
diff --git a/internal/logger/destination_syslog.go b/internal/logger/destination_syslog.go
index e9a8d4ed..9540e65b 100644
--- a/internal/logger/destination_syslog.go
+++ b/internal/logger/destination_syslog.go
@@ -1,18 +1,21 @@
+//go:build !darwin && !windows
+
 package logger
 
 import (
 	"bytes"
-	"io"
+	"fmt"
+	"log/syslog"
 	"time"
 )
 
 type destinationSysLog struct {
-	syslog io.WriteCloser
+	syslog *syslog.Writer
 	buf    bytes.Buffer
 }
 
 func newDestinationSyslog(prefix string) (destination, error) {
-	syslog, err := newSysLog(prefix)
+	syslog, err := syslog.New(syslog.LOG_DAEMON, prefix)
 	if err != nil {
 		return nil, err
 	}
@@ -22,14 +25,23 @@ func newDestinationSyslog(prefix string) (destination, error) {
 	}, nil
 }
 
-func (d *destinationSysLog) log(t time.Time, level Level, format string, args ...any) {
+func (d *destinationSysLog) log(_ time.Time, level Level, format string, args ...any) {
 	d.buf.Reset()
-	writeTime(&d.buf, t, false)
-	writeLevel(&d.buf, level, false)
-	writeContent(&d.buf, format, args)
-	d.syslog.Write(d.buf.Bytes()) //nolint:errcheck
+
+	fmt.Fprintf(&d.buf, format, args...)
+
+	switch level {
+	case Debug:
+		d.syslog.Debug(d.buf.String()) //nolint:errcheck
+	case Info:
+		d.syslog.Info(d.buf.String()) //nolint:errcheck
+	case Warn:
+		d.syslog.Warning(d.buf.String()) //nolint:errcheck
+	case Error:
+		d.syslog.Err(d.buf.String()) //nolint:errcheck
+	}
 }
 
 func (d *destinationSysLog) close() {
-	d.syslog.Close()
+	d.syslog.Close() //nolint:errcheck
 }
diff --git a/internal/logger/destination_syslog_disabled.go b/internal/logger/destination_syslog_disabled.go
new file mode 100644
index 00000000..d0788b24
--- /dev/null
+++ b/internal/logger/destination_syslog_disabled.go
@@ -0,0 +1,9 @@
+//go:build darwin || windows
+
+package logger
+
+import "fmt"
+
+func newDestinationSyslog(_ string) (destination, error) {
+	return nil, fmt.Errorf("syslog is not available on macOS and Windows")
+}
diff --git a/internal/logger/logger.go b/internal/logger/logger.go
index a6a60cc1..9210e183 100644
--- a/internal/logger/logger.go
+++ b/internal/logger/logger.go
@@ -3,7 +3,8 @@ package logger
 
 import (
 	"bytes"
-	"fmt"
+	"io"
+	"os"
 	"sync"
 	"time"
 
@@ -12,47 +13,56 @@ import (
 
 // Logger is a log handler.
 type Logger struct {
-	level Level
+	Level        Level
+	Destinations []Destination
+	Structured   bool
+	File         string
+	SysLogPrefix string
 
+	timeNow      func() time.Time
+	stdout       io.Writer
 	destinations []destination
 	mutex        sync.Mutex
 }
 
-// New allocates a log handler.
-func New(level Level, destinations []Destination, filePath string, sysLogPrefix string) (*Logger, error) {
-	lh := &Logger{
-		level: level,
+// Initialize initializes Logger.
+func (l *Logger) Initialize() error {
+	if l.timeNow == nil {
+		l.timeNow = time.Now
+	}
+	if l.stdout == nil {
+		l.stdout = os.Stdout
 	}
 
-	for _, destType := range destinations {
+	for _, destType := range l.Destinations {
 		switch destType {
 		case DestinationStdout:
-			lh.destinations = append(lh.destinations, newDestionationStdout())
+			l.destinations = append(l.destinations, newDestionationStdout(l.Structured, l.stdout))
 
 		case DestinationFile:
-			dest, err := newDestinationFile(filePath)
+			dest, err := newDestinationFile(l.Structured, l.File)
 			if err != nil {
-				lh.Close()
-				return nil, err
+				l.Close()
+				return err
 			}
-			lh.destinations = append(lh.destinations, dest)
+			l.destinations = append(l.destinations, dest)
 
 		case DestinationSyslog:
-			dest, err := newDestinationSyslog(sysLogPrefix)
+			dest, err := newDestinationSyslog(l.SysLogPrefix)
 			if err != nil {
-				lh.Close()
-				return nil, err
+				l.Close()
+				return err
 			}
-			lh.destinations = append(lh.destinations, dest)
+			l.destinations = append(l.destinations, dest)
 		}
 	}
 
-	return lh, nil
+	return nil
 }
 
 // Close closes a log handler.
-func (lh *Logger) Close() {
-	for _, dest := range lh.destinations {
+func (l *Logger) Close() {
+	for _, dest := range l.destinations {
 		dest.close()
 	}
 }
@@ -74,7 +84,7 @@ func itoa(i int, wid int) []byte {
 	return b[bp:]
 }
 
-func writeTime(buf *bytes.Buffer, t time.Time, useColor bool) {
+func writePlainTime(buf *bytes.Buffer, t time.Time, useColor bool) {
 	var intbuf bytes.Buffer
 
 	// date
@@ -132,26 +142,20 @@ func writeLevel(buf *bytes.Buffer, level Level, useColor bool) {
 			buf.WriteString("ERR")
 		}
 	}
-	buf.WriteByte(' ')
-}
-
-func writeContent(buf *bytes.Buffer, format string, args []any) {
-	fmt.Fprintf(buf, format, args...)
-	buf.WriteByte('\n')
 }
 
 // Log writes a log entry.
-func (lh *Logger) Log(level Level, format string, args ...any) {
-	if level < lh.level {
+func (l *Logger) Log(level Level, format string, args ...any) {
+	if level < l.Level {
 		return
 	}
 
-	lh.mutex.Lock()
-	defer lh.mutex.Unlock()
+	l.mutex.Lock()
+	defer l.mutex.Unlock()
 
-	t := time.Now()
+	t := l.timeNow()
 
-	for _, dest := range lh.destinations {
+	for _, dest := range l.destinations {
 		dest.log(t, level, format, args...)
 	}
 }
diff --git a/internal/logger/logger_test.go b/internal/logger/logger_test.go
new file mode 100644
index 00000000..f5d63689
--- /dev/null
+++ b/internal/logger/logger_test.go
@@ -0,0 +1,77 @@
+package logger
+
+import (
+	"bytes"
+	"os"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestLoggerToStdout(t *testing.T) {
+	for _, ca := range []string{
+		"plain",
+		"structured",
+	} {
+		t.Run(ca, func(t *testing.T) {
+			var buf bytes.Buffer
+
+			l := &Logger{
+				Destinations: []Destination{DestinationStdout},
+				Structured:   (ca == "structured"),
+				timeNow:      func() time.Time { return time.Date(2003, 11, 4, 23, 15, 8, 0, time.UTC) },
+				stdout:       &buf,
+			}
+			err := l.Initialize()
+			require.NoError(t, err)
+			defer l.Close()
+
+			l.Log(Info, "test format %d", 123)
+
+			if ca == "plain" {
+				require.Equal(t, "2003/11/04 23:15:08 INF test format 123\n", buf.String())
+			} else {
+				require.Equal(t, `{"timestamp":"2003-11-04T23:15:08Z",`+
+					`"level":"INF","message":"test format 123"}`+"\n", buf.String())
+			}
+		})
+	}
+}
+
+func TestLoggerToFile(t *testing.T) {
+	for _, ca := range []string{
+		"plain",
+		"structured",
+	} {
+		t.Run(ca, func(t *testing.T) {
+			tempFile, err := os.CreateTemp(os.TempDir(), "mtx-logger-")
+			require.NoError(t, err)
+			defer os.Remove(tempFile.Name())
+			defer tempFile.Close()
+
+			l := &Logger{
+				Level:        Debug,
+				Destinations: []Destination{DestinationFile},
+				Structured:   ca == "structured",
+				File:         tempFile.Name(),
+				timeNow:      func() time.Time { return time.Date(2003, 11, 4, 23, 15, 8, 0, time.UTC) },
+			}
+			err = l.Initialize()
+			require.NoError(t, err)
+			defer l.Close()
+
+			l.Log(Info, "test format %d", 123)
+
+			buf, err := os.ReadFile(tempFile.Name())
+			require.NoError(t, err)
+
+			if ca == "plain" {
+				require.Equal(t, "2003/11/04 23:15:08 INF test format 123\n", string(buf))
+			} else {
+				require.Equal(t, `{"timestamp":"2003-11-04T23:15:08Z",`+
+					`"level":"INF","message":"test format 123"}`+"\n", string(buf))
+			}
+		})
+	}
+}
diff --git a/internal/logger/syslog_unix.go b/internal/logger/syslog_unix.go
deleted file mode 100644
index 5d4b1860..00000000
--- a/internal/logger/syslog_unix.go
+++ /dev/null
@@ -1,31 +0,0 @@
-//go:build !windows
-
-package logger
-
-import (
-	"io"
-	native "log/syslog"
-)
-
-type syslog struct {
-	inner *native.Writer
-}
-
-func newSysLog(prefix string) (io.WriteCloser, error) {
-	inner, err := native.New(native.LOG_INFO|native.LOG_DAEMON, prefix)
-	if err != nil {
-		return nil, err
-	}
-
-	return &syslog{
-		inner: inner,
-	}, nil
-}
-
-func (ls *syslog) Close() error {
-	return ls.inner.Close()
-}
-
-func (ls *syslog) Write(p []byte) (int, error) {
-	return ls.inner.Write(p)
-}
diff --git a/internal/logger/syslog_win.go b/internal/logger/syslog_win.go
deleted file mode 100644
index 380a84d5..00000000
--- a/internal/logger/syslog_win.go
+++ /dev/null
@@ -1,12 +0,0 @@
-//go:build windows
-
-package logger
-
-import (
-	"fmt"
-	"io"
-)
-
-func newSysLog(prefix string) (io.WriteCloser, error) {
-	return nil, fmt.Errorf("not implemented on windows")
-}
diff --git a/internal/playback/muxer_mp4_test.go b/internal/playback/muxer_mp4_test.go
index 1b23a2df..3727a588 100644
--- a/internal/playback/muxer_mp4_test.go
+++ b/internal/playback/muxer_mp4_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/bluenviron/mediacommon/v2/pkg/formats/fmp4"
-	"github.com/bluenviron/mediacommon/v2/pkg/formats/mp4"
+	mcodecs "github.com/bluenviron/mediacommon/v2/pkg/formats/mp4/codecs"
 	"github.com/bluenviron/mediamtx/internal/test"
 	"github.com/stretchr/testify/require"
 )
@@ -23,7 +23,7 @@ func TestMuxerMP4EmptyTracks(t *testing.T) {
 			{
 				ID:        1,
 				TimeScale: 90000,
-				Codec: &mp4.CodecH264{
+				Codec: &mcodecs.H264{
 					SPS: test.FormatH264.SPS,
 					PPS: test.FormatH264.PPS,
 				},
@@ -31,7 +31,7 @@ func TestMuxerMP4EmptyTracks(t *testing.T) {
 			{
 				ID:        2,
 				TimeScale: 48000,
-				Codec:     &mp4.CodecOpus{},
+				Codec:     &mcodecs.Opus{},
 			},
 		},
 	}
diff --git a/internal/playback/on_get_test.go b/internal/playback/on_get_test.go
index be5cb365..540d1e6d 100644
--- a/internal/playback/on_get_test.go
+++ b/internal/playback/on_get_test.go
@@ -14,7 +14,7 @@ import (
 	"github.com/bluenviron/mediacommon/v2/pkg/codecs/mpeg4audio"
 	"github.com/bluenviron/mediacommon/v2/pkg/formats/fmp4"
 	"github.com/bluenviron/mediacommon/v2/pkg/formats/fmp4/seekablebuffer"
-	"github.com/bluenviron/mediacommon/v2/pkg/formats/mp4"
+	mcodecs "github.com/bluenviron/mediacommon/v2/pkg/formats/mp4/codecs"
 	"github.com/bluenviron/mediacommon/v2/pkg/formats/pmp4"
 	"github.com/bluenviron/mediamtx/internal/conf"
 	"github.com/bluenviron/mediamtx/internal/recordstore"
@@ -29,7 +29,7 @@ func writeSegment1(t *testing.T, fpath string) {
 			{
 				ID:        1,
 				TimeScale: 90000,
-				Codec: &mp4.CodecH264{
+				Codec: &mcodecs.H264{
 					SPS: test.FormatH264.SPS,
 					PPS: test.FormatH264.PPS,
 				},
@@ -37,7 +37,7 @@ func writeSegment1(t *testing.T, fpath string) {
 			{
 				ID:        2,
 				TimeScale: 48000,
-				Codec: &mp4.CodecMPEG4Audio{
+				Codec: &mcodecs.MPEG4Audio{
 					Config: mpeg4audio.AudioSpecificConfig{
 						Type:         mpeg4audio.ObjectTypeAACLC,
 						SampleRate:   48000,
@@ -107,7 +107,7 @@ func writeSegment2(t *testing.T, fpath string) {
 			{
 				ID:        1,
 				TimeScale: 90000,
-				Codec: &mp4.CodecH264{
+				Codec: &mcodecs.H264{
 					SPS: test.FormatH264.SPS,
 					PPS: test.FormatH264.PPS,
 				},
@@ -115,7 +115,7 @@ func writeSegment2(t *testing.T, fpath string) {
 			{
 				ID:        2,
 				TimeScale: 48000,
-				Codec: &mp4.CodecMPEG4Audio{
+				Codec: &mcodecs.MPEG4Audio{
 					Config: mpeg4audio.AudioSpecificConfig{
 						Type:         mpeg4audio.ObjectTypeAACLC,
 						SampleRate:   48000,
@@ -195,7 +195,7 @@ func writeSegment3(t *testing.T, fpath string) {
 			{
 				ID:        1,
 				TimeScale: 90000,
-				Codec: &mp4.CodecH264{
+				Codec: &mcodecs.H264{
 					SPS: test.FormatH264.SPS,
 					PPS: test.FormatH264.PPS,
 				},
@@ -251,7 +251,7 @@ func TestOnGet(t *testing.T) {
 						{
 							ID:        1,
 							TimeScale: 90000,
-							Codec: &mp4.CodecH264{
+							Codec: &mcodecs.H264{
 								SPS: test.FormatH264.SPS,
 								PPS: test.FormatH264.PPS,
 							},
@@ -259,7 +259,7 @@ func TestOnGet(t *testing.T) {
 						{
 							ID:        2,
 							TimeScale: 48000,
-							Codec: &mp4.CodecMPEG4Audio{
+							Codec: &mcodecs.MPEG4Audio{
 								Config: mpeg4audio.AudioSpecificConfig{
 									Type:         mpeg4audio.ObjectTypeAACLC,
 									SampleRate:   48000,
@@ -613,11 +613,11 @@ func TestOnGet(t *testing.T) {
 
 					sampleData := make(map[int][][]byte)
 					for _, track := range p.Tracks {
-						var samples [][]byte
-						for _, sample := range track.Samples {
+						samples := make([][]byte, len(track.Samples))
+						for i, sample := range track.Samples {
 							buf, err = sample.GetPayload()
 							require.NoError(t, err)
-							samples = append(samples, buf)
+							samples[i] = buf
 							sample.GetPayload = nil
 						}
 						sampleData[track.ID] = samples
@@ -629,7 +629,7 @@ func TestOnGet(t *testing.T) {
 								ID:         1,
 								TimeScale:  90000,
 								TimeOffset: -90000,
-								Codec: &mp4.CodecH264{
+								Codec: &mcodecs.H264{
 									SPS: test.FormatH264.SPS,
 									PPS: test.FormatH264.PPS,
 								},
@@ -658,7 +658,7 @@ func TestOnGet(t *testing.T) {
 								ID:         2,
 								TimeScale:  48000,
 								TimeOffset: 48000,
-								Codec: &mp4.CodecMPEG4Audio{
+								Codec: &mcodecs.MPEG4Audio{
 									Config: mpeg4audio.AudioSpecificConfig{
 										Type:         mpeg4audio.ObjectTypeAACLC,
 										SampleRate:   48000,
@@ -791,7 +791,7 @@ func TestOnGetInMiddleOfLastSample(t *testing.T) {
 					{
 						ID:        1,
 						TimeScale: 90000,
-						Codec: &mp4.CodecH264{
+						Codec: &mcodecs.H264{
 							SPS: test.FormatH264.SPS,
 							PPS: test.FormatH264.PPS,
 						},
@@ -887,7 +887,7 @@ func TestOnGetBetweenSegments(t *testing.T) {
 					{
 						ID:        1,
 						TimeScale: 90000,
-						Codec: &mp4.CodecH264{
+						Codec: &mcodecs.H264{
 							SPS: test.FormatH264.SPS,
 							PPS: test.FormatH264.PPS,
 						},
diff --git a/internal/playback/on_list_test.go b/internal/playback/on_list_test.go
index 8f71750b..6a92f0ca 100644
--- a/internal/playback/on_list_test.go
+++ b/internal/playback/on_list_test.go
@@ -13,9 +13,8 @@ import (
 	"time"
 
 	amp4 "github.com/abema/go-mp4"
-
 	"github.com/bluenviron/mediacommon/v2/pkg/formats/fmp4"
-	"github.com/bluenviron/mediacommon/v2/pkg/formats/mp4"
+	mcodecs "github.com/bluenviron/mediacommon/v2/pkg/formats/mp4/codecs"
 	"github.com/bluenviron/mediamtx/internal/auth"
 	"github.com/bluenviron/mediamtx/internal/conf"
 	"github.com/bluenviron/mediamtx/internal/test"
@@ -274,7 +273,7 @@ func TestOnListCachedDuration(t *testing.T) {
 				{
 					ID:        1,
 					TimeScale: 90000,
-					Codec: &mp4.CodecH264{
+					Codec: &mcodecs.H264{
 						SPS: test.FormatH264.SPS,
 						PPS: test.FormatH264.PPS,
 					},
diff --git a/internal/playback/segment_fmp4_test.go b/internal/playback/segment_fmp4_test.go
index 3cb7bf58..9edb6792 100644
--- a/internal/playback/segment_fmp4_test.go
+++ b/internal/playback/segment_fmp4_test.go
@@ -9,7 +9,7 @@ import (
 	amp4 "github.com/abema/go-mp4"
 	"github.com/bluenviron/mediacommon/v2/pkg/codecs/mpeg4audio"
 	"github.com/bluenviron/mediacommon/v2/pkg/formats/fmp4"
-	"github.com/bluenviron/mediacommon/v2/pkg/formats/mp4"
+	mcodecs "github.com/bluenviron/mediacommon/v2/pkg/formats/mp4/codecs"
 	"github.com/bluenviron/mediamtx/internal/recordstore"
 	"github.com/bluenviron/mediamtx/internal/test"
 	"github.com/stretchr/testify/require"
@@ -21,7 +21,7 @@ func writeBenchInit(f io.WriteSeeker) {
 			{
 				ID:        1,
 				TimeScale: 90000,
-				Codec: &mp4.CodecH264{
+				Codec: &mcodecs.H264{
 					SPS: test.FormatH264.SPS,
 					PPS: test.FormatH264.PPS,
 				},
@@ -29,7 +29,7 @@ func writeBenchInit(f io.WriteSeeker) {
 			{
 				ID:        2,
 				TimeScale: 90000,
-				Codec: &mp4.CodecMPEG4Audio{
+				Codec: &mcodecs.MPEG4Audio{
 					Config: mpeg4audio.AudioSpecificConfig{
 						Type:         mpeg4audio.ObjectTypeAACLC,
 						SampleRate:   48000,
@@ -88,7 +88,7 @@ func TestSegmentFMP4CanBeConcatenated(t *testing.T) {
 		{
 			ID:        1,
 			TimeScale: 90000,
-			Codec: &mp4.CodecH264{
+			Codec: &mcodecs.H264{
 				SPS: test.FormatH264.SPS,
 				PPS: test.FormatH264.PPS,
 			},
@@ -96,7 +96,7 @@ func TestSegmentFMP4CanBeConcatenated(t *testing.T) {
 		{
 			ID:        2,
 			TimeScale: 48000,
-			Codec: &mp4.CodecMPEG4Audio{
+			Codec: &mcodecs.MPEG4Audio{
 				Config: mpeg4audio.AudioSpecificConfig{
 					Type:         mpeg4audio.ObjectTypeAACLC,
 					SampleRate:   48000,
@@ -110,7 +110,7 @@ func TestSegmentFMP4CanBeConcatenated(t *testing.T) {
 		{
 			ID:        1,
 			TimeScale: 90000,
-			Codec: &mp4.CodecH264{
+			Codec: &mcodecs.H264{
 				SPS: test.FormatH264.SPS,
 				PPS: test.FormatH264.PPS,
 			},
@@ -326,7 +326,7 @@ func TestSegmentFMP4CanBeConcatenated(t *testing.T) {
 					{
 						ID:        1,
 						TimeScale: 90000,
-						Codec: &mp4.CodecH264{
+						Codec: &mcodecs.H264{
 							SPS: test.FormatH264.SPS,
 							PPS: test.FormatH264.PPS,
 						},
@@ -340,7 +340,7 @@ func TestSegmentFMP4CanBeConcatenated(t *testing.T) {
 					{
 						ID:        2,
 						TimeScale: 90000,
-						Codec: &mp4.CodecH264{
+						Codec: &mcodecs.H264{
 							SPS: test.FormatH264.SPS,
 							PPS: test.FormatH264.PPS,
 						},
@@ -358,7 +358,7 @@ func TestSegmentFMP4CanBeConcatenated(t *testing.T) {
 					{
 						ID:        1,
 						TimeScale: 90000,
-						Codec: &mp4.CodecH264{
+						Codec: &mcodecs.H264{
 							SPS: test.FormatH264.SPS,
 							PPS: test.FormatH264.PPS,
 						},
@@ -372,7 +372,7 @@ func TestSegmentFMP4CanBeConcatenated(t *testing.T) {
 					{
 						ID:        1,
 						TimeScale: 48000,
-						Codec: &mp4.CodecH264{
+						Codec: &mcodecs.H264{
 							SPS: test.FormatH264.SPS,
 							PPS: test.FormatH264.PPS,
 						},
@@ -390,7 +390,7 @@ func TestSegmentFMP4CanBeConcatenated(t *testing.T) {
 					{
 						ID:        1,
 						TimeScale: 90000,
-						Codec: &mp4.CodecH264{
+						Codec: &mcodecs.H264{
 							SPS: test.FormatH264.SPS,
 							PPS: test.FormatH264.PPS,
 						},
@@ -404,7 +404,7 @@ func TestSegmentFMP4CanBeConcatenated(t *testing.T) {
 					{
 						ID:        1,
 						TimeScale: 90000,
-						Codec: &mp4.CodecMPEG4Audio{
+						Codec: &mcodecs.MPEG4Audio{
 							Config: mpeg4audio.AudioSpecificConfig{
 								Type:         mpeg4audio.ObjectTypeAACLC,
 								SampleRate:   48000,
diff --git a/internal/protocols/hls/to_stream_test.go b/internal/protocols/hls/to_stream_test.go
index ee1b4a7d..5492a7c4 100644
--- a/internal/protocols/hls/to_stream_test.go
+++ b/internal/protocols/hls/to_stream_test.go
@@ -11,6 +11,7 @@ import (
 	"github.com/bluenviron/gortsplib/v5/pkg/description"
 	"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/bluenviron/mediamtx/internal/conf"
 	"github.com/bluenviron/mediamtx/internal/stream"
 	"github.com/bluenviron/mediamtx/internal/test"
@@ -28,7 +29,7 @@ func TestToStreamNoSupportedCodecs(t *testing.T) {
 
 func TestToStream(t *testing.T) {
 	track1 := &mpegts.Track{
-		Codec: &mpegts.CodecH264{},
+		Codec: &tscodecs.H264{},
 	}
 
 	s := &http.Server{
@@ -107,21 +108,31 @@ func TestToStream(t *testing.T) {
 			}}, medias)
 
 			strm = &stream.Stream{
-				WriteQueueSize:     512,
-				RTPMaxPayloadSize:  1450,
-				Desc:               &description.Session{Medias: medias},
-				GenerateRTPPackets: true,
-				Parent:             test.NilLogger,
+				Desc:              &description.Session{Medias: medias},
+				UseRTPPackets:     false,
+				WriteQueueSize:    512,
+				RTPMaxPayloadSize: 1450,
+				Parent:            test.NilLogger,
 			}
 			err2 = strm.Initialize()
 			require.NoError(t, err2)
 
+			n := 0
+
 			r.OnData(
 				medias[0],
 				medias[0].Formats[0],
 				func(u *unit.Unit) error {
-					require.Equal(t, time.Date(2018, 0o5, 20, 8, 17, 15, 0, time.UTC), u.NTP)
-					close(done)
+					switch n {
+					case 0:
+						require.True(t, u.NilPayload())
+					case 1:
+						require.Equal(t, time.Date(2018, 0o5, 20, 8, 17, 15, 0, time.UTC), u.NTP)
+						close(done)
+					default:
+						t.Error("should not happen")
+					}
+					n++
 					return nil
 				})
 
diff --git a/internal/protocols/mpegts/enhanced_reader.go b/internal/protocols/mpegts/enhanced_reader.go
index 835c2acd..bde7ebfa 100644
--- a/internal/protocols/mpegts/enhanced_reader.go
+++ b/internal/protocols/mpegts/enhanced_reader.go
@@ -5,6 +5,7 @@ import (
 
 	"github.com/bluenviron/mediacommon/v2/pkg/codecs/mpeg4audio"
 	mcmpegts "github.com/bluenviron/mediacommon/v2/pkg/formats/mpegts"
+	tscodecs "github.com/bluenviron/mediacommon/v2/pkg/formats/mpegts/codecs"
 	"github.com/bluenviron/mediacommon/v2/pkg/rewindablereader"
 )
 
@@ -32,7 +33,7 @@ func (r *EnhancedReader) Initialize() error {
 	tracksToParse := 0
 
 	for _, track := range mr.Tracks() {
-		if _, ok := track.Codec.(*mcmpegts.CodecMPEG4AudioLATM); ok {
+		if _, ok := track.Codec.(*tscodecs.MPEG4AudioLATM); ok {
 			cpid := track.PID
 			done := false
 			tracksToParse++
diff --git a/internal/protocols/mpegts/from_stream.go b/internal/protocols/mpegts/from_stream.go
index f75aa112..46d69c15 100644
--- a/internal/protocols/mpegts/from_stream.go
+++ b/internal/protocols/mpegts/from_stream.go
@@ -13,6 +13,7 @@ import (
 	"github.com/bluenviron/mediacommon/v2/pkg/codecs/h265"
 	"github.com/bluenviron/mediacommon/v2/pkg/codecs/mpeg4audio"
 	mcmpegts "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/bluenviron/mediamtx/internal/logger"
@@ -53,7 +54,7 @@ func FromStream(
 
 			switch forma := forma.(type) {
 			case *format.H265: //nolint:dupl
-				track := &mcmpegts.Track{Codec: &mcmpegts.CodecH265{}}
+				track := &mcmpegts.Track{Codec: &tscodecs.H265{}}
 
 				var dtsExtractor *h265.DTSExtractor
 
@@ -92,7 +93,7 @@ func FromStream(
 					})
 
 			case *format.H264: //nolint:dupl
-				track := &mcmpegts.Track{Codec: &mcmpegts.CodecH264{}}
+				track := &mcmpegts.Track{Codec: &tscodecs.H264{}}
 
 				var dtsExtractor *h264.DTSExtractor
 
@@ -133,7 +134,7 @@ func FromStream(
 					})
 
 			case *format.MPEG4Video:
-				track := &mcmpegts.Track{Codec: &mcmpegts.CodecMPEG4Video{}}
+				track := &mcmpegts.Track{Codec: &tscodecs.MPEG4Video{}}
 
 				firstReceived := false
 				var lastPTS int64
@@ -166,7 +167,7 @@ func FromStream(
 					})
 
 			case *format.MPEG1Video:
-				track := &mcmpegts.Track{Codec: &mcmpegts.CodecMPEG1Video{}}
+				track := &mcmpegts.Track{Codec: &tscodecs.MPEG1Video{}}
 
 				firstReceived := false
 				var lastPTS int64
@@ -199,7 +200,7 @@ func FromStream(
 					})
 
 			case *format.Opus:
-				track := &mcmpegts.Track{Codec: &mcmpegts.CodecOpus{
+				track := &mcmpegts.Track{Codec: &tscodecs.Opus{
 					ChannelCount: forma.ChannelCount,
 				}}
 
@@ -225,7 +226,7 @@ func FromStream(
 
 			case *format.KLV:
 				track := &mcmpegts.Track{
-					Codec: &mcmpegts.CodecKLV{
+					Codec: &tscodecs.KLV{
 						Synchronous: true,
 					},
 				}
@@ -248,7 +249,7 @@ func FromStream(
 					})
 
 			case *format.MPEG4Audio:
-				track := &mcmpegts.Track{Codec: &mcmpegts.CodecMPEG4Audio{
+				track := &mcmpegts.Track{Codec: &tscodecs.MPEG4Audio{
 					Config: *forma.Config,
 				}}
 
@@ -273,7 +274,7 @@ func FromStream(
 					})
 
 			case *format.MPEG4AudioLATM:
-				track := &mcmpegts.Track{Codec: &mcmpegts.CodecMPEG4AudioLATM{}}
+				track := &mcmpegts.Track{Codec: &tscodecs.MPEG4AudioLATM{}}
 
 				if !forma.CPresent {
 					addTrack(
@@ -336,7 +337,7 @@ func FromStream(
 				}
 
 			case *format.MPEG1Audio:
-				track := &mcmpegts.Track{Codec: &mcmpegts.CodecMPEG1Audio{}}
+				track := &mcmpegts.Track{Codec: &tscodecs.MPEG1Audio{}}
 
 				addTrack(
 					media,
@@ -359,7 +360,7 @@ func FromStream(
 					})
 
 			case *format.AC3:
-				track := &mcmpegts.Track{Codec: &mcmpegts.CodecAC3{}}
+				track := &mcmpegts.Track{Codec: &tscodecs.AC3{}}
 
 				addTrack(
 					media,
diff --git a/internal/protocols/mpegts/to_stream.go b/internal/protocols/mpegts/to_stream.go
index ec9b45df..8ebd3857 100644
--- a/internal/protocols/mpegts/to_stream.go
+++ b/internal/protocols/mpegts/to_stream.go
@@ -10,6 +10,7 @@ import (
 	"github.com/bluenviron/gortsplib/v5/pkg/format"
 	"github.com/bluenviron/mediacommon/v2/pkg/codecs/mpeg4audio"
 	"github.com/bluenviron/mediacommon/v2/pkg/formats/mpegts"
+	tscodecs "github.com/bluenviron/mediacommon/v2/pkg/formats/mpegts/codecs"
 
 	"github.com/bluenviron/mediamtx/internal/logger"
 	"github.com/bluenviron/mediamtx/internal/stream"
@@ -36,7 +37,7 @@ func ToStream(
 		var medi *description.Media
 
 		switch codec := track.Codec.(type) {
-		case *mpegts.CodecH265:
+		case *tscodecs.H265:
 			medi = &description.Media{
 				Type: description.MediaTypeVideo,
 				Formats: []format.Format{&format.H265{
@@ -54,7 +55,7 @@ func ToStream(
 				return nil
 			})
 
-		case *mpegts.CodecH264:
+		case *tscodecs.H264:
 			medi = &description.Media{
 				Type: description.MediaTypeVideo,
 				Formats: []format.Format{&format.H264{
@@ -73,7 +74,7 @@ func ToStream(
 				return nil
 			})
 
-		case *mpegts.CodecMPEG4Video:
+		case *tscodecs.MPEG4Video:
 			medi = &description.Media{
 				Type: description.MediaTypeVideo,
 				Formats: []format.Format{&format.MPEG4Video{
@@ -91,7 +92,7 @@ func ToStream(
 				return nil
 			})
 
-		case *mpegts.CodecMPEG1Video:
+		case *tscodecs.MPEG1Video:
 			medi = &description.Media{
 				Type:    description.MediaTypeVideo,
 				Formats: []format.Format{&format.MPEG1Video{}},
@@ -107,7 +108,7 @@ func ToStream(
 				return nil
 			})
 
-		case *mpegts.CodecOpus:
+		case *tscodecs.Opus:
 			medi = &description.Media{
 				Type: description.MediaTypeAudio,
 				Formats: []format.Format{&format.Opus{
@@ -126,7 +127,7 @@ func ToStream(
 				return nil
 			})
 
-		case *mpegts.CodecKLV:
+		case *tscodecs.KLV:
 			medi = &description.Media{
 				Type: description.MediaTypeApplication,
 				Formats: []format.Format{&format.KLV{
@@ -143,7 +144,7 @@ func ToStream(
 				return nil
 			})
 
-		case *mpegts.CodecMPEG4Audio:
+		case *tscodecs.MPEG4Audio:
 			medi = &description.Media{
 				Type: description.MediaTypeAudio,
 				Formats: []format.Format{&format.MPEG4Audio{
@@ -165,7 +166,7 @@ func ToStream(
 				return nil
 			})
 
-		case *mpegts.CodecMPEG4AudioLATM:
+		case *tscodecs.MPEG4AudioLATM:
 			// We are dealing with a LATM stream with in-band configuration.
 			// Although in theory this can be streamed with RTSP (RFC6416 with cpresent=1),
 			// in practice there is no player that supports it.
@@ -220,7 +221,7 @@ func ToStream(
 				return nil
 			})
 
-		case *mpegts.CodecMPEG1Audio:
+		case *tscodecs.MPEG1Audio:
 			medi = &description.Media{
 				Type:    description.MediaTypeAudio,
 				Formats: []format.Format{&format.MPEG1Audio{}},
@@ -236,7 +237,7 @@ func ToStream(
 				return nil
 			})
 
-		case *mpegts.CodecAC3:
+		case *tscodecs.AC3:
 			medi = &description.Media{
 				Type: description.MediaTypeAudio,
 				Formats: []format.Format{&format.AC3{
diff --git a/internal/protocols/rtmp/from_stream.go b/internal/protocols/rtmp/from_stream.go
index 4abeee7a..dd8f75f5 100644
--- a/internal/protocols/rtmp/from_stream.go
+++ b/internal/protocols/rtmp/from_stream.go
@@ -8,6 +8,7 @@ import (
 	"time"
 
 	"github.com/bluenviron/gortmplib"
+	"github.com/bluenviron/gortmplib/pkg/codecs"
 	"github.com/bluenviron/gortmplib/pkg/message"
 	"github.com/bluenviron/gortsplib/v5/pkg/description"
 	"github.com/bluenviron/gortsplib/v5/pkg/format"
@@ -44,7 +45,7 @@ func FromStream(
 	nconn net.Conn,
 	writeTimeout time.Duration,
 ) error {
-	var tracks []format.Format
+	var tracks []*gortmplib.Track
 	var w *gortmplib.Writer
 
 	for _, media := range desc.Medias {
@@ -52,6 +53,11 @@ func FromStream(
 			switch forma := forma.(type) {
 			case *format.AV1:
 				if slices.Contains(conn.FourCcList, any(fourCCToString(message.FourCCAV1))) {
+					track := &gortmplib.Track{
+						Codec: &codecs.AV1{},
+					}
+					tracks = append(tracks, track)
+
 					r.OnData(
 						media,
 						forma,
@@ -62,16 +68,19 @@ func FromStream(
 
 							nconn.SetWriteDeadline(time.Now().Add(writeTimeout))
 							return (*w).WriteAV1(
-								forma,
+								track,
 								timestampToDuration(u.PTS, forma.ClockRate()),
 								u.Payload.(unit.PayloadAV1))
 						})
-
-					tracks = append(tracks, forma)
 				}
 
 			case *format.VP9:
 				if slices.Contains(conn.FourCcList, any(fourCCToString(message.FourCCVP9))) {
+					track := &gortmplib.Track{
+						Codec: &codecs.VP9{},
+					}
+					tracks = append(tracks, track)
+
 					r.OnData(
 						media,
 						forma,
@@ -82,16 +91,24 @@ func FromStream(
 
 							nconn.SetWriteDeadline(time.Now().Add(writeTimeout))
 							return (*w).WriteVP9(
-								forma,
+								track,
 								timestampToDuration(u.PTS, forma.ClockRate()),
 								u.Payload.(unit.PayloadVP9))
 						})
-
-					tracks = append(tracks, forma)
 				}
 
 			case *format.H265:
 				if slices.Contains(conn.FourCcList, any(fourCCToString(message.FourCCHEVC))) {
+					vps, sps, pps := forma.SafeParams()
+					track := &gortmplib.Track{
+						Codec: &codecs.H265{
+							VPS: vps,
+							SPS: sps,
+							PPS: pps,
+						},
+					}
+					tracks = append(tracks, track)
+
 					var videoDTSExtractor *h265.DTSExtractor
 
 					r.OnData(
@@ -117,16 +134,23 @@ func FromStream(
 
 							nconn.SetWriteDeadline(time.Now().Add(writeTimeout))
 							return (*w).WriteH265(
-								forma,
+								track,
 								timestampToDuration(u.PTS, forma.ClockRate()),
 								timestampToDuration(dts, forma.ClockRate()),
 								u.Payload.(unit.PayloadH265))
 						})
-
-					tracks = append(tracks, forma)
 				}
 
 			case *format.H264:
+				sps, pps := forma.SafeParams()
+				track := &gortmplib.Track{
+					Codec: &codecs.H264{
+						SPS: sps,
+						PPS: pps,
+					},
+				}
+				tracks = append(tracks, track)
+
 				var videoDTSExtractor *h264.DTSExtractor
 
 				r.OnData(
@@ -170,16 +194,21 @@ func FromStream(
 
 						nconn.SetWriteDeadline(time.Now().Add(writeTimeout))
 						return (*w).WriteH264(
-							forma,
+							track,
 							timestampToDuration(u.PTS, forma.ClockRate()),
 							timestampToDuration(dts, forma.ClockRate()),
 							u.Payload.(unit.PayloadH264))
 					})
 
-				tracks = append(tracks, forma)
-
 			case *format.Opus:
 				if slices.Contains(conn.FourCcList, any(fourCCToString(message.FourCCOpus))) {
+					track := &gortmplib.Track{
+						Codec: &codecs.Opus{
+							ChannelCount: forma.ChannelCount,
+						},
+					}
+					tracks = append(tracks, track)
+
 					r.OnData(
 						media,
 						forma,
@@ -193,7 +222,7 @@ func FromStream(
 							for _, pkt := range u.Payload.(unit.PayloadOpus) {
 								nconn.SetWriteDeadline(time.Now().Add(writeTimeout))
 								err := (*w).WriteOpus(
-									forma,
+									track,
 									timestampToDuration(pts, forma.ClockRate()),
 									pkt,
 								)
@@ -206,11 +235,16 @@ func FromStream(
 
 							return nil
 						})
-
-					tracks = append(tracks, forma)
 				}
 
 			case *format.MPEG4Audio:
+				track := &gortmplib.Track{
+					Codec: &codecs.MPEG4Audio{
+						Config: forma.Config,
+					},
+				}
+				tracks = append(tracks, track)
+
 				r.OnData(
 					media,
 					forma,
@@ -224,7 +258,7 @@ func FromStream(
 
 							nconn.SetWriteDeadline(time.Now().Add(writeTimeout))
 							err := (*w).WriteMPEG4Audio(
-								forma,
+								track,
 								timestampToDuration(pts, forma.ClockRate()),
 								au,
 							)
@@ -236,10 +270,15 @@ func FromStream(
 						return nil
 					})
 
-				tracks = append(tracks, forma)
-
 			case *format.MPEG4AudioLATM:
 				if !forma.CPresent {
+					track := &gortmplib.Track{
+						Codec: &codecs.MPEG4Audio{
+							Config: forma.StreamMuxConfig.Programs[0].Layers[0].AudioSpecificConfig,
+						},
+					}
+					tracks = append(tracks, track)
+
 					r.OnData(
 						media,
 						forma,
@@ -257,16 +296,19 @@ func FromStream(
 
 							nconn.SetWriteDeadline(time.Now().Add(writeTimeout))
 							return (*w).WriteMPEG4Audio(
-								forma,
+								track,
 								timestampToDuration(u.PTS, forma.ClockRate()),
 								ame.Payloads[0][0][0],
 							)
 						})
-
-					tracks = append(tracks, forma)
 				}
 
 			case *format.MPEG1Audio:
+				track := &gortmplib.Track{
+					Codec: &codecs.MPEG1Audio{},
+				}
+				tracks = append(tracks, track)
+
 				r.OnData(
 					media,
 					forma,
@@ -286,7 +328,7 @@ func FromStream(
 
 							nconn.SetWriteDeadline(time.Now().Add(writeTimeout))
 							err = (*w).WriteMPEG1Audio(
-								forma,
+								track,
 								timestampToDuration(pts, forma.ClockRate()),
 								frame)
 							if err != nil {
@@ -300,10 +342,16 @@ func FromStream(
 						return nil
 					})
 
-				tracks = append(tracks, forma)
-
 			case *format.AC3:
 				if slices.Contains(conn.FourCcList, any(fourCCToString(message.FourCCAC3))) {
+					track := &gortmplib.Track{
+						Codec: &codecs.AC3{
+							SampleRate:   forma.SampleRate,
+							ChannelCount: forma.ChannelCount,
+						},
+					}
+					tracks = append(tracks, track)
+
 					r.OnData(
 						media,
 						forma,
@@ -317,7 +365,7 @@ func FromStream(
 
 								nconn.SetWriteDeadline(time.Now().Add(writeTimeout))
 								err := (*w).WriteAC3(
-									forma,
+									track,
 									timestampToDuration(pts, forma.ClockRate()),
 									frame)
 								if err != nil {
@@ -327,12 +375,19 @@ func FromStream(
 
 							return nil
 						})
-
-					tracks = append(tracks, forma)
 				}
 
 			case *format.G711:
 				if forma.SampleRate == 8000 {
+					track := &gortmplib.Track{
+						Codec: &codecs.G711{
+							MULaw:        forma.MULaw,
+							SampleRate:   forma.SampleRate,
+							ChannelCount: forma.ChannelCount,
+						},
+					}
+					tracks = append(tracks, track)
+
 					r.OnData(
 						media,
 						forma,
@@ -343,13 +398,11 @@ func FromStream(
 
 							nconn.SetWriteDeadline(time.Now().Add(writeTimeout))
 							return (*w).WriteG711(
-								forma,
+								track,
 								timestampToDuration(u.PTS, forma.ClockRate()),
 								u.Payload.(unit.PayloadG711),
 							)
 						})
-
-					tracks = append(tracks, forma)
 				}
 
 			case *format.LPCM:
@@ -358,6 +411,15 @@ func FromStream(
 						forma.SampleRate == 11025 ||
 						forma.SampleRate == 22050 ||
 						forma.SampleRate == 44100) {
+					track := &gortmplib.Track{
+						Codec: &codecs.LPCM{
+							BitDepth:     forma.BitDepth,
+							SampleRate:   forma.SampleRate,
+							ChannelCount: forma.ChannelCount,
+						},
+					}
+					tracks = append(tracks, track)
+
 					r.OnData(
 						media,
 						forma,
@@ -368,13 +430,11 @@ func FromStream(
 
 							nconn.SetWriteDeadline(time.Now().Add(writeTimeout))
 							return (*w).WriteLPCM(
-								forma,
+								track,
 								timestampToDuration(u.PTS, forma.ClockRate()),
 								u.Payload.(unit.PayloadLPCM),
 							)
 						})
-
-					tracks = append(tracks, forma)
 				}
 			}
 		}
@@ -393,10 +453,12 @@ func FromStream(
 		return err
 	}
 
+	setuppedFormats := r.Formats()
+
 	n := 1
 	for _, media := range desc.Medias {
 		for _, forma := range media.Formats {
-			if !slices.Contains(tracks, forma) {
+			if !slices.Contains(setuppedFormats, forma) {
 				r.Parent.Log(logger.Warn, "skipping track %d (%s)", n, forma.Codec())
 			}
 			n++
diff --git a/internal/protocols/rtmp/from_stream_test.go b/internal/protocols/rtmp/from_stream_test.go
index e315b632..b70b99f6 100644
--- a/internal/protocols/rtmp/from_stream_test.go
+++ b/internal/protocols/rtmp/from_stream_test.go
@@ -9,9 +9,9 @@ import (
 	"time"
 
 	"github.com/bluenviron/gortmplib"
+	"github.com/bluenviron/gortmplib/pkg/codecs"
 	"github.com/bluenviron/gortsplib/v5/pkg/description"
 	"github.com/bluenviron/gortsplib/v5/pkg/format"
-	"github.com/bluenviron/mediamtx/internal/codecprocessor"
 	"github.com/bluenviron/mediamtx/internal/logger"
 	"github.com/bluenviron/mediamtx/internal/stream"
 	"github.com/bluenviron/mediamtx/internal/test"
@@ -19,406 +19,81 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
+var (
+	h265DefaultVPS = []byte{
+		0x40, 0x01, 0x0c, 0x01, 0xff, 0xff, 0x02, 0x20,
+		0x00, 0x00, 0x03, 0x00, 0xb0, 0x00, 0x00, 0x03,
+		0x00, 0x00, 0x03, 0x00, 0x7b, 0x18, 0xb0, 0x24,
+	}
+
+	h265DefaultSPS = []byte{
+		0x42, 0x01, 0x01, 0x02, 0x20, 0x00, 0x00, 0x03,
+		0x00, 0xb0, 0x00, 0x00, 0x03, 0x00, 0x00, 0x03,
+		0x00, 0x7b, 0xa0, 0x07, 0x82, 0x00, 0x88, 0x7d,
+		0xb6, 0x71, 0x8b, 0x92, 0x44, 0x80, 0x53, 0x88,
+		0x88, 0x92, 0xcf, 0x24, 0xa6, 0x92, 0x72, 0xc9,
+		0x12, 0x49, 0x22, 0xdc, 0x91, 0xaa, 0x48, 0xfc,
+		0xa2, 0x23, 0xff, 0x00, 0x01, 0x00, 0x01, 0x6a,
+		0x02, 0x02, 0x02, 0x01,
+	}
+
+	h265DefaultPPS = []byte{
+		0x44, 0x01, 0xc0, 0x25, 0x2f, 0x05, 0x32, 0x40,
+	}
+
+	h264DefaultSPS = []byte{ // 1920x1080 baseline
+		0x67, 0x42, 0xc0, 0x28, 0xd9, 0x00, 0x78, 0x02,
+		0x27, 0xe5, 0x84, 0x00, 0x00, 0x03, 0x00, 0x04,
+		0x00, 0x00, 0x03, 0x00, 0xf0, 0x3c, 0x60, 0xc9, 0x20,
+	}
+
+	h264DefaultPPS = []byte{0x08, 0x06, 0x07, 0x08}
+)
+
 func TestFromStream(t *testing.T) {
-	for _, ca := range []string{
-		"h264 + aac",
-		"av1",
-		"vp9",
-		"h265",
-		"h264",
-		"opus",
-		"aac",
-		"mp3",
-		"ac-3",
-		"pcma",
-		"pcmu",
-		"lpcm",
-		"h265 + h264 + vp9 + av1 + opus + aac",
-	} {
-		t.Run(ca, func(t *testing.T) {
-			var medias []*description.Media
+	h265VPS := []byte{
+		0x40, 0x01, 0x0c, 0x01, 0xff, 0xff, 0x01, 0x60,
+		0x00, 0x00, 0x03, 0x00, 0x90, 0x00, 0x00, 0x03,
+		0x00, 0x00, 0x03, 0x00, 0x78, 0xba, 0x02, 0x40,
+	}
+	h265SPS := []byte{
+		0x42, 0x01, 0x01, 0x01, 0x60, 0x00, 0x00, 0x03,
+		0x00, 0x90, 0x00, 0x00, 0x03, 0x00, 0x00, 0x03,
+		0x00, 0x78, 0xa0, 0x03, 0xc0, 0x80, 0x11, 0x07,
+		0xcb, 0x96, 0xe9, 0x29, 0x30, 0xbc, 0x05, 0xa0,
+		0x20, 0x00, 0x00, 0x03, 0x00, 0x20, 0x00, 0x00,
+		0x03, 0x03, 0xc1,
+	}
+	h265PPS := []byte{
+		0x44, 0x01, 0xc0, 0x73, 0xc1, 0x89,
+	}
 
-			switch ca {
-			case "h264 + aac":
-				medias = []*description.Media{
-					{
-						Formats: []format.Format{test.FormatH264},
-					},
-					{
-						Formats: []format.Format{test.FormatMPEG4Audio},
-					},
-				}
-
-			case "av1":
-				medias = []*description.Media{
-					{
-						Formats: []format.Format{&format.AV1{
-							PayloadTyp: 96,
-						}},
-					},
-				}
-
-			case "vp9":
-				medias = []*description.Media{
-					{
-						Formats: []format.Format{&format.VP9{
-							PayloadTyp: 96,
-						}},
-					},
-				}
-
-			case "h265":
-				medias = []*description.Media{
-					{
-						Formats: []format.Format{
-							&format.H265{
-								PayloadTyp: 96,
-								VPS: []byte{
-									0x40, 0x01, 0x0c, 0x01, 0xff, 0xff, 0x01, 0x60,
-									0x00, 0x00, 0x03, 0x00, 0x90, 0x00, 0x00, 0x03,
-									0x00, 0x00, 0x03, 0x00, 0x78, 0xba, 0x02, 0x40,
-								},
-								SPS: []byte{
-									0x42, 0x01, 0x01, 0x01, 0x60, 0x00, 0x00, 0x03,
-									0x00, 0x90, 0x00, 0x00, 0x03, 0x00, 0x00, 0x03,
-									0x00, 0x78, 0xa0, 0x03, 0xc0, 0x80, 0x11, 0x07,
-									0xcb, 0x96, 0xe9, 0x29, 0x30, 0xbc, 0x05, 0xa0,
-									0x20, 0x00, 0x00, 0x03, 0x00, 0x20, 0x00, 0x00,
-									0x03, 0x03, 0xc1,
-								},
-								PPS: []byte{
-									0x44, 0x01, 0xc0, 0x73, 0xc1, 0x89,
-								},
-							},
-						},
-					},
-				}
-
-			case "h264":
-				medias = []*description.Media{
-					{
-						Formats: []format.Format{test.FormatH264},
-					},
-				}
-
-			case "opus":
-				medias = []*description.Media{
-					{
-						Formats: []format.Format{&format.Opus{
-							PayloadTyp:   96,
-							ChannelCount: 2,
-						}},
-					},
-				}
-
-			case "aac":
-				medias = []*description.Media{
-					{
-						Formats: []format.Format{test.FormatMPEG4Audio},
-					},
-				}
-
-			case "mp3":
-				medias = []*description.Media{
-					{
-						Formats: []format.Format{&format.MPEG1Audio{}},
-					},
-				}
-
-			case "ac-3":
-				medias = []*description.Media{
-					{
-						Formats: []format.Format{&format.AC3{
-							SampleRate:   44100,
-							ChannelCount: 2,
-						}},
-					},
-				}
-
-			case "pcma":
-				medias = []*description.Media{
-					{
-						Formats: []format.Format{&format.G711{
-							MULaw:        false,
-							SampleRate:   8000,
-							ChannelCount: 1,
-						}},
-					},
-				}
-
-			case "pcmu":
-				medias = []*description.Media{
-					{
-						Formats: []format.Format{&format.G711{
-							MULaw:        true,
-							SampleRate:   8000,
-							ChannelCount: 1,
-						}},
-					},
-				}
-
-			case "lpcm":
-				medias = []*description.Media{
-					{
-						Formats: []format.Format{&format.LPCM{
-							BitDepth:     16,
-							SampleRate:   44100,
-							ChannelCount: 2,
-						}},
-					},
-				}
-
-			case "h265 + h264 + vp9 + av1 + opus + aac":
-				medias = []*description.Media{
-					{
-						Formats: []format.Format{&format.H265{}},
-					},
-					{
-						Formats: []format.Format{&format.H264{}},
-					},
-					{
-						Formats: []format.Format{&format.VP9{}},
-					},
-					{
-						Formats: []format.Format{&format.AV1{}},
-					},
-					{
-						Formats: []format.Format{&format.Opus{
-							PayloadTyp:   96,
-							ChannelCount: 2,
-						}},
-					},
-					{
-						Formats: []format.Format{&format.MPEG4Audio{
-							PayloadTyp:       96,
-							Config:           test.FormatMPEG4Audio.Config,
-							SizeLength:       13,
-							IndexLength:      3,
-							IndexDeltaLength: 3,
-						}},
-					},
-				}
-			}
-
-			strm := &stream.Stream{
-				WriteQueueSize:     512,
-				RTPMaxPayloadSize:  1450,
-				Desc:               &description.Session{Medias: medias},
-				GenerateRTPPackets: true,
-				Parent:             test.NilLogger,
-			}
-			err := strm.Initialize()
-			require.NoError(t, err)
-
-			ln, err := net.Listen("tcp", "127.0.0.1:9121")
-			require.NoError(t, err)
-			defer ln.Close()
-
-			done := make(chan struct{})
-
-			go func() {
-				u, err2 := url.Parse("rtmp://127.0.0.1:9121/stream")
-				require.NoError(t, err2)
-
-				c := &gortmplib.Client{
-					URL: u,
-				}
-				err2 = c.Initialize(context.Background())
-				require.NoError(t, err2)
-
-				r := &gortmplib.Reader{
-					Conn: c,
-				}
-				err2 = r.Initialize()
-				require.NoError(t, err2)
-
-				switch ca {
-				case "h264 + aac":
-					require.Equal(t, []format.Format{
-						&format.H264{
-							SPS:               test.FormatH264.SPS,
-							PPS:               test.FormatH264.PPS,
-							PacketizationMode: 1,
-							PayloadTyp:        96,
-						},
-						&format.MPEG4Audio{
-							PayloadTyp:       96,
-							Config:           test.FormatMPEG4Audio.Config,
-							SizeLength:       13,
-							IndexLength:      3,
-							IndexDeltaLength: 3,
-						},
-					}, r.Tracks())
-
-				case "av1":
-					require.Equal(t, []format.Format{
-						&format.AV1{
-							PayloadTyp: 96,
-						},
-					}, r.Tracks())
-
-				case "vp9":
-					require.Equal(t, []format.Format{
-						&format.VP9{
-							PayloadTyp: 96,
-						},
-					}, r.Tracks())
-
-				case "h265":
-					require.Equal(t, []format.Format{
-						&format.H265{
-							VPS: []byte{
-								0x40, 0x01, 0x0c, 0x01, 0xff, 0xff, 0x01, 0x60,
-								0x00, 0x00, 0x03, 0x00, 0x90, 0x00, 0x00, 0x03,
-								0x00, 0x00, 0x03, 0x00, 0x78, 0xba, 0x02, 0x40,
-							},
-							SPS: []byte{
-								0x42, 0x01, 0x01, 0x01, 0x60, 0x00, 0x00, 0x03,
-								0x00, 0x90, 0x00, 0x00, 0x03, 0x00, 0x00, 0x03,
-								0x00, 0x78, 0xa0, 0x03, 0xc0, 0x80, 0x11, 0x07,
-								0xcb, 0x96, 0xe9, 0x29, 0x30, 0xbc, 0x05, 0xa0,
-								0x20, 0x00, 0x00, 0x03, 0x00, 0x20, 0x00, 0x00,
-								0x03, 0x03, 0xc1,
-							},
-							PPS: []byte{
-								0x44, 0x01, 0xc0, 0x73, 0xc1, 0x89,
-							},
-							PayloadTyp: 96,
-						},
-					}, r.Tracks())
-
-				case "h264":
-					require.Equal(t, []format.Format{
-						&format.H264{
-							SPS:               test.FormatH264.SPS,
-							PPS:               test.FormatH264.PPS,
-							PacketizationMode: 1,
-							PayloadTyp:        96,
-						},
-					}, r.Tracks())
-
-				case "opus":
-					require.Equal(t, []format.Format{
-						&format.Opus{
-							PayloadTyp:   96,
-							ChannelCount: 2,
-						},
-					}, r.Tracks())
-
-				case "aac":
-					require.Equal(t, []format.Format{
-						&format.MPEG4Audio{
-							PayloadTyp:       96,
-							Config:           test.FormatMPEG4Audio.Config,
-							SizeLength:       13,
-							IndexLength:      3,
-							IndexDeltaLength: 3,
-						},
-					}, r.Tracks())
-
-				case "mp3":
-					require.Equal(t, []format.Format{
-						&format.MPEG1Audio{},
-					}, r.Tracks())
-
-				case "ac-3":
-					require.Equal(t, []format.Format{
-						&format.AC3{
-							PayloadTyp:   96,
-							SampleRate:   48000,
-							ChannelCount: 1,
-						},
-					}, r.Tracks())
-
-				case "pcma":
-					require.Equal(t, []format.Format{
-						&format.G711{
-							PayloadTyp:   8,
-							MULaw:        false,
-							ChannelCount: 1,
-							SampleRate:   8000,
-						},
-					}, r.Tracks())
-
-				case "pcmu":
-					require.Equal(t, []format.Format{
-						&format.G711{
-							MULaw:        true,
-							ChannelCount: 1,
-							SampleRate:   8000,
-						},
-					}, r.Tracks())
-
-				case "lpcm":
-					require.Equal(t, []format.Format{
-						&format.LPCM{
-							PayloadTyp:   96,
-							BitDepth:     16,
-							SampleRate:   44100,
-							ChannelCount: 2,
-						},
-					}, r.Tracks())
-
-				case "h265 + h264 + vp9 + av1 + opus + aac":
-					require.Equal(t, []format.Format{
-						&format.H265{
-							PayloadTyp: 96,
-							VPS:        codecprocessor.H265DefaultVPS,
-							SPS:        codecprocessor.H265DefaultSPS,
-							PPS:        codecprocessor.H265DefaultPPS,
-						},
-						&format.H264{
-							PayloadTyp:        96,
-							PacketizationMode: 1,
-							SPS:               codecprocessor.H264DefaultSPS,
-							PPS:               codecprocessor.H264DefaultPPS,
-						},
-						&format.VP9{
-							PayloadTyp: 96,
-						},
-						&format.AV1{
-							PayloadTyp: 96,
-						},
-						&format.Opus{
-							PayloadTyp:   96,
-							ChannelCount: 2,
-						},
-						&format.MPEG4Audio{
-							PayloadTyp:       96,
-							Config:           test.FormatMPEG4Audio.Config,
-							SizeLength:       13,
-							IndexLength:      3,
-							IndexDeltaLength: 3,
-						},
-					}, r.Tracks())
-				}
-
-				close(done)
-			}()
-
-			nconn, err := ln.Accept()
-			require.NoError(t, err)
-			defer nconn.Close()
-
-			conn := &gortmplib.ServerConn{
-				RW: nconn,
-			}
-			err = conn.Initialize()
-			require.NoError(t, err)
-
-			err = conn.Accept()
-			require.NoError(t, err)
-
-			r := &stream.Reader{Parent: test.NilLogger}
-
-			err = FromStream(strm.Desc, r, conn, nconn, 10*time.Second)
-			require.NoError(t, err)
-
-			strm.AddReader(r)
-			defer strm.RemoveReader(r)
-
-			switch ca {
-			case "h264 + aac":
+	cases := []struct {
+		name           string
+		medias         []*description.Media
+		expectedTracks []*gortmplib.Track
+		writeUnits     func([]*description.Media, *stream.Stream)
+	}{
+		{
+			name: "h264 + aac",
+			medias: []*description.Media{
+				{
+					Formats: []format.Format{test.FormatH264},
+				},
+				{
+					Formats: []format.Format{test.FormatMPEG4Audio},
+				},
+			},
+			expectedTracks: []*gortmplib.Track{
+				{Codec: &codecs.H264{
+					SPS: test.FormatH264.SPS,
+					PPS: test.FormatH264.PPS,
+				}},
+				{Codec: &codecs.MPEG4Audio{
+					Config: test.FormatMPEG4Audio.Config,
+				}},
+			},
+			writeUnits: func(medias []*description.Media, strm *stream.Stream) {
 				strm.WriteUnit(medias[0], medias[0].Formats[0], &unit.Unit{
 					PTS: 0,
 					Payload: unit.PayloadH264{
@@ -432,8 +107,21 @@ func TestFromStream(t *testing.T) {
 						{3, 4},
 					},
 				})
-
-			case "av1":
+			},
+		},
+		{
+			name: "av1",
+			medias: []*description.Media{
+				{
+					Formats: []format.Format{&format.AV1{
+						PayloadTyp: 96,
+					}},
+				},
+			},
+			expectedTracks: []*gortmplib.Track{
+				{Codec: &codecs.AV1{}},
+			},
+			writeUnits: func(medias []*description.Media, strm *stream.Stream) {
 				for i := range 2 {
 					strm.WriteUnit(medias[0], medias[0].Formats[0], &unit.Unit{
 						PTS: 90000 * 2 * int64(i),
@@ -443,16 +131,51 @@ func TestFromStream(t *testing.T) {
 						}},
 					})
 				}
-
-			case "vp9":
+			},
+		},
+		{
+			name: "vp9",
+			medias: []*description.Media{
+				{
+					Formats: []format.Format{&format.VP9{
+						PayloadTyp: 96,
+					}},
+				},
+			},
+			expectedTracks: []*gortmplib.Track{
+				{Codec: &codecs.VP9{}},
+			},
+			writeUnits: func(medias []*description.Media, strm *stream.Stream) {
 				for i := range 2 {
 					strm.WriteUnit(medias[0], medias[0].Formats[0], &unit.Unit{
 						PTS:     90000 * 2 * int64(i),
 						Payload: unit.PayloadVP9{1, 2},
 					})
 				}
-
-			case "h265":
+			},
+		},
+		{
+			name: "h265",
+			medias: []*description.Media{
+				{
+					Formats: []format.Format{
+						&format.H265{
+							PayloadTyp: 96,
+							VPS:        h265VPS,
+							SPS:        h265SPS,
+							PPS:        h265PPS,
+						},
+					},
+				},
+			},
+			expectedTracks: []*gortmplib.Track{
+				{Codec: &codecs.H265{
+					VPS: h265VPS,
+					SPS: h265SPS,
+					PPS: h265PPS,
+				}},
+			},
+			writeUnits: func(medias []*description.Media, strm *stream.Stream) {
 				for i := range 2 {
 					strm.WriteUnit(medias[0], medias[0].Formats[0], &unit.Unit{
 						PTS: 90000 * 2 * int64(i),
@@ -462,8 +185,22 @@ func TestFromStream(t *testing.T) {
 						}},
 					})
 				}
-
-			case "h264":
+			},
+		},
+		{
+			name: "h264",
+			medias: []*description.Media{
+				{
+					Formats: []format.Format{test.FormatH264},
+				},
+			},
+			expectedTracks: []*gortmplib.Track{
+				{Codec: &codecs.H264{
+					SPS: test.FormatH264.SPS,
+					PPS: test.FormatH264.PPS,
+				}},
+			},
+			writeUnits: func(medias []*description.Media, strm *stream.Stream) {
 				for i := range 2 {
 					strm.WriteUnit(medias[0], medias[0].Formats[0], &unit.Unit{
 						PTS: 90000 * 2 * int64(i),
@@ -472,8 +209,24 @@ func TestFromStream(t *testing.T) {
 						},
 					})
 				}
-
-			case "opus":
+			},
+		},
+		{
+			name: "opus",
+			medias: []*description.Media{
+				{
+					Formats: []format.Format{&format.Opus{
+						PayloadTyp:   96,
+						ChannelCount: 2,
+					}},
+				},
+			},
+			expectedTracks: []*gortmplib.Track{
+				{Codec: &codecs.Opus{
+					ChannelCount: 2,
+				}},
+			},
+			writeUnits: func(medias []*description.Media, strm *stream.Stream) {
 				for i := range 2 {
 					strm.WriteUnit(medias[0], medias[0].Formats[0], &unit.Unit{
 						PTS: 90000 * 5 * int64(i),
@@ -482,8 +235,21 @@ func TestFromStream(t *testing.T) {
 						},
 					})
 				}
-
-			case "aac":
+			},
+		},
+		{
+			name: "aac",
+			medias: []*description.Media{
+				{
+					Formats: []format.Format{test.FormatMPEG4Audio},
+				},
+			},
+			expectedTracks: []*gortmplib.Track{
+				{Codec: &codecs.MPEG4Audio{
+					Config: test.FormatMPEG4Audio.Config,
+				}},
+			},
+			writeUnits: func(medias []*description.Media, strm *stream.Stream) {
 				for i := range 2 {
 					strm.WriteUnit(medias[0], medias[0].Formats[0], &unit.Unit{
 						PTS: 90000 * 5 * int64(i),
@@ -492,8 +258,19 @@ func TestFromStream(t *testing.T) {
 						},
 					})
 				}
-
-			case "mp3":
+			},
+		},
+		{
+			name: "mp3",
+			medias: []*description.Media{
+				{
+					Formats: []format.Format{&format.MPEG1Audio{}},
+				},
+			},
+			expectedTracks: []*gortmplib.Track{
+				{Codec: &codecs.MPEG1Audio{}},
+			},
+			writeUnits: func(medias []*description.Media, strm *stream.Stream) {
 				for i := range 2 {
 					strm.WriteUnit(medias[0], medias[0].Formats[0], &unit.Unit{
 						PTS: 90000 * 5 * int64(i),
@@ -504,8 +281,25 @@ func TestFromStream(t *testing.T) {
 						},
 					})
 				}
-
-			case "ac-3":
+			},
+		},
+		{
+			name: "ac-3",
+			medias: []*description.Media{
+				{
+					Formats: []format.Format{&format.AC3{
+						SampleRate:   44100,
+						ChannelCount: 2,
+					}},
+				},
+			},
+			expectedTracks: []*gortmplib.Track{
+				{Codec: &codecs.AC3{
+					SampleRate:   48000,
+					ChannelCount: 1,
+				}},
+			},
+			writeUnits: func(medias []*description.Media, strm *stream.Stream) {
 				for i := range 2 {
 					strm.WriteUnit(medias[0], medias[0].Formats[0], &unit.Unit{
 						PTS: 90000 * 5 * int64(i),
@@ -563,8 +357,27 @@ func TestFromStream(t *testing.T) {
 						},
 					})
 				}
-
-			case "pcma", "pcmu":
+			},
+		},
+		{
+			name: "pcma",
+			medias: []*description.Media{
+				{
+					Formats: []format.Format{&format.G711{
+						MULaw:        false,
+						SampleRate:   8000,
+						ChannelCount: 1,
+					}},
+				},
+			},
+			expectedTracks: []*gortmplib.Track{
+				{Codec: &codecs.G711{
+					MULaw:        false,
+					ChannelCount: 1,
+					SampleRate:   8000,
+				}},
+			},
+			writeUnits: func(medias []*description.Media, strm *stream.Stream) {
 				for i := range 2 {
 					strm.WriteUnit(medias[0], medias[0].Formats[0], &unit.Unit{
 						PTS: 90000 * 5 * int64(i),
@@ -573,8 +386,56 @@ func TestFromStream(t *testing.T) {
 						},
 					})
 				}
-
-			case "lpcm":
+			},
+		},
+		{
+			name: "pcmu",
+			medias: []*description.Media{
+				{
+					Formats: []format.Format{&format.G711{
+						MULaw:        true,
+						SampleRate:   8000,
+						ChannelCount: 1,
+					}},
+				},
+			},
+			expectedTracks: []*gortmplib.Track{
+				{Codec: &codecs.G711{
+					MULaw:        true,
+					ChannelCount: 1,
+					SampleRate:   8000,
+				}},
+			},
+			writeUnits: func(medias []*description.Media, strm *stream.Stream) {
+				for i := range 2 {
+					strm.WriteUnit(medias[0], medias[0].Formats[0], &unit.Unit{
+						PTS: 90000 * 5 * int64(i),
+						Payload: unit.PayloadG711{
+							3, 4,
+						},
+					})
+				}
+			},
+		},
+		{
+			name: "lpcm",
+			medias: []*description.Media{
+				{
+					Formats: []format.Format{&format.LPCM{
+						BitDepth:     16,
+						SampleRate:   44100,
+						ChannelCount: 2,
+					}},
+				},
+			},
+			expectedTracks: []*gortmplib.Track{
+				{Codec: &codecs.LPCM{
+					BitDepth:     16,
+					SampleRate:   44100,
+					ChannelCount: 2,
+				}},
+			},
+			writeUnits: func(medias []*description.Media, strm *stream.Stream) {
 				for i := range 2 {
 					strm.WriteUnit(medias[0], medias[0].Formats[0], &unit.Unit{
 						PTS: 90000 * 5 * int64(i),
@@ -583,8 +444,59 @@ func TestFromStream(t *testing.T) {
 						},
 					})
 				}
-
-			case "h265 + h264 + vp9 + av1 + opus + aac":
+			},
+		},
+		{
+			name: "h265 + h264 + vp9 + av1 + opus + aac",
+			medias: []*description.Media{
+				{
+					Formats: []format.Format{&format.H265{}},
+				},
+				{
+					Formats: []format.Format{&format.H264{}},
+				},
+				{
+					Formats: []format.Format{&format.VP9{}},
+				},
+				{
+					Formats: []format.Format{&format.AV1{}},
+				},
+				{
+					Formats: []format.Format{&format.Opus{
+						PayloadTyp:   96,
+						ChannelCount: 2,
+					}},
+				},
+				{
+					Formats: []format.Format{&format.MPEG4Audio{
+						PayloadTyp:       96,
+						Config:           test.FormatMPEG4Audio.Config,
+						SizeLength:       13,
+						IndexLength:      3,
+						IndexDeltaLength: 3,
+					}},
+				},
+			},
+			expectedTracks: []*gortmplib.Track{
+				{Codec: &codecs.H265{
+					VPS: h265DefaultVPS,
+					SPS: h265DefaultSPS,
+					PPS: h265DefaultPPS,
+				}},
+				{Codec: &codecs.H264{
+					SPS: h264DefaultSPS,
+					PPS: h264DefaultPPS,
+				}},
+				{Codec: &codecs.VP9{}},
+				{Codec: &codecs.AV1{}},
+				{Codec: &codecs.Opus{
+					ChannelCount: 2,
+				}},
+				{Codec: &codecs.MPEG4Audio{
+					Config: test.FormatMPEG4Audio.Config,
+				}},
+			},
+			writeUnits: func(medias []*description.Media, strm *stream.Stream) {
 				strm.WriteUnit(medias[0], medias[0].Formats[0], &unit.Unit{
 					Payload: unit.PayloadH265{
 						{
@@ -612,8 +524,8 @@ func TestFromStream(t *testing.T) {
 
 				strm.WriteUnit(medias[1], medias[1].Formats[0], &unit.Unit{
 					Payload: unit.PayloadH264{
-						codecprocessor.H264DefaultSPS,
-						codecprocessor.H264DefaultPPS,
+						h264DefaultSPS,
+						h264DefaultPPS,
 						{5, 2}, // IDR
 					},
 				})
@@ -641,7 +553,73 @@ func TestFromStream(t *testing.T) {
 						{3, 4},
 					},
 				})
+			},
+		},
+	}
+
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			medias := tc.medias
+
+			strm := &stream.Stream{
+				Desc:              &description.Session{Medias: medias},
+				UseRTPPackets:     false,
+				WriteQueueSize:    512,
+				RTPMaxPayloadSize: 1450,
+				Parent:            test.NilLogger,
 			}
+			err := strm.Initialize()
+			require.NoError(t, err)
+
+			ln, err := net.Listen("tcp", "127.0.0.1:9121")
+			require.NoError(t, err)
+			defer ln.Close()
+
+			done := make(chan struct{})
+
+			go func() {
+				u, err2 := url.Parse("rtmp://127.0.0.1:9121/stream")
+				require.NoError(t, err2)
+
+				c := &gortmplib.Client{
+					URL: u,
+				}
+				err2 = c.Initialize(context.Background())
+				require.NoError(t, err2)
+
+				r := &gortmplib.Reader{
+					Conn: c,
+				}
+				err2 = r.Initialize()
+				require.NoError(t, err2)
+
+				require.Equal(t, tc.expectedTracks, r.Tracks())
+
+				close(done)
+			}()
+
+			nconn, err := ln.Accept()
+			require.NoError(t, err)
+			defer nconn.Close()
+
+			conn := &gortmplib.ServerConn{
+				RW: nconn,
+			}
+			err = conn.Initialize()
+			require.NoError(t, err)
+
+			err = conn.Accept()
+			require.NoError(t, err)
+
+			r := &stream.Reader{Parent: test.NilLogger}
+
+			err = FromStream(strm.Desc, r, conn, nconn, 10*time.Second)
+			require.NoError(t, err)
+
+			strm.AddReader(r)
+			defer strm.RemoveReader(r)
+
+			tc.writeUnits(medias, strm)
 
 			<-done
 		})
diff --git a/internal/protocols/rtmp/to_stream.go b/internal/protocols/rtmp/to_stream.go
index c98c9c53..53a36017 100644
--- a/internal/protocols/rtmp/to_stream.go
+++ b/internal/protocols/rtmp/to_stream.go
@@ -5,6 +5,7 @@ import (
 	"time"
 
 	"github.com/bluenviron/gortmplib"
+	"github.com/bluenviron/gortmplib/pkg/codecs"
 	"github.com/bluenviron/gortmplib/pkg/message"
 	"github.com/bluenviron/gortsplib/v5/pkg/description"
 	"github.com/bluenviron/gortsplib/v5/pkg/format"
@@ -38,145 +39,199 @@ func ToStream(
 	var medias []*description.Media
 
 	for _, track := range r.Tracks() {
-		ctrack := track
-
-		switch ttrack := track.(type) {
-		case *format.AV1:
+		switch codec := track.Codec.(type) {
+		case *codecs.AV1:
+			forma := &format.AV1{
+				PayloadTyp: 96,
+			}
 			medi := &description.Media{
 				Type:    description.MediaTypeVideo,
-				Formats: []format.Format{ctrack},
+				Formats: []format.Format{forma},
 			}
 			medias = append(medias, medi)
 
-			r.OnDataAV1(ttrack, func(pts time.Duration, tu [][]byte) {
-				(*strm).WriteUnit(medi, ctrack, &unit.Unit{
-					PTS:     durationToTimestamp(pts, ctrack.ClockRate()),
+			r.OnDataAV1(track, func(pts time.Duration, tu [][]byte) {
+				(*strm).WriteUnit(medi, forma, &unit.Unit{
+					PTS:     durationToTimestamp(pts, forma.ClockRate()),
 					Payload: unit.PayloadAV1(tu),
 				})
 			})
 
-		case *format.VP9:
+		case *codecs.VP9:
+			forma := &format.VP9{
+				PayloadTyp: 96,
+			}
 			medi := &description.Media{
 				Type:    description.MediaTypeVideo,
-				Formats: []format.Format{ctrack},
+				Formats: []format.Format{forma},
 			}
 			medias = append(medias, medi)
 
-			r.OnDataVP9(ttrack, func(pts time.Duration, frame []byte) {
-				(*strm).WriteUnit(medi, ctrack, &unit.Unit{
-					PTS:     durationToTimestamp(pts, ctrack.ClockRate()),
+			r.OnDataVP9(track, func(pts time.Duration, frame []byte) {
+				(*strm).WriteUnit(medi, forma, &unit.Unit{
+					PTS:     durationToTimestamp(pts, forma.ClockRate()),
 					Payload: unit.PayloadVP9(frame),
 				})
 			})
 
-		case *format.H265:
+		case *codecs.H265:
+			forma := &format.H265{
+				PayloadTyp: 96,
+				VPS:        codec.VPS,
+				SPS:        codec.SPS,
+				PPS:        codec.PPS,
+			}
 			medi := &description.Media{
 				Type:    description.MediaTypeVideo,
-				Formats: []format.Format{ctrack},
+				Formats: []format.Format{forma},
 			}
 			medias = append(medias, medi)
 
-			r.OnDataH265(ttrack, func(pts time.Duration, _ time.Duration, au [][]byte) {
-				(*strm).WriteUnit(medi, ctrack, &unit.Unit{
-					PTS:     durationToTimestamp(pts, ctrack.ClockRate()),
+			r.OnDataH265(track, func(pts time.Duration, _ time.Duration, au [][]byte) {
+				(*strm).WriteUnit(medi, forma, &unit.Unit{
+					PTS:     durationToTimestamp(pts, forma.ClockRate()),
 					Payload: unit.PayloadH265(au),
 				})
 			})
 
-		case *format.H264:
+		case *codecs.H264:
+			forma := &format.H264{
+				PayloadTyp:        96,
+				SPS:               codec.SPS,
+				PPS:               codec.PPS,
+				PacketizationMode: 1,
+			}
 			medi := &description.Media{
 				Type:    description.MediaTypeVideo,
-				Formats: []format.Format{ctrack},
+				Formats: []format.Format{forma},
 			}
 			medias = append(medias, medi)
 
-			r.OnDataH264(ttrack, func(pts time.Duration, _ time.Duration, au [][]byte) {
-				(*strm).WriteUnit(medi, ctrack, &unit.Unit{
-					PTS:     durationToTimestamp(pts, ctrack.ClockRate()),
+			r.OnDataH264(track, func(pts time.Duration, _ time.Duration, au [][]byte) {
+				(*strm).WriteUnit(medi, forma, &unit.Unit{
+					PTS:     durationToTimestamp(pts, forma.ClockRate()),
 					Payload: unit.PayloadH264(au),
 				})
 			})
 
-		case *format.Opus:
+		case *codecs.Opus:
+			forma := &format.Opus{
+				PayloadTyp:   96,
+				ChannelCount: codec.ChannelCount,
+			}
 			medi := &description.Media{
 				Type:    description.MediaTypeAudio,
-				Formats: []format.Format{ctrack},
+				Formats: []format.Format{forma},
 			}
 			medias = append(medias, medi)
 
-			r.OnDataOpus(ttrack, func(pts time.Duration, packet []byte) {
-				(*strm).WriteUnit(medi, ctrack, &unit.Unit{
-					PTS:     durationToTimestamp(pts, ctrack.ClockRate()),
+			r.OnDataOpus(track, func(pts time.Duration, packet []byte) {
+				(*strm).WriteUnit(medi, forma, &unit.Unit{
+					PTS:     durationToTimestamp(pts, forma.ClockRate()),
 					Payload: unit.PayloadOpus{packet},
 				})
 			})
 
-		case *format.MPEG4Audio:
+		case *codecs.MPEG4Audio:
+			forma := &format.MPEG4Audio{
+				PayloadTyp:       96,
+				Config:           codec.Config,
+				SizeLength:       13,
+				IndexLength:      3,
+				IndexDeltaLength: 3,
+			}
 			medi := &description.Media{
 				Type:    description.MediaTypeAudio,
-				Formats: []format.Format{ctrack},
+				Formats: []format.Format{forma},
 			}
 			medias = append(medias, medi)
 
-			r.OnDataMPEG4Audio(ttrack, func(pts time.Duration, au []byte) {
-				(*strm).WriteUnit(medi, ctrack, &unit.Unit{
-					PTS:     durationToTimestamp(pts, ctrack.ClockRate()),
+			r.OnDataMPEG4Audio(track, func(pts time.Duration, au []byte) {
+				(*strm).WriteUnit(medi, forma, &unit.Unit{
+					PTS:     durationToTimestamp(pts, forma.ClockRate()),
 					Payload: unit.PayloadMPEG4Audio{au},
 				})
 			})
 
-		case *format.MPEG1Audio:
+		case *codecs.MPEG1Audio:
+			forma := &format.MPEG1Audio{}
 			medi := &description.Media{
 				Type:    description.MediaTypeAudio,
-				Formats: []format.Format{ctrack},
+				Formats: []format.Format{forma},
 			}
 			medias = append(medias, medi)
 
-			r.OnDataMPEG1Audio(ttrack, func(pts time.Duration, frame []byte) {
-				(*strm).WriteUnit(medi, ctrack, &unit.Unit{
-					PTS:     durationToTimestamp(pts, ctrack.ClockRate()),
+			r.OnDataMPEG1Audio(track, func(pts time.Duration, frame []byte) {
+				(*strm).WriteUnit(medi, forma, &unit.Unit{
+					PTS:     durationToTimestamp(pts, forma.ClockRate()),
 					Payload: unit.PayloadMPEG1Audio{frame},
 				})
 			})
 
-		case *format.AC3:
+		case *codecs.AC3:
+			forma := &format.AC3{
+				PayloadTyp:   96,
+				SampleRate:   codec.SampleRate,
+				ChannelCount: codec.ChannelCount,
+			}
 			medi := &description.Media{
 				Type:    description.MediaTypeAudio,
-				Formats: []format.Format{ctrack},
+				Formats: []format.Format{forma},
 			}
 			medias = append(medias, medi)
 
-			r.OnDataAC3(ttrack, func(pts time.Duration, frame []byte) {
-				(*strm).WriteUnit(medi, ctrack, &unit.Unit{
-					PTS:     durationToTimestamp(pts, ctrack.ClockRate()),
+			r.OnDataAC3(track, func(pts time.Duration, frame []byte) {
+				(*strm).WriteUnit(medi, forma, &unit.Unit{
+					PTS:     durationToTimestamp(pts, forma.ClockRate()),
 					Payload: unit.PayloadAC3{frame},
 				})
 			})
 
-		case *format.G711:
+		case *codecs.G711:
+			forma := &format.G711{
+				PayloadTyp: func() uint8 {
+					switch {
+					case codec.ChannelCount == 1 && codec.MULaw:
+						return 0
+					case codec.ChannelCount == 1 && !codec.MULaw:
+						return 8
+					default:
+						return 96
+					}
+				}(),
+				MULaw:        codec.MULaw,
+				SampleRate:   codec.SampleRate,
+				ChannelCount: codec.ChannelCount,
+			}
 			medi := &description.Media{
 				Type:    description.MediaTypeAudio,
-				Formats: []format.Format{ctrack},
+				Formats: []format.Format{forma},
 			}
 			medias = append(medias, medi)
 
-			r.OnDataG711(ttrack, func(pts time.Duration, samples []byte) {
-				(*strm).WriteUnit(medi, ctrack, &unit.Unit{
-					PTS:     durationToTimestamp(pts, ctrack.ClockRate()),
+			r.OnDataG711(track, func(pts time.Duration, samples []byte) {
+				(*strm).WriteUnit(medi, forma, &unit.Unit{
+					PTS:     durationToTimestamp(pts, forma.ClockRate()),
 					Payload: unit.PayloadG711(samples),
 				})
 			})
 
-		case *format.LPCM:
+		case *codecs.LPCM:
+			forma := &format.LPCM{
+				PayloadTyp:   96,
+				BitDepth:     codec.BitDepth,
+				SampleRate:   codec.SampleRate,
+				ChannelCount: codec.ChannelCount,
+			}
 			medi := &description.Media{
 				Type:    description.MediaTypeAudio,
-				Formats: []format.Format{ctrack},
+				Formats: []format.Format{forma},
 			}
 			medias = append(medias, medi)
 
-			r.OnDataLPCM(ttrack, func(pts time.Duration, samples []byte) {
-				(*strm).WriteUnit(medi, ctrack, &unit.Unit{
-					PTS:     durationToTimestamp(pts, ctrack.ClockRate()),
+			r.OnDataLPCM(track, func(pts time.Duration, samples []byte) {
+				(*strm).WriteUnit(medi, forma, &unit.Unit{
+					PTS:     durationToTimestamp(pts, forma.ClockRate()),
 					Payload: unit.PayloadLPCM(samples),
 				})
 			})
diff --git a/internal/protocols/rtsp/to_stream.go b/internal/protocols/rtsp/to_stream.go
index bbf277e8..97f5da81 100644
--- a/internal/protocols/rtsp/to_stream.go
+++ b/internal/protocols/rtsp/to_stream.go
@@ -10,6 +10,7 @@ import (
 	"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"
 )
 
@@ -32,7 +33,7 @@ func ToStream(
 	source rtspSource,
 	medias []*description.Media,
 	pathConf *conf.Path,
-	strm *stream.Stream,
+	strm **stream.Stream,
 	log logger.Writer,
 ) {
 	for _, medi := range medias {
@@ -82,7 +83,11 @@ func ToStream(
 					return
 				}
 
-				strm.WriteRTPPacket(cmedi, cforma, pkt, ntp, pts)
+				(*strm).WriteUnit(cmedi, cforma, &unit.Unit{
+					PTS:        pts,
+					NTP:        ntp,
+					RTPPackets: []*rtp.Packet{pkt},
+				})
 			})
 		}
 	}
diff --git a/internal/protocols/webrtc/from_stream.go b/internal/protocols/webrtc/from_stream.go
index 33113bc4..b3ee3dfa 100644
--- a/internal/protocols/webrtc/from_stream.go
+++ b/internal/protocols/webrtc/from_stream.go
@@ -4,6 +4,7 @@ import (
 	"crypto/rand"
 	"errors"
 	"fmt"
+	"slices"
 	"time"
 
 	"github.com/bluenviron/gortsplib/v5/pkg/description"
@@ -66,8 +67,7 @@ func timestampToDuration(t int64, clockRate int) time.Duration {
 func setupVideoTrack(
 	desc *description.Session,
 	r *stream.Reader,
-	pc *PeerConnection,
-) (format.Format, error) {
+) (*OutgoingTrack, error) {
 	var av1Format *format.AV1
 	media := desc.FindFormat(&av1Format)
 
@@ -78,7 +78,6 @@ func setupVideoTrack(
 				ClockRate: 90000,
 			},
 		}
-		pc.OutgoingTracks = append(pc.OutgoingTracks, track)
 
 		encoder := &rtpav1.Encoder{
 			PayloadType:    105,
@@ -111,7 +110,7 @@ func setupVideoTrack(
 				return nil
 			})
 
-		return av1Format, nil
+		return track, nil
 	}
 
 	var vp9Format *format.VP9
@@ -125,7 +124,6 @@ func setupVideoTrack(
 				SDPFmtpLine: "profile-id=0",
 			},
 		}
-		pc.OutgoingTracks = append(pc.OutgoingTracks, track)
 
 		encoder := &rtpvp9.Encoder{
 			PayloadType:      96,
@@ -159,7 +157,7 @@ func setupVideoTrack(
 				return nil
 			})
 
-		return vp9Format, nil
+		return track, nil
 	}
 
 	var vp8Format *format.VP8
@@ -172,7 +170,6 @@ func setupVideoTrack(
 				ClockRate: 90000,
 			},
 		}
-		pc.OutgoingTracks = append(pc.OutgoingTracks, track)
 
 		encoder := &rtpvp8.Encoder{
 			PayloadType:    96,
@@ -205,7 +202,7 @@ func setupVideoTrack(
 				return nil
 			})
 
-		return vp8Format, nil
+		return track, nil
 	}
 
 	var h265Format *format.H265
@@ -219,7 +216,6 @@ func setupVideoTrack(
 				SDPFmtpLine: "level-id=93;profile-id=1;tier-flag=0;tx-mode=SRST",
 			},
 		}
-		pc.OutgoingTracks = append(pc.OutgoingTracks, track)
 
 		encoder := &rtph265.Encoder{
 			PayloadType:    96,
@@ -262,7 +258,7 @@ func setupVideoTrack(
 				return nil
 			})
 
-		return h265Format, nil
+		return track, nil
 	}
 
 	var h264Format *format.H264
@@ -276,7 +272,6 @@ func setupVideoTrack(
 				SDPFmtpLine: "level-asymmetry-allowed=1;packetization-mode=1;profile-level-id=42e01f",
 			},
 		}
-		pc.OutgoingTracks = append(pc.OutgoingTracks, track)
 
 		encoder := &rtph264.Encoder{
 			PayloadType:    96,
@@ -319,7 +314,7 @@ func setupVideoTrack(
 				return nil
 			})
 
-		return h264Format, nil
+		return track, nil
 	}
 
 	return nil, nil
@@ -328,8 +323,7 @@ func setupVideoTrack(
 func setupAudioTrack(
 	desc *description.Session,
 	r *stream.Reader,
-	pc *PeerConnection,
-) (format.Format, error) {
+) (*OutgoingTrack, error) {
 	var opusFormat *format.Opus
 	media := desc.FindFormat(&opusFormat)
 
@@ -366,7 +360,6 @@ func setupAudioTrack(
 		track := &OutgoingTrack{
 			Caps: caps,
 		}
-		pc.OutgoingTracks = append(pc.OutgoingTracks, track)
 
 		curTimestamp, err := randUint32()
 		if err != nil {
@@ -395,7 +388,7 @@ func setupAudioTrack(
 				return nil
 			})
 
-		return opusFormat, nil
+		return track, nil
 	}
 
 	var g722Format *format.G722
@@ -408,7 +401,6 @@ func setupAudioTrack(
 				ClockRate: 8000,
 			},
 		}
-		pc.OutgoingTracks = append(pc.OutgoingTracks, track)
 
 		r.OnData(
 			media,
@@ -422,7 +414,7 @@ func setupAudioTrack(
 				return nil
 			})
 
-		return g722Format, nil
+		return track, nil
 	}
 
 	var g711Format *format.G711
@@ -481,7 +473,6 @@ func setupAudioTrack(
 		track := &OutgoingTrack{
 			Caps: caps,
 		}
-		pc.OutgoingTracks = append(pc.OutgoingTracks, track)
 
 		if g711Format.ClockRate() == 8000 {
 			curTimestamp, err := randUint32()
@@ -566,7 +557,7 @@ func setupAudioTrack(
 				})
 		}
 
-		return g711Format, nil
+		return track, nil
 	}
 
 	var lpcmFormat *format.LPCM
@@ -595,7 +586,6 @@ func setupAudioTrack(
 				Channels:  uint16(lpcmFormat.ChannelCount),
 			},
 		}
-		pc.OutgoingTracks = append(pc.OutgoingTracks, track)
 
 		encoder := &rtplpcm.Encoder{
 			PayloadType:    96,
@@ -640,7 +630,37 @@ func setupAudioTrack(
 				return nil
 			})
 
-		return lpcmFormat, nil
+		return track, nil
+	}
+
+	return nil, nil
+}
+
+func setupKLVDataChannel(
+	desc *description.Session,
+	r *stream.Reader,
+) (*OutgoingDataChannel, error) {
+	var klvFormat *format.KLV
+	media := desc.FindFormat(&klvFormat)
+
+	if klvFormat != nil {
+		dataChan := &OutgoingDataChannel{
+			Label: "KLV",
+		}
+
+		r.OnData(
+			media,
+			klvFormat,
+			func(u *unit.Unit) error {
+				if u.NilPayload() {
+					return nil
+				}
+
+				dataChan.Write(u.Payload.(unit.PayloadKLV))
+				return nil
+			})
+
+		return dataChan, nil
 	}
 
 	return nil, nil
@@ -652,24 +672,43 @@ func FromStream(
 	r *stream.Reader,
 	pc *PeerConnection,
 ) error {
-	videoFormat, err := setupVideoTrack(desc, r, pc)
+	videoTrack, err := setupVideoTrack(desc, r)
 	if err != nil {
 		return err
 	}
 
-	audioFormat, err := setupAudioTrack(desc, r, pc)
+	if videoTrack != nil {
+		pc.OutgoingTracks = append(pc.OutgoingTracks, videoTrack)
+	}
+
+	audioTrack, err := setupAudioTrack(desc, r)
 	if err != nil {
 		return err
 	}
 
-	if videoFormat == nil && audioFormat == nil {
+	if audioTrack != nil {
+		pc.OutgoingTracks = append(pc.OutgoingTracks, audioTrack)
+	}
+
+	klvDataChan, err := setupKLVDataChannel(desc, r)
+	if err != nil {
+		return err
+	}
+
+	if klvDataChan != nil {
+		pc.OutgoingDataChannels = append(pc.OutgoingDataChannels, klvDataChan)
+	}
+
+	if len(pc.OutgoingTracks) == 0 && len(pc.OutgoingDataChannels) == 0 {
 		return errNoSupportedCodecsFrom
 	}
 
+	setuppedFormats := r.Formats()
+
 	n := 1
 	for _, media := range desc.Medias {
 		for _, forma := range media.Formats {
-			if forma != videoFormat && forma != audioFormat {
+			if !slices.Contains(setuppedFormats, forma) {
 				r.Parent.Log(logger.Warn, "skipping track %d (%s)", n, forma.Codec())
 			}
 			n++
diff --git a/internal/protocols/webrtc/from_stream_test.go b/internal/protocols/webrtc/from_stream_test.go
index daabec66..b03a3d2a 100644
--- a/internal/protocols/webrtc/from_stream_test.go
+++ b/internal/protocols/webrtc/from_stream_test.go
@@ -11,6 +11,7 @@ import (
 	"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/pion/rtp"
 	"github.com/stretchr/testify/require"
 )
@@ -27,7 +28,9 @@ func TestFromStreamNoSupportedCodecs(t *testing.T) {
 		}),
 	}
 
-	err := FromStream(desc, r, nil)
+	pc := &PeerConnection{}
+
+	err := FromStream(desc, r, pc)
 	require.Equal(t, errNoSupportedCodecsFrom, err)
 }
 
@@ -85,8 +88,6 @@ func TestFromStream(t *testing.T) {
 
 func TestFromStreamResampleOpus(t *testing.T) {
 	strm := &stream.Stream{
-		WriteQueueSize:    512,
-		RTPMaxPayloadSize: 1450,
 		Desc: &description.Session{Medias: []*description.Media{
 			{
 				Type: description.MediaTypeAudio,
@@ -95,8 +96,11 @@ func TestFromStreamResampleOpus(t *testing.T) {
 				}},
 			},
 		}},
-		GenerateRTPPackets: true,
-		Parent:             test.NilLogger,
+		UseRTPPackets:     true,
+		WriteQueueSize:    512,
+		RTPMaxPayloadSize: 1450,
+		ReplaceNTP:        false,
+		Parent:            test.NilLogger,
 	}
 	err := strm.Initialize()
 	require.NoError(t, err)
@@ -149,29 +153,37 @@ func TestFromStreamResampleOpus(t *testing.T) {
 	strm.AddReader(r)
 	defer strm.RemoveReader(r)
 
-	strm.WriteRTPPacket(strm.Desc.Medias[0], strm.Desc.Medias[0].Formats[0], &rtp.Packet{
-		Header: rtp.Header{
-			Version:        2,
-			Marker:         true,
-			PayloadType:    111,
-			SequenceNumber: 1123,
-			Timestamp:      45343,
-			SSRC:           563424,
-		},
-		Payload: []byte{1},
-	}, time.Now(), 0)
+	strm.WriteUnit(strm.Desc.Medias[0], strm.Desc.Medias[0].Formats[0], &unit.Unit{
+		PTS: 0,
+		NTP: time.Now(),
+		RTPPackets: []*rtp.Packet{{
+			Header: rtp.Header{
+				Version:        2,
+				Marker:         true,
+				PayloadType:    111,
+				SequenceNumber: 1123,
+				Timestamp:      45343,
+				SSRC:           563424,
+			},
+			Payload: []byte{1},
+		}},
+	})
 
-	strm.WriteRTPPacket(strm.Desc.Medias[0], strm.Desc.Medias[0].Formats[0], &rtp.Packet{
-		Header: rtp.Header{
-			Version:        2,
-			Marker:         true,
-			PayloadType:    111,
-			SequenceNumber: 1124,
-			Timestamp:      45343,
-			SSRC:           563424,
-		},
-		Payload: []byte{1},
-	}, time.Now(), 0)
+	strm.WriteUnit(strm.Desc.Medias[0], strm.Desc.Medias[0].Formats[0], &unit.Unit{
+		PTS: 0,
+		NTP: time.Now(),
+		RTPPackets: []*rtp.Packet{{
+			Header: rtp.Header{
+				Version:        2,
+				Marker:         true,
+				PayloadType:    111,
+				SequenceNumber: 1124,
+				Timestamp:      45343,
+				SSRC:           563424,
+			},
+			Payload: []byte{1},
+		}},
+	})
 
 	err = pc1.GatherIncomingTracks()
 	require.NoError(t, err)
diff --git a/internal/protocols/webrtc/incoming_track.go b/internal/protocols/webrtc/incoming_track.go
index 6cdef34c..88bb2abf 100644
--- a/internal/protocols/webrtc/incoming_track.go
+++ b/internal/protocols/webrtc/incoming_track.go
@@ -243,7 +243,7 @@ type IncomingTrack struct {
 	writeRTCP func([]rtcp.Packet) error
 	log       logger.Writer
 
-	packetsLost *counterdumper.CounterDumper
+	packetsLost *counterdumper.Dumper
 	rtpReceiver *rtpreceiver.Receiver
 }
 
@@ -267,7 +267,7 @@ func (*IncomingTrack) PTSEqualsDTS(*rtp.Packet) bool {
 }
 
 func (t *IncomingTrack) start() {
-	t.packetsLost = &counterdumper.CounterDumper{
+	t.packetsLost = &counterdumper.Dumper{
 		OnReport: func(val uint64) {
 			t.log.Log(logger.Warn, "%d RTP %s lost",
 				val,
diff --git a/internal/protocols/webrtc/net.go b/internal/protocols/webrtc/net.go
index ef3ef786..32dfeef8 100644
--- a/internal/protocols/webrtc/net.go
+++ b/internal/protocols/webrtc/net.go
@@ -4,8 +4,8 @@ import (
 	"net"
 
 	"github.com/bluenviron/gortsplib/v5/pkg/readbuffer"
-	"github.com/pion/transport/v3"
-	"github.com/pion/transport/v3/stdnet"
+	"github.com/pion/transport/v4"
+	"github.com/pion/transport/v4/stdnet"
 )
 
 type webrtcNet struct {
diff --git a/internal/protocols/webrtc/outgoing_data_channel.go b/internal/protocols/webrtc/outgoing_data_channel.go
new file mode 100644
index 00000000..9b4cd380
--- /dev/null
+++ b/internal/protocols/webrtc/outgoing_data_channel.go
@@ -0,0 +1,29 @@
+package webrtc
+
+import (
+	"github.com/pion/webrtc/v4"
+)
+
+// OutgoingDataChannel is an outgoing data channel.
+type OutgoingDataChannel struct {
+	Label string
+
+	dataChan *webrtc.DataChannel
+}
+
+func (c *OutgoingDataChannel) setup(p *PeerConnection) error {
+	var err error
+	c.dataChan, err = p.wr.CreateDataChannel(c.Label, &webrtc.DataChannelInit{
+		Ordered: ptrOf(false),
+	})
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// Write writes data to the channel.
+func (c *OutgoingDataChannel) Write(data []byte) {
+	c.dataChan.Send(data) //nolint:errcheck
+}
diff --git a/internal/protocols/webrtc/outgoing_track.go b/internal/protocols/webrtc/outgoing_track.go
index fad9c1dd..1caf289f 100644
--- a/internal/protocols/webrtc/outgoing_track.go
+++ b/internal/protocols/webrtc/outgoing_track.go
@@ -10,7 +10,7 @@ import (
 	"github.com/pion/webrtc/v4"
 )
 
-// OutgoingTrack is a WebRTC outgoing track
+// OutgoingTrack is an outgoing track.
 type OutgoingTrack struct {
 	Caps webrtc.RTPCodecCapability
 
diff --git a/internal/protocols/webrtc/peer_connection.go b/internal/protocols/webrtc/peer_connection.go
index b43f26be..4f2a1885 100644
--- a/internal/protocols/webrtc/peer_connection.go
+++ b/internal/protocols/webrtc/peer_connection.go
@@ -145,6 +145,7 @@ type PeerConnection struct {
 	STUNGatherTimeout     conf.Duration
 	Publish               bool
 	OutgoingTracks        []*OutgoingTrack
+	OutgoingDataChannels  []*OutgoingDataChannel
 	Log                   logger.Writer
 
 	wr               *webrtc.PeerConnection
@@ -318,6 +319,14 @@ func (co *PeerConnection) Start() error {
 				return err
 			}
 		}
+
+		for _, dc := range co.OutgoingDataChannels {
+			err = dc.setup(co)
+			if err != nil {
+				co.wr.GracefulClose() //nolint:errcheck
+				return err
+			}
+		}
 	} else {
 		_, err = co.wr.AddTransceiverFromKind(webrtc.RTPCodecTypeVideo, webrtc.RTPTransceiverInit{
 			Direction: webrtc.RTPTransceiverDirectionRecvonly,
diff --git a/internal/protocols/webrtc/peer_connection_test.go b/internal/protocols/webrtc/peer_connection_test.go
index 445c6ad9..dcf56d4f 100644
--- a/internal/protocols/webrtc/peer_connection_test.go
+++ b/internal/protocols/webrtc/peer_connection_test.go
@@ -593,3 +593,63 @@ func TestPeerConnectionFallbackCodecs(t *testing.T) {
 		},
 	}, s.MediaDescriptions)
 }
+
+func TestPeerConnectionPublishDataChannel(t *testing.T) {
+	pc1, err := webrtc.NewPeerConnection(webrtc.Configuration{})
+	require.NoError(t, err)
+	defer pc1.Close() //nolint:errcheck
+
+	_, err = pc1.CreateDataChannel("", nil)
+	require.NoError(t, err)
+
+	dataChanCreated := make(chan struct{})
+	dataReceived := make(chan struct{})
+
+	pc1.OnDataChannel(func(dc *webrtc.DataChannel) {
+		close(dataChanCreated)
+
+		dc.OnMessage(func(msg webrtc.DataChannelMessage) {
+			require.Equal(t, []byte("test data"), msg.Data)
+			close(dataReceived)
+		})
+	})
+
+	offer, err := pc1.CreateOffer(nil)
+	require.NoError(t, err)
+
+	err = pc1.SetLocalDescription(offer)
+	require.NoError(t, err)
+
+	pc2 := &PeerConnection{
+		LocalRandomUDP:     true,
+		IPsFromInterfaces:  true,
+		HandshakeTimeout:   conf.Duration(10 * time.Second),
+		TrackGatherTimeout: conf.Duration(2 * time.Second),
+		STUNGatherTimeout:  conf.Duration(5 * time.Second),
+		Publish:            true,
+		OutgoingDataChannels: []*OutgoingDataChannel{
+			{
+				Label: "test-channel",
+			},
+		},
+		Log: test.NilLogger,
+	}
+	err = pc2.Start()
+	require.NoError(t, err)
+	defer pc2.Close()
+
+	answer, err := pc2.CreateFullAnswer(&offer)
+	require.NoError(t, err)
+
+	err = pc1.SetRemoteDescription(*answer)
+	require.NoError(t, err)
+
+	err = pc2.WaitUntilConnected()
+	require.NoError(t, err)
+
+	<-dataChanCreated
+
+	pc2.OutgoingDataChannels[0].Write([]byte("test data"))
+
+	<-dataReceived
+}
diff --git a/internal/protocols/webrtc/to_stream.go b/internal/protocols/webrtc/to_stream.go
index 983567be..920f4a2f 100644
--- a/internal/protocols/webrtc/to_stream.go
+++ b/internal/protocols/webrtc/to_stream.go
@@ -12,6 +12,7 @@ import (
 	"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"
 )
@@ -196,7 +197,11 @@ func ToStream(
 				return
 			}
 
-			(*strm).WriteRTPPacket(medi, forma, pkt, ntp, pts)
+			(*strm).WriteUnit(medi, forma, &unit.Unit{
+				PTS:        pts,
+				NTP:        ntp,
+				RTPPackets: []*rtp.Packet{pkt},
+			})
 		}
 
 		medias = append(medias, medi)
diff --git a/internal/protocols/webrtc/to_stream_test.go b/internal/protocols/webrtc/to_stream_test.go
index afa5437d..b259e54c 100644
--- a/internal/protocols/webrtc/to_stream_test.go
+++ b/internal/protocols/webrtc/to_stream_test.go
@@ -405,8 +405,8 @@ func TestToStream(t *testing.T) {
 			err = pc2.GatherIncomingTracks()
 			require.NoError(t, err)
 
-			var stream *stream.Stream
-			medias, err := ToStream(pc2, &conf.Path{}, &stream, nil)
+			var strm *stream.Stream
+			medias, err := ToStream(pc2, &conf.Path{}, &strm, nil)
 			require.NoError(t, err)
 			require.Equal(t, ca.out, medias[0].Formats[0])
 		})
diff --git a/internal/recorder/format_fmp4.go b/internal/recorder/format_fmp4.go
index b21c5bda..5670ef1b 100644
--- a/internal/recorder/format_fmp4.go
+++ b/internal/recorder/format_fmp4.go
@@ -19,17 +19,62 @@ import (
 	"github.com/bluenviron/mediacommon/v2/pkg/codecs/opus"
 	"github.com/bluenviron/mediacommon/v2/pkg/codecs/vp9"
 	"github.com/bluenviron/mediacommon/v2/pkg/formats/fmp4"
-	"github.com/bluenviron/mediacommon/v2/pkg/formats/mp4"
+	mcodecs "github.com/bluenviron/mediacommon/v2/pkg/formats/mp4/codecs"
 
-	"github.com/bluenviron/mediamtx/internal/codecprocessor"
 	"github.com/bluenviron/mediamtx/internal/defs"
 	"github.com/bluenviron/mediamtx/internal/logger"
 	"github.com/bluenviron/mediamtx/internal/unit"
 )
 
-var av1DefaultSequenceHeader = []byte{
-	8, 0, 0, 0, 66, 167, 191, 228, 96, 13, 0, 64,
-}
+var (
+	av1DefaultSequenceHeader = []byte{
+		8, 0, 0, 0, 66, 167, 191, 228, 96, 13, 0, 64,
+	}
+
+	h265DefaultVPS = []byte{
+		0x40, 0x01, 0x0c, 0x01, 0xff, 0xff, 0x02, 0x20,
+		0x00, 0x00, 0x03, 0x00, 0xb0, 0x00, 0x00, 0x03,
+		0x00, 0x00, 0x03, 0x00, 0x7b, 0x18, 0xb0, 0x24,
+	}
+
+	h265DefaultSPS = []byte{
+		0x42, 0x01, 0x01, 0x02, 0x20, 0x00, 0x00, 0x03,
+		0x00, 0xb0, 0x00, 0x00, 0x03, 0x00, 0x00, 0x03,
+		0x00, 0x7b, 0xa0, 0x07, 0x82, 0x00, 0x88, 0x7d,
+		0xb6, 0x71, 0x8b, 0x92, 0x44, 0x80, 0x53, 0x88,
+		0x88, 0x92, 0xcf, 0x24, 0xa6, 0x92, 0x72, 0xc9,
+		0x12, 0x49, 0x22, 0xdc, 0x91, 0xaa, 0x48, 0xfc,
+		0xa2, 0x23, 0xff, 0x00, 0x01, 0x00, 0x01, 0x6a,
+		0x02, 0x02, 0x02, 0x01,
+	}
+
+	h265DefaultPPS = []byte{
+		0x44, 0x01, 0xc0, 0x25, 0x2f, 0x05, 0x32, 0x40,
+	}
+
+	h264DefaultSPS = []byte{ // 1920x1080 baseline
+		0x67, 0x42, 0xc0, 0x28, 0xd9, 0x00, 0x78, 0x02,
+		0x27, 0xe5, 0x84, 0x00, 0x00, 0x03, 0x00, 0x04,
+		0x00, 0x00, 0x03, 0x00, 0xf0, 0x3c, 0x60, 0xc9, 0x20,
+	}
+
+	h264DefaultPPS = []byte{0x08, 0x06, 0x07, 0x08}
+
+	mpeg4VideoDefaultConfig = []byte{
+		0x00, 0x00, 0x01, 0xb0, 0x01, 0x00, 0x00, 0x01,
+		0xb5, 0x89, 0x13, 0x00, 0x00, 0x01, 0x00, 0x00,
+		0x00, 0x01, 0x20, 0x00, 0xc4, 0x8d, 0x88, 0x00,
+		0xf5, 0x3c, 0x04, 0x87, 0x14, 0x63, 0x00, 0x00,
+		0x01, 0xb2, 0x4c, 0x61, 0x76, 0x63, 0x35, 0x38,
+		0x2e, 0x31, 0x33, 0x34, 0x2e, 0x31, 0x30, 0x30,
+	}
+
+	mpeg1VideoDefaultConfig = []byte{
+		0x00, 0x00, 0x01, 0xb3, 0x78, 0x04, 0x38, 0x35,
+		0xff, 0xff, 0xe0, 0x18, 0x00, 0x00, 0x01, 0xb5,
+		0x14, 0x4a, 0x00, 0x01, 0x00, 0x00,
+	}
+)
 
 func mpeg1audioChannelCount(cm mpeg1audio.ChannelMode) int {
 	switch cm {
@@ -116,7 +161,7 @@ type formatFMP4 struct {
 func (f *formatFMP4) initialize() bool {
 	nextID := 1
 
-	addTrack := func(format rtspformat.Format, codec mp4.Codec) *formatFMP4Track {
+	addTrack := func(format rtspformat.Format, codec mcodecs.Codec) *formatFMP4Track {
 		track := &formatFMP4Track{
 			f:         f,
 			id:        nextID,
@@ -136,7 +181,7 @@ func (f *formatFMP4) initialize() bool {
 
 			switch forma := forma.(type) {
 			case *rtspformat.AV1:
-				codec := &mp4.CodecAV1{
+				codec := &mcodecs.AV1{
 					SequenceHeader: av1DefaultSequenceHeader,
 				}
 				track := addTrack(forma, codec)
@@ -191,7 +236,7 @@ func (f *formatFMP4) initialize() bool {
 					})
 
 			case *rtspformat.VP9:
-				codec := &mp4.CodecVP9{
+				codec := &mcodecs.VP9{
 					Width:             1280,
 					Height:            720,
 					Profile:           1,
@@ -276,12 +321,12 @@ func (f *formatFMP4) initialize() bool {
 			case *rtspformat.H265:
 				vps, sps, pps := forma.SafeParams()
 				if vps == nil || sps == nil || pps == nil {
-					vps = codecprocessor.H265DefaultVPS
-					sps = codecprocessor.H265DefaultSPS
-					pps = codecprocessor.H265DefaultPPS
+					vps = h265DefaultVPS
+					sps = h265DefaultSPS
+					pps = h265DefaultPPS
 				}
 
-				codec := &mp4.CodecH265{
+				codec := &mcodecs.H265{
 					VPS: vps,
 					SPS: sps,
 					PPS: pps,
@@ -361,11 +406,11 @@ func (f *formatFMP4) initialize() bool {
 			case *rtspformat.H264:
 				sps, pps := forma.SafeParams()
 				if sps == nil || pps == nil {
-					sps = codecprocessor.H264DefaultSPS
-					pps = codecprocessor.H264DefaultPPS
+					sps = h264DefaultSPS
+					pps = h264DefaultPPS
 				}
 
-				codec := &mp4.CodecH264{
+				codec := &mcodecs.H264{
 					SPS: sps,
 					PPS: pps,
 				}
@@ -438,10 +483,10 @@ func (f *formatFMP4) initialize() bool {
 				config := forma.SafeParams()
 
 				if config == nil {
-					config = codecprocessor.MPEG4VideoDefaultConfig
+					config = mpeg4VideoDefaultConfig
 				}
 
-				codec := &mp4.CodecMPEG4Video{
+				codec := &mcodecs.MPEG4Video{
 					Config: config,
 				}
 				track := addTrack(forma, codec)
@@ -495,8 +540,8 @@ func (f *formatFMP4) initialize() bool {
 					})
 
 			case *rtspformat.MPEG1Video:
-				codec := &mp4.CodecMPEG1Video{
-					Config: codecprocessor.MPEG1VideoDefaultConfig,
+				codec := &mcodecs.MPEG1Video{
+					Config: mpeg1VideoDefaultConfig,
 				}
 				track := addTrack(forma, codec)
 
@@ -546,7 +591,7 @@ func (f *formatFMP4) initialize() bool {
 					})
 
 			case *rtspformat.MJPEG:
-				codec := &mp4.CodecMJPEG{
+				codec := &mcodecs.MJPEG{
 					Width:  800,
 					Height: 600,
 				}
@@ -583,7 +628,7 @@ func (f *formatFMP4) initialize() bool {
 					})
 
 			case *rtspformat.Opus:
-				codec := &mp4.CodecOpus{
+				codec := &mcodecs.Opus{
 					ChannelCount: forma.ChannelCount,
 				}
 				track := addTrack(forma, codec)
@@ -617,7 +662,7 @@ func (f *formatFMP4) initialize() bool {
 					})
 
 			case *rtspformat.MPEG4Audio:
-				codec := &mp4.CodecMPEG4Audio{
+				codec := &mcodecs.MPEG4Audio{
 					Config: *forma.Config,
 				}
 				track := addTrack(forma, codec)
@@ -650,7 +695,7 @@ func (f *formatFMP4) initialize() bool {
 
 			case *rtspformat.MPEG4AudioLATM:
 				if !forma.CPresent {
-					codec := &mp4.CodecMPEG4Audio{
+					codec := &mcodecs.MPEG4Audio{
 						Config: *forma.StreamMuxConfig.Programs[0].Layers[0].AudioSpecificConfig,
 					}
 					track := addTrack(forma, codec)
@@ -681,7 +726,7 @@ func (f *formatFMP4) initialize() bool {
 				}
 
 			case *rtspformat.MPEG1Audio:
-				codec := &mp4.CodecMPEG1Audio{
+				codec := &mcodecs.MPEG1Audio{
 					SampleRate:   32000,
 					ChannelCount: 2,
 				}
@@ -732,7 +777,7 @@ func (f *formatFMP4) initialize() bool {
 					})
 
 			case *rtspformat.AC3:
-				codec := &mp4.CodecAC3{
+				codec := &mcodecs.AC3{
 					SampleRate:   forma.SampleRate,
 					ChannelCount: forma.ChannelCount,
 					Fscod:        0,
@@ -801,7 +846,7 @@ func (f *formatFMP4) initialize() bool {
 				// TODO
 
 			case *rtspformat.G711:
-				codec := &mp4.CodecLPCM{
+				codec := &mcodecs.LPCM{
 					LittleEndian: false,
 					BitDepth:     16,
 					SampleRate:   forma.SampleRate,
@@ -838,7 +883,7 @@ func (f *formatFMP4) initialize() bool {
 					})
 
 			case *rtspformat.LPCM:
-				codec := &mp4.CodecLPCM{
+				codec := &mcodecs.LPCM{
 					LittleEndian: false,
 					BitDepth:     forma.BitDepth,
 					SampleRate:   forma.SampleRate,
diff --git a/internal/recorder/format_fmp4_segment.go b/internal/recorder/format_fmp4_segment.go
index b255f305..807a117a 100644
--- a/internal/recorder/format_fmp4_segment.go
+++ b/internal/recorder/format_fmp4_segment.go
@@ -9,12 +9,11 @@ import (
 	"time"
 
 	amp4 "github.com/abema/go-mp4"
-	"github.com/google/uuid"
-
 	"github.com/bluenviron/mediacommon/v2/pkg/formats/fmp4"
 	"github.com/bluenviron/mediacommon/v2/pkg/formats/fmp4/seekablebuffer"
 	"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 3100a29f..9c3f867d 100644
--- a/internal/recorder/format_fmp4_track.go
+++ b/internal/recorder/format_fmp4_track.go
@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/bluenviron/mediacommon/v2/pkg/formats/fmp4"
-	"github.com/bluenviron/mediacommon/v2/pkg/formats/mp4"
+	mcodecs "github.com/bluenviron/mediacommon/v2/pkg/formats/mp4/codecs"
 	"github.com/bluenviron/mediamtx/internal/logger"
 )
 
@@ -47,7 +47,7 @@ type formatFMP4Track struct {
 	f         *formatFMP4
 	id        int
 	clockRate uint32
-	codec     mp4.Codec
+	codec     mcodecs.Codec
 
 	initTrack        *fmp4.InitTrack
 	nextSample       *formatFMP4Sample
diff --git a/internal/recorder/format_mpegts.go b/internal/recorder/format_mpegts.go
index 12521c4f..512e8b53 100644
--- a/internal/recorder/format_mpegts.go
+++ b/internal/recorder/format_mpegts.go
@@ -15,6 +15,7 @@ import (
 	"github.com/bluenviron/mediacommon/v2/pkg/codecs/mpeg4audio"
 	"github.com/bluenviron/mediacommon/v2/pkg/codecs/mpeg4video"
 	"github.com/bluenviron/mediacommon/v2/pkg/formats/mpegts"
+	tscodecs "github.com/bluenviron/mediacommon/v2/pkg/formats/mpegts/codecs"
 
 	"github.com/bluenviron/mediamtx/internal/defs"
 	"github.com/bluenviron/mediamtx/internal/logger"
@@ -66,7 +67,7 @@ type formatMPEGTS struct {
 func (f *formatMPEGTS) initialize() bool {
 	var tracks []*mpegts.Track
 
-	addTrack := func(codec mpegts.Codec) *formatMPEGTSTrack {
+	addTrack := func(codec tscodecs.Codec) *formatMPEGTSTrack {
 		track := &formatMPEGTSTrack{
 			f:     f,
 			codec: codec,
@@ -83,7 +84,7 @@ func (f *formatMPEGTS) initialize() bool {
 
 			switch forma := forma.(type) {
 			case *rtspformat.H265: //nolint:dupl
-				track := addTrack(&mpegts.CodecH265{})
+				track := addTrack(&tscodecs.H265{})
 
 				var dtsExtractor *h265.DTSExtractor
 
@@ -125,7 +126,7 @@ func (f *formatMPEGTS) initialize() bool {
 					})
 
 			case *rtspformat.H264: //nolint:dupl
-				track := addTrack(&mpegts.CodecH264{})
+				track := addTrack(&tscodecs.H264{})
 
 				var dtsExtractor *h264.DTSExtractor
 
@@ -167,7 +168,7 @@ func (f *formatMPEGTS) initialize() bool {
 					})
 
 			case *rtspformat.MPEG4Video:
-				track := addTrack(&mpegts.CodecMPEG4Video{})
+				track := addTrack(&tscodecs.MPEG4Video{})
 
 				firstReceived := false
 				var lastPTS int64
@@ -204,7 +205,7 @@ func (f *formatMPEGTS) initialize() bool {
 					})
 
 			case *rtspformat.MPEG1Video:
-				track := addTrack(&mpegts.CodecMPEG1Video{})
+				track := addTrack(&tscodecs.MPEG1Video{})
 
 				firstReceived := false
 				var lastPTS int64
@@ -240,7 +241,7 @@ func (f *formatMPEGTS) initialize() bool {
 					})
 
 			case *rtspformat.Opus:
-				track := addTrack(&mpegts.CodecOpus{
+				track := addTrack(&tscodecs.Opus{
 					ChannelCount: forma.ChannelCount,
 				})
 
@@ -266,7 +267,7 @@ func (f *formatMPEGTS) initialize() bool {
 					})
 
 			case *rtspformat.KLV:
-				track := addTrack(&mpegts.CodecKLV{
+				track := addTrack(&tscodecs.KLV{
 					Synchronous: true,
 				})
 
@@ -292,7 +293,7 @@ func (f *formatMPEGTS) initialize() bool {
 					})
 
 			case *rtspformat.MPEG4Audio:
-				track := addTrack(&mpegts.CodecMPEG4Audio{
+				track := addTrack(&tscodecs.MPEG4Audio{
 					Config: *forma.Config,
 				})
 
@@ -319,7 +320,7 @@ func (f *formatMPEGTS) initialize() bool {
 
 			case *rtspformat.MPEG4AudioLATM:
 				if !forma.CPresent {
-					track := addTrack(&mpegts.CodecMPEG4Audio{
+					track := addTrack(&tscodecs.MPEG4Audio{
 						Config: *forma.StreamMuxConfig.Programs[0].Layers[0].AudioSpecificConfig,
 					})
 
@@ -353,7 +354,7 @@ func (f *formatMPEGTS) initialize() bool {
 				}
 
 			case *rtspformat.MPEG1Audio:
-				track := addTrack(&mpegts.CodecMPEG1Audio{})
+				track := addTrack(&tscodecs.MPEG1Audio{})
 
 				f.ri.reader.OnData(
 					media,
@@ -377,7 +378,7 @@ func (f *formatMPEGTS) initialize() bool {
 					})
 
 			case *rtspformat.AC3:
-				track := addTrack(&mpegts.CodecAC3{})
+				track := addTrack(&tscodecs.AC3{})
 
 				f.ri.reader.OnData(
 					media,
diff --git a/internal/recorder/format_mpegts_track.go b/internal/recorder/format_mpegts_track.go
index 641ea3dc..0d5c9e1b 100644
--- a/internal/recorder/format_mpegts_track.go
+++ b/internal/recorder/format_mpegts_track.go
@@ -5,11 +5,12 @@ import (
 	"time"
 
 	"github.com/bluenviron/mediacommon/v2/pkg/formats/mpegts"
+	tscodecs "github.com/bluenviron/mediacommon/v2/pkg/formats/mpegts/codecs"
 )
 
 type formatMPEGTSTrack struct {
 	f     *formatMPEGTS
-	codec mpegts.Codec
+	codec tscodecs.Codec
 
 	track            *mpegts.Track
 	startInitialized bool
diff --git a/internal/recorder/recorder_test.go b/internal/recorder/recorder_test.go
index 2a278542..8ef2b1ae 100644
--- a/internal/recorder/recorder_test.go
+++ b/internal/recorder/recorder_test.go
@@ -12,7 +12,7 @@ import (
 	rtspformat "github.com/bluenviron/gortsplib/v5/pkg/format"
 	"github.com/bluenviron/mediacommon/v2/pkg/codecs/mpeg4audio"
 	"github.com/bluenviron/mediacommon/v2/pkg/formats/fmp4"
-	"github.com/bluenviron/mediacommon/v2/pkg/formats/mp4"
+	mcodecs "github.com/bluenviron/mediacommon/v2/pkg/formats/mp4/codecs"
 	"github.com/stretchr/testify/require"
 
 	"github.com/bluenviron/mediamtx/internal/conf"
@@ -130,11 +130,11 @@ func TestRecorder(t *testing.T) {
 	for _, ca := range []string{"fmp4", "mpegts"} {
 		t.Run(ca, func(t *testing.T) {
 			strm := &stream.Stream{
-				WriteQueueSize:     512,
-				RTPMaxPayloadSize:  1450,
-				Desc:               desc,
-				GenerateRTPPackets: true,
-				Parent:             test.NilLogger,
+				Desc:              desc,
+				UseRTPPackets:     false,
+				WriteQueueSize:    512,
+				RTPMaxPayloadSize: 1450,
+				Parent:            test.NilLogger,
 			}
 			err := strm.Initialize()
 			require.NoError(t, err)
@@ -242,7 +242,7 @@ func TestRecorder(t *testing.T) {
 						{
 							ID:        1,
 							TimeScale: 90000,
-							Codec: &mp4.CodecH264{
+							Codec: &mcodecs.H264{
 								SPS: test.FormatH264.SPS,
 								PPS: test.FormatH264.PPS,
 							},
@@ -250,7 +250,7 @@ func TestRecorder(t *testing.T) {
 						{
 							ID:        2,
 							TimeScale: 90000,
-							Codec: &mp4.CodecH265{
+							Codec: &mcodecs.H265{
 								VPS: []byte{
 									0x40, 0x01, 0x0c, 0x01, 0xff, 0xff, 0x01, 0x60,
 									0x00, 0x00, 0x03, 0x00, 0x90, 0x00, 0x00, 0x03,
@@ -272,7 +272,7 @@ func TestRecorder(t *testing.T) {
 						{
 							ID:        3,
 							TimeScale: 44100,
-							Codec: &mp4.CodecMPEG4Audio{
+							Codec: &mcodecs.MPEG4Audio{
 								Config: mpeg4audio.AudioSpecificConfig{
 									Type:         2,
 									SampleRate:   44100,
@@ -283,7 +283,7 @@ func TestRecorder(t *testing.T) {
 						{
 							ID:        4,
 							TimeScale: 8000,
-							Codec: &mp4.CodecLPCM{
+							Codec: &mcodecs.LPCM{
 								BitDepth:     16,
 								SampleRate:   8000,
 								ChannelCount: 1,
@@ -292,7 +292,7 @@ func TestRecorder(t *testing.T) {
 						{
 							ID:        5,
 							TimeScale: 44100,
-							Codec: &mp4.CodecLPCM{
+							Codec: &mcodecs.LPCM{
 								BitDepth:     16,
 								SampleRate:   44100,
 								ChannelCount: 2,
@@ -418,11 +418,11 @@ func TestRecorderFMP4NegativeInitialDTS(t *testing.T) {
 	}}
 
 	strm := &stream.Stream{
-		WriteQueueSize:     512,
-		RTPMaxPayloadSize:  1450,
-		Desc:               desc,
-		GenerateRTPPackets: true,
-		Parent:             test.NilLogger,
+		Desc:              desc,
+		UseRTPPackets:     false,
+		WriteQueueSize:    512,
+		RTPMaxPayloadSize: 1450,
+		Parent:            test.NilLogger,
 	}
 	err := strm.Initialize()
 	require.NoError(t, err)
@@ -507,11 +507,11 @@ func TestRecorderFMP4NegativeDTSDiff(t *testing.T) {
 	}}
 
 	strm := &stream.Stream{
-		WriteQueueSize:     512,
-		RTPMaxPayloadSize:  1450,
-		Desc:               desc,
-		GenerateRTPPackets: true,
-		Parent:             test.NilLogger,
+		Desc:              desc,
+		UseRTPPackets:     false,
+		WriteQueueSize:    512,
+		RTPMaxPayloadSize: 1450,
+		Parent:            test.NilLogger,
 	}
 	err := strm.Initialize()
 	require.NoError(t, err)
@@ -601,11 +601,11 @@ func TestRecorderSkipTracksPartial(t *testing.T) {
 			}}
 
 			strm := &stream.Stream{
-				WriteQueueSize:     512,
-				RTPMaxPayloadSize:  1450,
-				Desc:               desc,
-				GenerateRTPPackets: true,
-				Parent:             test.NilLogger,
+				Desc:              desc,
+				UseRTPPackets:     false,
+				WriteQueueSize:    512,
+				RTPMaxPayloadSize: 1450,
+				Parent:            test.NilLogger,
 			}
 			err := strm.Initialize()
 			require.NoError(t, err)
@@ -663,11 +663,11 @@ func TestRecorderSkipTracksFull(t *testing.T) {
 			}}
 
 			strm := &stream.Stream{
-				WriteQueueSize:     512,
-				RTPMaxPayloadSize:  1450,
-				Desc:               desc,
-				GenerateRTPPackets: true,
-				Parent:             test.NilLogger,
+				Desc:              desc,
+				UseRTPPackets:     false,
+				WriteQueueSize:    512,
+				RTPMaxPayloadSize: 1450,
+				Parent:            test.NilLogger,
 			}
 			err := strm.Initialize()
 			require.NoError(t, err)
@@ -727,11 +727,11 @@ func TestRecorderFMP4SegmentSwitch(t *testing.T) {
 	}}
 
 	strm := &stream.Stream{
-		WriteQueueSize:     512,
-		RTPMaxPayloadSize:  1450,
-		Desc:               desc,
-		GenerateRTPPackets: true,
-		Parent:             test.NilLogger,
+		Desc:              desc,
+		UseRTPPackets:     false,
+		WriteQueueSize:    512,
+		RTPMaxPayloadSize: 1450,
+		Parent:            test.NilLogger,
 	}
 	err := strm.Initialize()
 	require.NoError(t, err)
@@ -850,11 +850,11 @@ func TestRecorderTimeDriftDetector(t *testing.T) {
 			}}
 
 			strm := &stream.Stream{
-				WriteQueueSize:     512,
-				RTPMaxPayloadSize:  1450,
-				Desc:               desc,
-				GenerateRTPPackets: true,
-				Parent:             test.NilLogger,
+				Desc:              desc,
+				UseRTPPackets:     false,
+				WriteQueueSize:    512,
+				RTPMaxPayloadSize: 1450,
+				Parent:            test.NilLogger,
 			}
 			err := strm.Initialize()
 			require.NoError(t, err)
diff --git a/internal/servers/hls/server_test.go b/internal/servers/hls/server_test.go
index d257df73..f824c7b3 100644
--- a/internal/servers/hls/server_test.go
+++ b/internal/servers/hls/server_test.go
@@ -185,11 +185,12 @@ func TestServerRead(t *testing.T) {
 			}}
 
 			strm := &stream.Stream{
-				WriteQueueSize:     512,
-				RTPMaxPayloadSize:  1450,
-				Desc:               desc,
-				GenerateRTPPackets: true,
-				Parent:             test.NilLogger,
+				Desc:              desc,
+				UseRTPPackets:     false,
+				WriteQueueSize:    512,
+				RTPMaxPayloadSize: 1450,
+				ReplaceNTP:        false,
+				Parent:            test.NilLogger,
 			}
 			err := strm.Initialize()
 			require.NoError(t, err)
@@ -234,7 +235,8 @@ func TestServerRead(t *testing.T) {
 				defer s.Close()
 
 				c := &gohlslib.Client{
-					URI: "http://myuser:mypass@127.0.0.1:8888/teststream/index.m3u8?param=value",
+					URI:           "http://myuser:mypass@127.0.0.1:8888/teststream/index.m3u8?param=value",
+					StartDistance: 1,
 				}
 
 				recv1 := make(chan struct{})
@@ -282,9 +284,9 @@ func TestServerRead(t *testing.T) {
 				require.NoError(t, err)
 				defer c.Close()
 
-				time.Sleep(100 * time.Millisecond)
+				strm.WaitForReaders()
 
-				for i := range 4 {
+				for i := range 2 {
 					strm.WriteUnit(test.MediaH264, test.FormatH264, &unit.Unit{
 						NTP: time.Time{},
 						PTS: int64(i) * 90000,
@@ -323,9 +325,9 @@ func TestServerRead(t *testing.T) {
 
 				s.PathReady(&dummyPath{})
 
-				time.Sleep(500 * time.Millisecond)
+				strm.WaitForReaders()
 
-				for i := range 4 {
+				for i := range 2 {
 					strm.WriteUnit(test.MediaH264, test.FormatH264, &unit.Unit{
 						NTP: time.Time{},
 						PTS: int64(i) * 90000,
@@ -340,10 +342,9 @@ func TestServerRead(t *testing.T) {
 					})
 				}
 
-				time.Sleep(100 * time.Millisecond)
-
 				c := &gohlslib.Client{
-					URI: "http://myuser:mypass@127.0.0.1:8888/teststream/index.m3u8?param=value",
+					URI:           "http://myuser:mypass@127.0.0.1:8888/teststream/index.m3u8?param=value",
+					StartDistance: 1,
 				}
 
 				recv1 := make(chan struct{})
@@ -406,11 +407,11 @@ func TestServerDirectory(t *testing.T) {
 	desc := &description.Session{Medias: []*description.Media{test.MediaH264}}
 
 	strm := &stream.Stream{
-		WriteQueueSize:     512,
-		RTPMaxPayloadSize:  1450,
-		Desc:               desc,
-		GenerateRTPPackets: true,
-		Parent:             test.NilLogger,
+		Desc:              desc,
+		UseRTPPackets:     false,
+		WriteQueueSize:    512,
+		RTPMaxPayloadSize: 1450,
+		Parent:            test.NilLogger,
 	}
 	err = strm.Initialize()
 	require.NoError(t, err)
@@ -455,11 +456,11 @@ func TestServerDynamicAlwaysRemux(t *testing.T) {
 	desc := &description.Session{Medias: []*description.Media{test.MediaH264}}
 
 	strm := &stream.Stream{
-		WriteQueueSize:     512,
-		RTPMaxPayloadSize:  1450,
-		Desc:               desc,
-		GenerateRTPPackets: true,
-		Parent:             test.NilLogger,
+		Desc:              desc,
+		UseRTPPackets:     false,
+		WriteQueueSize:    512,
+		RTPMaxPayloadSize: 1450,
+		Parent:            test.NilLogger,
 	}
 	err := strm.Initialize()
 	require.NoError(t, err)
diff --git a/internal/servers/rtmp/conn.go b/internal/servers/rtmp/conn.go
index 14b738dd..ddcc4997 100644
--- a/internal/servers/rtmp/conn.go
+++ b/internal/servers/rtmp/conn.go
@@ -229,19 +229,19 @@ func (c *conn) runPublish() error {
 		return err
 	}
 
-	var stream *stream.Stream
+	var strm *stream.Stream
 
-	medias, err := rtmp.ToStream(r, &stream)
+	medias, err := rtmp.ToStream(r, &strm)
 	if err != nil {
 		return err
 	}
 
 	var path defs.Path
-	path, stream, err = c.pathManager.AddPublisher(defs.PathAddPublisherReq{
-		Author:             c,
-		Desc:               &description.Session{Medias: medias},
-		GenerateRTPPackets: true,
-		FillNTP:            true,
+	path, strm, err = c.pathManager.AddPublisher(defs.PathAddPublisherReq{
+		Author:        c,
+		Desc:          &description.Session{Medias: medias},
+		UseRTPPackets: false,
+		ReplaceNTP:    true,
 		AccessRequest: defs.PathAccessRequest{
 			Name:    pathName,
 			Query:   c.rconn.URL.RawQuery,
diff --git a/internal/servers/rtmp/server_test.go b/internal/servers/rtmp/server_test.go
index 7cf5a4e1..defa53c5 100644
--- a/internal/servers/rtmp/server_test.go
+++ b/internal/servers/rtmp/server_test.go
@@ -9,8 +9,8 @@ import (
 	"time"
 
 	"github.com/bluenviron/gortmplib"
+	"github.com/bluenviron/gortmplib/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/defs"
 	"github.com/bluenviron/mediamtx/internal/externalcmd"
@@ -61,7 +61,12 @@ func TestServerPublish(t *testing.T) {
 			}
 
 			var strm *stream.Stream
-			streamCreated := make(chan struct{})
+			var reader *stream.Reader
+			defer func() {
+				strm.RemoveReader(reader)
+			}()
+			dataReceived := make(chan struct{})
+			n := 0
 
 			pathManager := &test.PathManager{
 				AddPublisherImpl: func(req defs.PathAddPublisherReq) (defs.Path, *stream.Stream, error) {
@@ -71,16 +76,41 @@ func TestServerPublish(t *testing.T) {
 					require.Equal(t, "mypass", req.AccessRequest.Credentials.Pass)
 
 					strm = &stream.Stream{
-						WriteQueueSize:     512,
-						RTPMaxPayloadSize:  1450,
-						Desc:               req.Desc,
-						GenerateRTPPackets: true,
-						Parent:             test.NilLogger,
+						Desc:              req.Desc,
+						UseRTPPackets:     false,
+						WriteQueueSize:    512,
+						RTPMaxPayloadSize: 1450,
+						Parent:            test.NilLogger,
 					}
 					err := strm.Initialize()
 					require.NoError(t, err)
 
-					close(streamCreated)
+					reader = &stream.Reader{Parent: test.NilLogger}
+
+					reader.OnData(
+						strm.Desc.Medias[0],
+						strm.Desc.Medias[0].Formats[0],
+						func(u *unit.Unit) error {
+							switch n {
+							case 0:
+								require.Equal(t, unit.PayloadH264(nil), u.Payload)
+
+							case 1:
+								require.Equal(t, unit.PayloadH264{
+									test.FormatH264.SPS,
+									test.FormatH264.PPS,
+									{5, 2, 3, 4},
+								}, u.Payload)
+								close(dataReceived)
+
+							default:
+								t.Errorf("should not happen")
+							}
+							n++
+							return nil
+						})
+
+					strm.AddReader(reader)
 
 					return &dummyPath{}, strm, nil
 				},
@@ -128,49 +158,28 @@ func TestServerPublish(t *testing.T) {
 			defer conn.Close()
 
 			w := &gortmplib.Writer{
-				Conn:   conn,
-				Tracks: []format.Format{test.FormatH264, test.FormatMPEG4Audio},
+				Conn: conn,
+				Tracks: []*gortmplib.Track{
+					{Codec: &codecs.H264{
+						SPS: test.FormatH264.SPS,
+						PPS: test.FormatH264.PPS,
+					}},
+					{Codec: &codecs.MPEG4Audio{
+						Config: test.FormatMPEG4Audio.Config,
+					}},
+				},
 			}
 			err = w.Initialize()
 			require.NoError(t, err)
 
 			err = w.WriteH264(
-				test.FormatH264,
+				w.Tracks[0],
 				2*time.Second, 2*time.Second, [][]byte{
 					{5, 2, 3, 4},
 				})
 			require.NoError(t, err)
 
-			<-streamCreated
-
-			recv := make(chan struct{})
-
-			r := &stream.Reader{Parent: test.NilLogger}
-
-			r.OnData(
-				strm.Desc.Medias[0],
-				strm.Desc.Medias[0].Formats[0],
-				func(u *unit.Unit) error {
-					require.Equal(t, unit.PayloadH264{
-						test.FormatH264.SPS,
-						test.FormatH264.PPS,
-						{5, 2, 3, 4},
-					}, u.Payload)
-					close(recv)
-					return nil
-				})
-
-			strm.AddReader(r)
-			defer strm.RemoveReader(r)
-
-			err = w.WriteH264(
-				test.FormatH264,
-				3*time.Second, 3*time.Second, [][]byte{
-					{5, 2, 3, 4},
-				})
-			require.NoError(t, err)
-
-			<-recv
+			<-dataReceived
 		})
 	}
 }
@@ -197,11 +206,11 @@ func TestServerRead(t *testing.T) {
 			desc := &description.Session{Medias: []*description.Media{test.MediaH264}}
 
 			strm := &stream.Stream{
-				WriteQueueSize:     512,
-				RTPMaxPayloadSize:  1450,
-				Desc:               desc,
-				GenerateRTPPackets: true,
-				Parent:             test.NilLogger,
+				Desc:              desc,
+				UseRTPPackets:     false,
+				WriteQueueSize:    512,
+				RTPMaxPayloadSize: 1450,
+				Parent:            test.NilLogger,
 			}
 			err := strm.Initialize()
 			require.NoError(t, err)
@@ -257,9 +266,9 @@ func TestServerRead(t *testing.T) {
 			require.NoError(t, err)
 			defer conn.Close()
 
-			go func() {
-				time.Sleep(500 * time.Millisecond)
+			strm.WaitForReaders()
 
+			go func() {
 				strm.WriteUnit(desc.Medias[0], desc.Medias[0].Formats[0], &unit.Unit{
 					NTP: time.Time{},
 					Payload: unit.PayloadH264{
@@ -291,9 +300,11 @@ func TestServerRead(t *testing.T) {
 			require.NoError(t, err)
 
 			tracks := r.Tracks()
-			require.Equal(t, []format.Format{test.FormatH264}, tracks)
+			require.Len(t, tracks, 1)
+			_, ok := tracks[0].Codec.(*codecs.H264)
+			require.True(t, ok)
 
-			r.OnDataH264(tracks[0].(*format.H264), func(_ time.Duration, _ time.Duration, au [][]byte) {
+			r.OnDataH264(tracks[0], func(_ time.Duration, _ time.Duration, au [][]byte) {
 				require.Equal(t, [][]byte{
 					test.FormatH264.SPS,
 					test.FormatH264.PPS,
diff --git a/internal/servers/rtsp/conn.go b/internal/servers/rtsp/conn.go
index 9966c6ea..b6b85b6e 100644
--- a/internal/servers/rtsp/conn.go
+++ b/internal/servers/rtsp/conn.go
@@ -193,16 +193,16 @@ func (c *conn) onDescribe(ctx *gortsplib.ServerHandlerOnDescribeCtx,
 		}, nil, nil
 	}
 
-	var stream *gortsplib.ServerStream
+	var strm *gortsplib.ServerStream
 	if !c.isTLS {
-		stream = res.Stream.RTSPStream(c.rserver)
+		strm = res.Stream.RTSPStream(c.rserver)
 	} else {
-		stream = res.Stream.RTSPSStream(c.rserver)
+		strm = res.Stream.RTSPSStream(c.rserver)
 	}
 
 	return &base.Response{
 		StatusCode: base.StatusOK,
-	}, stream, nil
+	}, strm, nil
 }
 
 func (c *conn) handleAuthError(err *auth.Error) (*base.Response, error) {
diff --git a/internal/servers/rtsp/server_test.go b/internal/servers/rtsp/server_test.go
index ef0e4743..17d863e1 100644
--- a/internal/servers/rtsp/server_test.go
+++ b/internal/servers/rtsp/server_test.go
@@ -47,7 +47,12 @@ func TestServerPublish(t *testing.T) {
 	for _, ca := range []string{"basic", "digest", "basic+digest"} {
 		t.Run(ca, func(t *testing.T) {
 			var strm *stream.Stream
-			streamCreated := make(chan struct{})
+			var reader *stream.Reader
+			defer func() {
+				strm.RemoveReader(reader)
+			}()
+			dataReceived := make(chan struct{})
+
 			n := 0
 
 			pathManager := &test.PathManager{
@@ -82,16 +87,31 @@ func TestServerPublish(t *testing.T) {
 					require.True(t, req.AccessRequest.SkipAuth)
 
 					strm = &stream.Stream{
-						WriteQueueSize:     512,
-						RTPMaxPayloadSize:  1450,
-						Desc:               req.Desc,
-						GenerateRTPPackets: true,
-						Parent:             test.NilLogger,
+						Desc:              req.Desc,
+						UseRTPPackets:     true,
+						WriteQueueSize:    512,
+						RTPMaxPayloadSize: 1450,
+						Parent:            test.NilLogger,
 					}
 					err := strm.Initialize()
 					require.NoError(t, err)
 
-					close(streamCreated)
+					reader = &stream.Reader{Parent: test.NilLogger}
+
+					reader.OnData(
+						strm.Desc.Medias[0],
+						strm.Desc.Medias[0].Formats[0],
+						func(u *unit.Unit) error {
+							require.Equal(t, unit.PayloadH264{
+								test.FormatH264.SPS,
+								test.FormatH264.PPS,
+								{5, 2, 3, 4},
+							}, u.Payload)
+							close(dataReceived)
+							return nil
+						})
+
+					strm.AddReader(reader)
 
 					return &dummyPath{}, strm, nil
 				},
@@ -131,28 +151,6 @@ func TestServerPublish(t *testing.T) {
 			require.NoError(t, err)
 			defer source.Close()
 
-			<-streamCreated
-
-			r := &stream.Reader{Parent: test.NilLogger}
-
-			recv := make(chan struct{})
-
-			r.OnData(
-				strm.Desc.Medias[0],
-				strm.Desc.Medias[0].Formats[0],
-				func(u *unit.Unit) error {
-					require.Equal(t, unit.PayloadH264{
-						test.FormatH264.SPS,
-						test.FormatH264.PPS,
-						{5, 2, 3, 4},
-					}, u.Payload)
-					close(recv)
-					return nil
-				})
-
-			strm.AddReader(r)
-			defer strm.RemoveReader(r)
-
 			err = source.WritePacketRTP(media0, &rtp.Packet{
 				Header: rtp.Header{
 					Version:        2,
@@ -166,7 +164,7 @@ func TestServerPublish(t *testing.T) {
 			})
 			require.NoError(t, err)
 
-			<-recv
+			<-dataReceived
 		})
 	}
 }
@@ -177,11 +175,11 @@ func TestServerRead(t *testing.T) {
 			desc := &description.Session{Medias: []*description.Media{test.MediaH264}}
 
 			strm := &stream.Stream{
-				WriteQueueSize:     512,
-				RTPMaxPayloadSize:  1450,
-				Desc:               desc,
-				GenerateRTPPackets: true,
-				Parent:             test.NilLogger,
+				Desc:              desc,
+				UseRTPPackets:     false,
+				WriteQueueSize:    512,
+				RTPMaxPayloadSize: 1450,
+				Parent:            test.NilLogger,
 			}
 			err := strm.Initialize()
 			require.NoError(t, err)
@@ -321,11 +319,11 @@ func TestServerRedirect(t *testing.T) {
 			desc := &description.Session{Medias: []*description.Media{test.MediaH264}}
 
 			strm := &stream.Stream{
-				WriteQueueSize:     512,
-				RTPMaxPayloadSize:  1450,
-				Desc:               desc,
-				GenerateRTPPackets: true,
-				Parent:             test.NilLogger,
+				Desc:              desc,
+				UseRTPPackets:     true,
+				WriteQueueSize:    512,
+				RTPMaxPayloadSize: 1450,
+				Parent:            test.NilLogger,
 			}
 			err := strm.Initialize()
 			require.NoError(t, err)
diff --git a/internal/servers/rtsp/session.go b/internal/servers/rtsp/session.go
index fd9e1f03..78e97c76 100644
--- a/internal/servers/rtsp/session.go
+++ b/internal/servers/rtsp/session.go
@@ -18,6 +18,7 @@ import (
 	"github.com/bluenviron/mediamtx/internal/conf"
 	"github.com/bluenviron/mediamtx/internal/counterdumper"
 	"github.com/bluenviron/mediamtx/internal/defs"
+	"github.com/bluenviron/mediamtx/internal/errordumper"
 	"github.com/bluenviron/mediamtx/internal/externalcmd"
 	"github.com/bluenviron/mediamtx/internal/hooks"
 	"github.com/bluenviron/mediamtx/internal/logger"
@@ -51,16 +52,16 @@ type session struct {
 	path            defs.Path
 	stream          *stream.Stream
 	onUnreadHook    func()
-	packetsLost     *counterdumper.CounterDumper
-	decodeErrors    *counterdumper.CounterDumper
-	discardedFrames *counterdumper.CounterDumper
+	packetsLost     *counterdumper.Dumper
+	decodeErrors    *errordumper.Dumper
+	discardedFrames *counterdumper.Dumper
 }
 
 func (s *session) initialize() {
 	s.uuid = uuid.New()
 	s.created = time.Now()
 
-	s.packetsLost = &counterdumper.CounterDumper{
+	s.packetsLost = &counterdumper.Dumper{
 		OnReport: func(val uint64) {
 			s.Log(logger.Warn, "%d RTP %s lost",
 				val,
@@ -74,21 +75,18 @@ func (s *session) initialize() {
 	}
 	s.packetsLost.Start()
 
-	s.decodeErrors = &counterdumper.CounterDumper{
-		OnReport: func(val uint64) {
-			s.Log(logger.Warn, "%d decode %s",
-				val,
-				func() string {
-					if val == 1 {
-						return "error"
-					}
-					return "errors"
-				}())
+	s.decodeErrors = &errordumper.Dumper{
+		OnReport: func(val uint64, last error) {
+			if val == 1 {
+				s.Log(logger.Warn, "decode error: %v", last)
+			} else {
+				s.Log(logger.Warn, "%d decode errors, last was: %v", val, last)
+			}
 		},
 	}
 	s.decodeErrors.Start()
 
-	s.discardedFrames = &counterdumper.CounterDumper{
+	s.discardedFrames = &counterdumper.Dumper{
 		OnReport: func(val uint64) {
 			s.Log(logger.Warn, "reader is too slow, discarding %d %s",
 				val,
@@ -313,11 +311,11 @@ func (s *session) onPlay(_ *gortsplib.ServerHandlerOnPlayCtx) (*base.Response, e
 // onRecord is called by rtspServer.
 func (s *session) onRecord(_ *gortsplib.ServerHandlerOnRecordCtx) (*base.Response, error) {
 	path, stream, err := s.pathManager.AddPublisher(defs.PathAddPublisherReq{
-		Author:             s,
-		Desc:               s.rsession.AnnouncedDescription(),
-		GenerateRTPPackets: false,
-		FillNTP:            !s.pathConf.UseAbsoluteTimestamp,
-		ConfToCompare:      s.pathConf,
+		Author:        s,
+		Desc:          s.rsession.AnnouncedDescription(),
+		UseRTPPackets: true,
+		ReplaceNTP:    !s.pathConf.UseAbsoluteTimestamp,
+		ConfToCompare: s.pathConf,
 		AccessRequest: defs.PathAccessRequest{
 			Name:     s.rsession.Path()[1:],
 			Query:    s.rsession.Query(),
@@ -331,16 +329,16 @@ func (s *session) onRecord(_ *gortsplib.ServerHandlerOnRecordCtx) (*base.Respons
 		}, err
 	}
 
-	s.path = path
-	s.stream = stream
-
 	rtsp.ToStream(
 		s.rsession,
 		s.rsession.AnnouncedDescription().Medias,
-		s.path.SafeConf(),
-		stream,
+		path.SafeConf(),
+		&s.stream,
 		s)
 
+	s.path = path
+	s.stream = stream
+
 	return &base.Response{
 		StatusCode: base.StatusOK,
 	}, nil
@@ -385,8 +383,8 @@ func (s *session) onPacketsLost(ctx *gortsplib.ServerHandlerOnPacketsLostCtx) {
 }
 
 // onDecodeError is called by rtspServer.
-func (s *session) onDecodeError(_ *gortsplib.ServerHandlerOnDecodeErrorCtx) {
-	s.decodeErrors.Increase()
+func (s *session) onDecodeError(ctx *gortsplib.ServerHandlerOnDecodeErrorCtx) {
+	s.decodeErrors.Add(ctx.Error)
 }
 
 // onStreamWriteError is called by rtspServer.
diff --git a/internal/servers/srt/conn.go b/internal/servers/srt/conn.go
index a15cd317..bf56b2b7 100644
--- a/internal/servers/srt/conn.go
+++ b/internal/servers/srt/conn.go
@@ -15,8 +15,8 @@ import (
 
 	"github.com/bluenviron/mediamtx/internal/auth"
 	"github.com/bluenviron/mediamtx/internal/conf"
-	"github.com/bluenviron/mediamtx/internal/counterdumper"
 	"github.com/bluenviron/mediamtx/internal/defs"
+	"github.com/bluenviron/mediamtx/internal/errordumper"
 	"github.com/bluenviron/mediamtx/internal/externalcmd"
 	"github.com/bluenviron/mediamtx/internal/hooks"
 	"github.com/bluenviron/mediamtx/internal/logger"
@@ -193,40 +193,37 @@ func (c *conn) runPublishReader(sconn srt.Conn, streamID *streamID, pathConf *co
 		return err
 	}
 
-	decodeErrors := &counterdumper.CounterDumper{
-		OnReport: func(val uint64) {
-			c.Log(logger.Warn, "%d decode %s",
-				val,
-				func() string {
-					if val == 1 {
-						return "error"
-					}
-					return "errors"
-				}())
+	decodeErrors := &errordumper.Dumper{
+		OnReport: func(val uint64, last error) {
+			if val == 1 {
+				c.Log(logger.Warn, "decode error: %v", last)
+			} else {
+				c.Log(logger.Warn, "%d decode errors, last was: %v", val, last)
+			}
 		},
 	}
 
 	decodeErrors.Start()
 	defer decodeErrors.Stop()
 
-	r.OnDecodeError(func(_ error) {
-		decodeErrors.Increase()
+	r.OnDecodeError(func(err error) {
+		decodeErrors.Add(err)
 	})
 
-	var stream *stream.Stream
+	var strm *stream.Stream
 
-	medias, err := mpegts.ToStream(r, &stream, c)
+	medias, err := mpegts.ToStream(r, &strm, c)
 	if err != nil {
 		return err
 	}
 
 	var path defs.Path
-	path, stream, err = c.pathManager.AddPublisher(defs.PathAddPublisherReq{
-		Author:             c,
-		Desc:               &description.Session{Medias: medias},
-		GenerateRTPPackets: true,
-		FillNTP:            true,
-		ConfToCompare:      pathConf,
+	path, strm, err = c.pathManager.AddPublisher(defs.PathAddPublisherReq{
+		Author:        c,
+		Desc:          &description.Session{Medias: medias},
+		UseRTPPackets: false,
+		ReplaceNTP:    true,
+		ConfToCompare: pathConf,
 		AccessRequest: defs.PathAccessRequest{
 			Name:     streamID.path,
 			Query:    streamID.query,
diff --git a/internal/servers/srt/server_test.go b/internal/servers/srt/server_test.go
index 79c083eb..e3d6b2b1 100644
--- a/internal/servers/srt/server_test.go
+++ b/internal/servers/srt/server_test.go
@@ -7,6 +7,7 @@ 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"
 	"github.com/bluenviron/mediamtx/internal/conf"
 	"github.com/bluenviron/mediamtx/internal/defs"
 	"github.com/bluenviron/mediamtx/internal/externalcmd"
@@ -43,7 +44,13 @@ func TestServerPublish(t *testing.T) {
 	defer externalCmdPool.Close()
 
 	var strm *stream.Stream
-	streamCreated := make(chan struct{})
+	var reader *stream.Reader
+	defer func() {
+		strm.RemoveReader(reader)
+	}()
+	dataReceived := make(chan struct{})
+	dataReceived2 := make(chan struct{})
+	n := 0
 
 	pathManager := &test.PathManager{
 		FindPathConfImpl: func(req defs.PathFindPathConfReq) (*conf.Path, error) {
@@ -59,16 +66,46 @@ func TestServerPublish(t *testing.T) {
 			require.True(t, req.AccessRequest.SkipAuth)
 
 			strm = &stream.Stream{
-				WriteQueueSize:     512,
-				RTPMaxPayloadSize:  1450,
-				Desc:               req.Desc,
-				GenerateRTPPackets: true,
-				Parent:             test.NilLogger,
+				Desc:              req.Desc,
+				UseRTPPackets:     false,
+				WriteQueueSize:    512,
+				RTPMaxPayloadSize: 1450,
+				Parent:            test.NilLogger,
 			}
 			err := strm.Initialize()
 			require.NoError(t, err)
 
-			close(streamCreated)
+			reader = &stream.Reader{Parent: test.NilLogger}
+
+			reader.OnData(
+				strm.Desc.Medias[0],
+				strm.Desc.Medias[0].Formats[0],
+				func(u *unit.Unit) error {
+					switch n {
+					case 0:
+						require.Equal(t, unit.PayloadH264{
+							test.FormatH264.SPS,
+							test.FormatH264.PPS,
+							{5, 1},
+						}, u.Payload)
+						close(dataReceived)
+
+					case 1:
+						require.Equal(t, unit.PayloadH264{
+							test.FormatH264.SPS,
+							test.FormatH264.PPS,
+							{5, 2},
+						}, u.Payload)
+						close(dataReceived2)
+
+					default:
+						t.Errorf("should not happen")
+					}
+					n++
+					return nil
+				})
+
+			strm.AddReader(reader)
 
 			return &dummyPath{}, strm, nil
 		},
@@ -102,10 +139,9 @@ func TestServerPublish(t *testing.T) {
 
 	publisher, err := srt.Dial("srt", address, srtConf)
 	require.NoError(t, err)
-	defer publisher.Close()
 
 	track := &mpegts.Track{
-		Codec: &mpegts.CodecH264{},
+		Codec: &tscodecs.H264{},
 	}
 
 	bw := bufio.NewWriter(publisher)
@@ -113,47 +149,28 @@ func TestServerPublish(t *testing.T) {
 	err = w.Initialize()
 	require.NoError(t, err)
 
+	// the MPEG-TS muxer needs two PES packets in order to write the first one
+
 	err = w.WriteH264(track, 0, 0, [][]byte{
 		test.FormatH264.SPS,
 		test.FormatH264.PPS,
-		{0x05, 1}, // IDR
+		{5, 1}, // IDR
 	})
 	require.NoError(t, err)
 
-	err = bw.Flush()
-	require.NoError(t, err)
-
-	<-streamCreated
-
-	r := &stream.Reader{Parent: test.NilLogger}
-
-	recv := make(chan struct{})
-
-	r.OnData(
-		strm.Desc.Medias[0],
-		strm.Desc.Medias[0].Formats[0],
-		func(u *unit.Unit) error {
-			require.Equal(t, unit.PayloadH264{
-				test.FormatH264.SPS,
-				test.FormatH264.PPS,
-				{0x05, 1}, // IDR
-			}, u.Payload)
-			close(recv)
-			return nil
-		})
-
-	strm.AddReader(r)
-	defer strm.RemoveReader(r)
-
 	err = w.WriteH264(track, 0, 0, [][]byte{
-		{5, 2},
+		{5, 2}, // IDR
 	})
 	require.NoError(t, err)
 
 	err = bw.Flush()
 	require.NoError(t, err)
 
-	<-recv
+	<-dataReceived
+
+	// the second PES is written after writer is closed
+	publisher.Close()
+	<-dataReceived2
 }
 
 func TestServerRead(t *testing.T) {
@@ -164,11 +181,11 @@ func TestServerRead(t *testing.T) {
 	desc := &description.Session{Medias: []*description.Media{test.MediaH264}}
 
 	strm := &stream.Stream{
-		WriteQueueSize:     512,
-		RTPMaxPayloadSize:  1450,
-		Desc:               desc,
-		GenerateRTPPackets: true,
-		Parent:             test.NilLogger,
+		Desc:              desc,
+		UseRTPPackets:     false,
+		WriteQueueSize:    512,
+		RTPMaxPayloadSize: 1450,
+		Parent:            test.NilLogger,
 	}
 	err := strm.Initialize()
 	require.NoError(t, err)
@@ -213,7 +230,7 @@ func TestServerRead(t *testing.T) {
 	require.NoError(t, err)
 	defer reader.Close()
 
-	time.Sleep(500 * time.Millisecond)
+	strm.WaitForReaders()
 
 	strm.WriteUnit(desc.Medias[0], desc.Medias[0].Formats[0], &unit.Unit{
 		NTP: time.Time{},
@@ -228,7 +245,7 @@ func TestServerRead(t *testing.T) {
 
 	require.Equal(t, []*mpegts.Track{{
 		PID:   256,
-		Codec: &mpegts.CodecH264{},
+		Codec: &tscodecs.H264{},
 	}}, r.Tracks())
 
 	received := false
diff --git a/internal/servers/webrtc/read_index.html b/internal/servers/webrtc/read_index.html
index 9399c096..d2924eb9 100644
--- a/internal/servers/webrtc/read_index.html
+++ b/internal/servers/webrtc/read_index.html
@@ -94,6 +94,12 @@ window.addEventListener('load', () => {
       setMessage('');
       video.srcObject = evt.streams[0];
     },
+    onDataChannel: (evt) => {
+      evt.channel.binaryType = 'arraybuffer';
+      evt.channel.onmessage = (evt) => {
+        console.log('data channel message', evt.data);
+      };
+    },
   });
 });
 
diff --git a/internal/servers/webrtc/reader.js b/internal/servers/webrtc/reader.js
index 3048bb1f..d6b4348b 100644
--- a/internal/servers/webrtc/reader.js
+++ b/internal/servers/webrtc/reader.js
@@ -10,6 +10,11 @@
  * @param {RTCTrackEvent} evt - track event.
  */
 
+/**
+ * @callback OnDataChannel
+ * @param {RTCDataChannelEvent} evt - data channel event.
+ */
+
 /**
  * @typedef Conf
  * @type {object}
@@ -19,6 +24,7 @@
  * @property {string} token - token.
  * @property {OnError} onError - called when there's an error.
  * @property {OnTrack} onTrack - called when there's a track available.
+ * @property {OnDataChannel} onDataChannel - called when there's a data channel available.
  */
 
 /** WebRTC/WHEP reader. */
@@ -442,9 +448,13 @@ class MediaMTXWebRTCReader {
     this.pc.addTransceiver('video', { direction });
     this.pc.addTransceiver('audio', { direction });
 
+    // using data channels requires creating a data channel locally
+    this.pc.createDataChannel('');
+
     this.pc.onicecandidate = (evt) => this.#onLocalCandidate(evt);
     this.pc.onconnectionstatechange = () => this.#onConnectionState();
     this.pc.ontrack = (evt) => this.#onTrack(evt);
+    this.pc.ondatachannel = (evt) => this.#onDataChannel(evt);
 
     return this.pc.createOffer()
       .then((offer) => {
@@ -567,6 +577,12 @@ class MediaMTXWebRTCReader {
       this.conf.onTrack(evt);
     }
   }
+
+  #onDataChannel(evt) {
+    if (this.conf.onDataChannel !== undefined) {
+      this.conf.onDataChannel(evt);
+    }
+  }
 }
 
 window.MediaMTXWebRTCReader = MediaMTXWebRTCReader;
diff --git a/internal/servers/webrtc/server_test.go b/internal/servers/webrtc/server_test.go
index 0f12949c..2759b01c 100644
--- a/internal/servers/webrtc/server_test.go
+++ b/internal/servers/webrtc/server_test.go
@@ -197,7 +197,11 @@ func TestServerOptionsICEServer(t *testing.T) {
 
 func TestServerPublish(t *testing.T) {
 	var strm *stream.Stream
-	streamCreated := make(chan struct{})
+	var reader *stream.Reader
+	defer func() {
+		strm.RemoveReader(reader)
+	}()
+	dataReceived := make(chan struct{})
 
 	pathManager := &test.PathManager{
 		FindPathConfImpl: func(req defs.PathFindPathConfReq) (*conf.Path, error) {
@@ -213,16 +217,34 @@ func TestServerPublish(t *testing.T) {
 			require.True(t, req.AccessRequest.SkipAuth)
 
 			strm = &stream.Stream{
-				WriteQueueSize:     512,
-				RTPMaxPayloadSize:  1450,
-				Desc:               req.Desc,
-				GenerateRTPPackets: true,
-				Parent:             test.NilLogger,
+				Desc:              req.Desc,
+				UseRTPPackets:     true,
+				WriteQueueSize:    512,
+				RTPMaxPayloadSize: 1450,
+				Parent:            test.NilLogger,
 			}
 			err := strm.Initialize()
 			require.NoError(t, err)
 
-			close(streamCreated)
+			reader = &stream.Reader{Parent: test.NilLogger}
+
+			reader.OnData(
+				strm.Desc.Medias[0],
+				strm.Desc.Medias[0].Formats[0],
+				func(u *unit.Unit) error {
+					/* select {
+					case <-recv:
+						return nil
+					default:
+					} */
+					require.Equal(t, unit.PayloadH264{
+						{1},
+					}, u.Payload)
+					close(dataReceived)
+					return nil
+				})
+
+			strm.AddReader(reader)
 
 			return &dummyPath{}, strm, nil
 		},
@@ -289,47 +311,7 @@ func TestServerPublish(t *testing.T) {
 	})
 	require.NoError(t, err)
 
-	<-streamCreated
-
-	r := &stream.Reader{Parent: test.NilLogger}
-
-	recv := make(chan struct{})
-
-	r.OnData(
-		strm.Desc.Medias[0],
-		strm.Desc.Medias[0].Formats[0],
-		func(u *unit.Unit) error {
-			select {
-			case <-recv:
-				return nil
-			default:
-			}
-
-			require.Equal(t, unit.PayloadH264{
-				{1},
-			}, u.Payload)
-			close(recv)
-
-			return nil
-		})
-
-	strm.AddReader(r)
-	defer strm.RemoveReader(r)
-
-	err = track.WriteRTP(&rtp.Packet{
-		Header: rtp.Header{
-			Version:        2,
-			Marker:         true,
-			PayloadType:    96,
-			SequenceNumber: 124,
-			Timestamp:      45343,
-			SSRC:           563423,
-		},
-		Payload: []byte{1},
-	})
-	require.NoError(t, err)
-
-	<-recv
+	<-dataReceived
 }
 
 func TestServerRead(t *testing.T) {
@@ -484,11 +466,11 @@ func TestServerRead(t *testing.T) {
 			desc := &description.Session{Medias: ca.medias}
 
 			strm := &stream.Stream{
-				WriteQueueSize:     512,
-				RTPMaxPayloadSize:  1450,
-				Desc:               desc,
-				GenerateRTPPackets: ca.unit.Payload != nil,
-				Parent:             test.NilLogger,
+				Desc:              desc,
+				UseRTPPackets:     (ca.unit.Payload == nil),
+				WriteQueueSize:    512,
+				RTPMaxPayloadSize: 1450,
+				Parent:            test.NilLogger,
 			}
 			err := strm.Initialize()
 			require.NoError(t, err)
@@ -555,7 +537,11 @@ func TestServerRead(t *testing.T) {
 
 				if ca.unit.Payload == nil {
 					clone := *ca.unit.RTPPackets[0]
-					strm.WriteRTPPacket(desc.Medias[0], desc.Medias[0].Formats[0], &clone, time.Time{}, 0)
+					strm.WriteUnit(desc.Medias[0], desc.Medias[0].Formats[0], &unit.Unit{
+						PTS:        0,
+						NTP:        time.Time{},
+						RTPPackets: []*rtp.Packet{&clone},
+					})
 				} else {
 					strm.WriteUnit(desc.Medias[0], desc.Medias[0].Formats[0], r.Interface().(*unit.Unit))
 				}
diff --git a/internal/servers/webrtc/session.go b/internal/servers/webrtc/session.go
index 183385ee..68f91c9f 100644
--- a/internal/servers/webrtc/session.go
+++ b/internal/servers/webrtc/session.go
@@ -233,20 +233,20 @@ func (s *session) runPublish() (int, error) {
 		return 0, err
 	}
 
-	var stream *stream.Stream
+	var strm *stream.Stream
 
-	medias, err := webrtc.ToStream(pc, pathConf, &stream, s)
+	medias, err := webrtc.ToStream(pc, pathConf, &strm, s)
 	if err != nil {
 		return 0, err
 	}
 
 	var path defs.Path
-	path, stream, err = s.pathManager.AddPublisher(defs.PathAddPublisherReq{
-		Author:             s,
-		Desc:               &description.Session{Medias: medias},
-		GenerateRTPPackets: false,
-		FillNTP:            !pathConf.UseAbsoluteTimestamp,
-		ConfToCompare:      pathConf,
+	path, strm, err = s.pathManager.AddPublisher(defs.PathAddPublisherReq{
+		Author:        s,
+		Desc:          &description.Session{Medias: medias},
+		UseRTPPackets: true,
+		ReplaceNTP:    !pathConf.UseAbsoluteTimestamp,
+		ConfToCompare: pathConf,
 		AccessRequest: defs.PathAccessRequest{
 			Name:     s.req.pathName,
 			Query:    s.req.httpRequest.URL.RawQuery,
diff --git a/internal/staticsources/hls/source.go b/internal/staticsources/hls/source.go
index ff7ba90b..b4c3d0ac 100644
--- a/internal/staticsources/hls/source.go
+++ b/internal/staticsources/hls/source.go
@@ -10,8 +10,8 @@ import (
 	"github.com/bluenviron/gortsplib/v5/pkg/description"
 
 	"github.com/bluenviron/mediamtx/internal/conf"
-	"github.com/bluenviron/mediamtx/internal/counterdumper"
 	"github.com/bluenviron/mediamtx/internal/defs"
+	"github.com/bluenviron/mediamtx/internal/errordumper"
 	"github.com/bluenviron/mediamtx/internal/logger"
 	"github.com/bluenviron/mediamtx/internal/protocols/hls"
 	"github.com/bluenviron/mediamtx/internal/protocols/tls"
@@ -37,24 +37,21 @@ func (s *Source) Log(level logger.Level, format string, args ...any) {
 
 // Run implements StaticSource.
 func (s *Source) Run(params defs.StaticSourceRunParams) error {
-	var stream *stream.Stream
+	var strm *stream.Stream
 
 	defer func() {
-		if stream != nil {
+		if strm != nil {
 			s.Parent.SetNotReady(defs.PathSourceStaticSetNotReadyReq{})
 		}
 	}()
 
-	decodeErrors := &counterdumper.CounterDumper{
-		OnReport: func(val uint64) {
-			s.Log(logger.Warn, "%d decode %s",
-				val,
-				func() string {
-					if val == 1 {
-						return "error"
-					}
-					return "errors"
-				}())
+	decodeErrors := &errordumper.Dumper{
+		OnReport: func(val uint64, last error) {
+			if val == 1 {
+				s.Log(logger.Warn, "decode error: %v", last)
+			} else {
+				s.Log(logger.Warn, "%d decode errors, last was: %v", val, last)
+			}
 		},
 	}
 
@@ -90,24 +87,25 @@ func (s *Source) Run(params defs.StaticSourceRunParams) error {
 		OnDownloadPart: func(u string) {
 			s.Log(logger.Debug, "downloading part %v", u)
 		},
-		OnDecodeError: func(_ error) {
-			decodeErrors.Increase()
+		OnDecodeError: func(err error) {
+			decodeErrors.Add(err)
 		},
 		OnTracks: func(tracks []*gohlslib.Track) error {
-			medias, err2 := hls.ToStream(c, tracks, params.Conf, &stream)
+			medias, err2 := hls.ToStream(c, tracks, params.Conf, &strm)
 			if err2 != nil {
 				return err2
 			}
 
 			res := s.Parent.SetReady(defs.PathSourceStaticSetReadyReq{
-				Desc:               &description.Session{Medias: medias},
-				GenerateRTPPackets: true,
+				Desc:          &description.Session{Medias: medias},
+				UseRTPPackets: false,
+				ReplaceNTP:    false,
 			})
 			if res.Err != nil {
 				return res.Err
 			}
 
-			stream = res.Stream
+			strm = res.Stream
 
 			return nil
 		},
diff --git a/internal/staticsources/hls/source_test.go b/internal/staticsources/hls/source_test.go
index 6e98a1c6..8d167c88 100644
--- a/internal/staticsources/hls/source_test.go
+++ b/internal/staticsources/hls/source_test.go
@@ -8,6 +8,7 @@ import (
 
 	"github.com/bluenviron/mediacommon/v2/pkg/codecs/mpeg4audio"
 	"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"
@@ -17,11 +18,11 @@ import (
 
 func TestSource(t *testing.T) {
 	track1 := &mpegts.Track{
-		Codec: &mpegts.CodecH264{},
+		Codec: &tscodecs.H264{},
 	}
 
 	track2 := &mpegts.Track{
-		Codec: &mpegts.CodecMPEG4Audio{
+		Codec: &tscodecs.MPEG4Audio{
 			Config: mpeg4audio.AudioSpecificConfig{
 				Type:         2,
 				SampleRate:   44100,
diff --git a/internal/staticsources/mpegts/source.go b/internal/staticsources/mpegts/source.go
index c13cec82..c94ef84e 100644
--- a/internal/staticsources/mpegts/source.go
+++ b/internal/staticsources/mpegts/source.go
@@ -10,8 +10,8 @@ import (
 	"github.com/bluenviron/gortsplib/v5/pkg/description"
 
 	"github.com/bluenviron/mediamtx/internal/conf"
-	"github.com/bluenviron/mediamtx/internal/counterdumper"
 	"github.com/bluenviron/mediamtx/internal/defs"
+	"github.com/bluenviron/mediamtx/internal/errordumper"
 	"github.com/bluenviron/mediamtx/internal/logger"
 	"github.com/bluenviron/mediamtx/internal/protocols/mpegts"
 	"github.com/bluenviron/mediamtx/internal/protocols/udp"
@@ -96,37 +96,34 @@ func (s *Source) runReader(nc net.Conn) error {
 		return err
 	}
 
-	decodeErrors := &counterdumper.CounterDumper{
-		OnReport: func(val uint64) {
-			s.Log(logger.Warn, "%d decode %s",
-				val,
-				func() string {
-					if val == 1 {
-						return "error"
-					}
-					return "errors"
-				}())
+	decodeErrors := &errordumper.Dumper{
+		OnReport: func(val uint64, last error) {
+			if val == 1 {
+				s.Log(logger.Warn, "decode error: %v", last)
+			} else {
+				s.Log(logger.Warn, "%d decode errors, last was: %v", val, last)
+			}
 		},
 	}
 
 	decodeErrors.Start()
 	defer decodeErrors.Stop()
 
-	mr.OnDecodeError(func(_ error) {
-		decodeErrors.Increase()
+	mr.OnDecodeError(func(err error) {
+		decodeErrors.Add(err)
 	})
 
-	var stream *stream.Stream
+	var strm *stream.Stream
 
-	medias, err := mpegts.ToStream(mr, &stream, s)
+	medias, err := mpegts.ToStream(mr, &strm, s)
 	if err != nil {
 		return err
 	}
 
 	res := s.Parent.SetReady(defs.PathSourceStaticSetReadyReq{
-		Desc:               &description.Session{Medias: medias},
-		GenerateRTPPackets: true,
-		FillNTP:            true,
+		Desc:          &description.Session{Medias: medias},
+		UseRTPPackets: false,
+		ReplaceNTP:    true,
 	})
 	if res.Err != nil {
 		return res.Err
@@ -134,7 +131,7 @@ func (s *Source) runReader(nc net.Conn) error {
 
 	defer s.Parent.SetNotReady(defs.PathSourceStaticSetNotReadyReq{})
 
-	stream = res.Stream
+	strm = res.Stream
 
 	for {
 		nc.SetReadDeadline(time.Now().Add(time.Duration(s.ReadTimeout)))
diff --git a/internal/staticsources/mpegts/source_test.go b/internal/staticsources/mpegts/source_test.go
index 60e10d6b..ecd8b3bd 100644
--- a/internal/staticsources/mpegts/source_test.go
+++ b/internal/staticsources/mpegts/source_test.go
@@ -1,6 +1,7 @@
 package mpegts
 
 import (
+	"bufio"
 	"context"
 	"net"
 	"os"
@@ -9,6 +10,7 @@ import (
 	"time"
 
 	"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"
@@ -104,7 +106,7 @@ func TestSourceUDP(t *testing.T) {
 
 			var usrc *net.UDPAddr
 			if ca == "unicast with source" {
-				usrc, err = net.ResolveUDPAddr("udp", "127.0.1.1:9020")
+				usrc, err = net.ResolveUDPAddr("udp", "127.0.1.1:9022")
 				require.NoError(t, err)
 			}
 
@@ -113,10 +115,11 @@ func TestSourceUDP(t *testing.T) {
 			defer conn.Close() //nolint:errcheck
 
 			track := &mpegts.Track{
-				Codec: &mpegts.CodecH264{},
+				Codec: &tscodecs.H264{},
 			}
 
-			w := &mpegts.Writer{W: conn, Tracks: []*mpegts.Track{track}}
+			bw := bufio.NewWriter(conn)
+			w := &mpegts.Writer{W: bw, Tracks: []*mpegts.Track{track}}
 			err = w.Initialize()
 			require.NoError(t, err)
 
@@ -125,11 +128,17 @@ func TestSourceUDP(t *testing.T) {
 			}})
 			require.NoError(t, err)
 
+			err = bw.Flush()
+			require.NoError(t, err)
+
 			err = w.WriteH264(track, 0, 0, [][]byte{{ // non-IDR
 				5, 2,
 			}})
 			require.NoError(t, err)
 
+			err = bw.Flush()
+			require.NoError(t, err)
+
 			<-p.Unit
 
 			// the source must be listening on ReloadConf
@@ -185,10 +194,11 @@ func TestSourceUnixSocket(t *testing.T) {
 				require.NoError(t, err)
 
 				track := &mpegts.Track{
-					Codec: &mpegts.CodecH264{},
+					Codec: &tscodecs.H264{},
 				}
 
-				w := &mpegts.Writer{W: conn, Tracks: []*mpegts.Track{track}}
+				bw := bufio.NewWriter(conn)
+				w := &mpegts.Writer{W: bw, Tracks: []*mpegts.Track{track}}
 				err = w.Initialize()
 				require.NoError(t, err)
 
@@ -197,6 +207,9 @@ func TestSourceUnixSocket(t *testing.T) {
 				}})
 				require.NoError(t, err)
 
+				err = bw.Flush()
+				require.NoError(t, err)
+
 				conn.Close() // trigger a flush
 
 				<-p.Unit
diff --git a/internal/staticsources/rpicamera/source.go b/internal/staticsources/rpicamera/source.go
index 8c3ab90c..ffab452a 100644
--- a/internal/staticsources/rpicamera/source.go
+++ b/internal/staticsources/rpicamera/source.go
@@ -158,8 +158,9 @@ func (s *Source) runPrimary(params defs.StaticSourceRunParams) error {
 	initializeStream := func() {
 		if strm == nil {
 			res := s.Parent.SetReady(defs.PathSourceStaticSetReadyReq{
-				Desc:               &description.Session{Medias: medias},
-				GenerateRTPPackets: false,
+				Desc:          &description.Session{Medias: medias},
+				UseRTPPackets: true,
+				ReplaceNTP:    false,
 			})
 			if res.Err != nil {
 				panic("should not happen")
@@ -189,7 +190,11 @@ func (s *Source) runPrimary(params defs.StaticSourceRunParams) error {
 
 		for _, pkt := range pkts {
 			pkt.Timestamp = uint32(pts)
-			strm.WriteRTPPacket(medi, medi.Formats[0], pkt, ntp, pts)
+			strm.WriteUnit(medi, medi.Formats[0], &unit.Unit{
+				PTS:        pts,
+				NTP:        ntp,
+				RTPPackets: []*rtp.Packet{pkt},
+			})
 		}
 	}
 
@@ -216,7 +221,11 @@ func (s *Source) runPrimary(params defs.StaticSourceRunParams) error {
 			for _, pkt := range pkts {
 				pkt.Timestamp = uint32(pts)
 				pkt.PayloadType = 96
-				strm.WriteRTPPacket(mediaSecondary, mediaSecondary.Formats[0], pkt, ntp, pts)
+				strm.WriteUnit(mediaSecondary, mediaSecondary.Formats[0], &unit.Unit{
+					PTS:        pts,
+					NTP:        ntp,
+					RTPPackets: []*rtp.Packet{pkt},
+				})
 			}
 		}
 	}
@@ -275,8 +284,8 @@ func (s *Source) runSecondary(params defs.StaticSourceRunParams) error {
 	}
 
 	res := s.Parent.SetReady(defs.PathSourceStaticSetReadyReq{
-		Desc:               &description.Session{Medias: []*description.Media{media}},
-		GenerateRTPPackets: false,
+		Desc:          &description.Session{Medias: []*description.Media{media}},
+		UseRTPPackets: true,
 	})
 	if res.Err != nil {
 		return res.Err
@@ -296,7 +305,11 @@ func (s *Source) runSecondary(params defs.StaticSourceRunParams) error {
 			}
 			newPkt.PayloadType = 26
 
-			res.Stream.WriteRTPPacket(media, media.Formats[0], newPkt, u.NTP, u.PTS)
+			res.Stream.WriteUnit(media, media.Formats[0], &unit.Unit{
+				PTS:        u.PTS,
+				NTP:        u.NTP,
+				RTPPackets: []*rtp.Packet{newPkt},
+			})
 			return nil
 		})
 
diff --git a/internal/staticsources/rtmp/source.go b/internal/staticsources/rtmp/source.go
index 9fff458e..03219053 100644
--- a/internal/staticsources/rtmp/source.go
+++ b/internal/staticsources/rtmp/source.go
@@ -101,9 +101,9 @@ func (s *Source) runReader(conn *gortmplib.Client) error {
 		return err
 	}
 
-	var stream *stream.Stream
+	var strm *stream.Stream
 
-	medias, err := rtmp.ToStream(r, &stream)
+	medias, err := rtmp.ToStream(r, &strm)
 	if err != nil {
 		return err
 	}
@@ -113,9 +113,9 @@ func (s *Source) runReader(conn *gortmplib.Client) error {
 	}
 
 	res := s.Parent.SetReady(defs.PathSourceStaticSetReadyReq{
-		Desc:               &description.Session{Medias: medias},
-		GenerateRTPPackets: true,
-		FillNTP:            true,
+		Desc:          &description.Session{Medias: medias},
+		UseRTPPackets: false,
+		ReplaceNTP:    true,
 	})
 	if res.Err != nil {
 		return res.Err
@@ -123,7 +123,7 @@ func (s *Source) runReader(conn *gortmplib.Client) error {
 
 	defer s.Parent.SetNotReady(defs.PathSourceStaticSetNotReadyReq{})
 
-	stream = res.Stream
+	strm = res.Stream
 
 	conn.NetConn().SetWriteDeadline(time.Time{})
 
diff --git a/internal/staticsources/rtmp/source_test.go b/internal/staticsources/rtmp/source_test.go
index ca3ef33c..633275f4 100644
--- a/internal/staticsources/rtmp/source_test.go
+++ b/internal/staticsources/rtmp/source_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/bluenviron/gortmplib"
-	"github.com/bluenviron/gortsplib/v5/pkg/format"
+	"github.com/bluenviron/gortmplib/pkg/codecs"
 	"github.com/bluenviron/mediamtx/internal/conf"
 	"github.com/bluenviron/mediamtx/internal/defs"
 	"github.com/bluenviron/mediamtx/internal/test"
@@ -118,13 +118,21 @@ func TestSource(t *testing.T) {
 					require.NoError(t, err)
 
 					w := &gortmplib.Writer{
-						Conn:   conn,
-						Tracks: []format.Format{test.FormatH264, test.FormatMPEG4Audio},
+						Conn: conn,
+						Tracks: []*gortmplib.Track{
+							{Codec: &codecs.H264{
+								SPS: test.FormatH264.SPS,
+								PPS: test.FormatH264.PPS,
+							}},
+							{Codec: &codecs.MPEG4Audio{
+								Config: test.FormatMPEG4Audio.Config,
+							}},
+						},
 					}
 					err = w.Initialize()
 					require.NoError(t, err)
 
-					err = w.WriteMPEG4Audio(test.FormatMPEG4Audio, 2*time.Second, []byte{5, 2, 3, 4})
+					err = w.WriteMPEG4Audio(w.Tracks[1], 2*time.Second, []byte{5, 2, 3, 4})
 					require.NoError(t, err)
 
 					break
diff --git a/internal/staticsources/rtp/source.go b/internal/staticsources/rtp/source.go
index 8e3dc21d..40fc308e 100644
--- a/internal/staticsources/rtp/source.go
+++ b/internal/staticsources/rtp/source.go
@@ -13,10 +13,12 @@ import (
 	"github.com/bluenviron/mediamtx/internal/conf"
 	"github.com/bluenviron/mediamtx/internal/counterdumper"
 	"github.com/bluenviron/mediamtx/internal/defs"
+	"github.com/bluenviron/mediamtx/internal/errordumper"
 	"github.com/bluenviron/mediamtx/internal/logger"
 	"github.com/bluenviron/mediamtx/internal/protocols/udp"
 	"github.com/bluenviron/mediamtx/internal/protocols/unix"
 	"github.com/bluenviron/mediamtx/internal/stream"
+	"github.com/bluenviron/mediamtx/internal/unit"
 	"github.com/pion/rtp"
 )
 
@@ -102,7 +104,7 @@ func (s *Source) Run(params defs.StaticSourceRunParams) error {
 }
 
 func (s *Source) runReader(desc *description.Session, nc net.Conn) error {
-	packetsLost := &counterdumper.CounterDumper{
+	packetsLost := &counterdumper.Dumper{
 		OnReport: func(val uint64) {
 			s.Log(logger.Warn, "%d RTP %s lost",
 				val,
@@ -118,22 +120,19 @@ func (s *Source) runReader(desc *description.Session, nc net.Conn) error {
 	packetsLost.Start()
 	defer packetsLost.Stop()
 
-	decodeErrors := &counterdumper.CounterDumper{
-		OnReport: func(val uint64) {
-			s.Log(logger.Warn, "%d decode %s",
-				val,
-				func() string {
-					if val == 1 {
-						return "error"
-					}
-					return "errors"
-				}())
+	decodeErrors := &errordumper.Dumper{
+		OnReport: func(val uint64, last error) {
+			if val == 1 {
+				s.Log(logger.Warn, "decode error: %v", last)
+			} else {
+				s.Log(logger.Warn, "%d decode errors, last was: %v", val, last)
+			}
 		},
 	}
 	decodeErrors.Start()
 	defer decodeErrors.Stop()
 
-	var stream *stream.Stream
+	var strm *stream.Stream
 
 	timeDecoder := &rtptime.GlobalDecoder{}
 	timeDecoder.Initialize()
@@ -168,18 +167,18 @@ func (s *Source) runReader(desc *description.Session, nc net.Conn) error {
 		var pkt rtp.Packet
 		err = pkt.Unmarshal(buf[:n])
 		if err != nil {
-			if stream != nil {
-				decodeErrors.Increase()
+			if strm != nil {
+				decodeErrors.Add(err)
 				continue
 			}
 			return err
 		}
 
-		if stream == nil {
+		if strm == nil {
 			res := s.Parent.SetReady(defs.PathSourceStaticSetReadyReq{
-				Desc:               desc,
-				GenerateRTPPackets: false,
-				FillNTP:            true,
+				Desc:          desc,
+				UseRTPPackets: true,
+				ReplaceNTP:    true,
 			})
 			if res.Err != nil {
 				return res.Err
@@ -187,7 +186,7 @@ func (s *Source) runReader(desc *description.Session, nc net.Conn) error {
 
 			defer s.Parent.SetNotReady(defs.PathSourceStaticSetNotReadyReq{})
 
-			stream = res.Stream
+			strm = res.Stream
 		}
 
 		media, ok := mediasByPayloadType[pkt.PayloadType]
@@ -209,7 +208,10 @@ func (s *Source) runReader(desc *description.Session, nc net.Conn) error {
 				continue
 			}
 
-			stream.WriteRTPPacket(media.desc, forma.desc, pkt, time.Time{}, pts)
+			strm.WriteUnit(media.desc, forma.desc, &unit.Unit{
+				PTS:        pts,
+				RTPPackets: []*rtp.Packet{pkt},
+			})
 		}
 	}
 }
diff --git a/internal/staticsources/rtsp/source.go b/internal/staticsources/rtsp/source.go
index b5968242..a5670c3d 100644
--- a/internal/staticsources/rtsp/source.go
+++ b/internal/staticsources/rtsp/source.go
@@ -9,14 +9,17 @@ import (
 
 	"github.com/bluenviron/gortsplib/v5"
 	"github.com/bluenviron/gortsplib/v5/pkg/base"
+	"github.com/bluenviron/gortsplib/v5/pkg/description"
 	"github.com/bluenviron/gortsplib/v5/pkg/headers"
 
 	"github.com/bluenviron/mediamtx/internal/conf"
 	"github.com/bluenviron/mediamtx/internal/counterdumper"
 	"github.com/bluenviron/mediamtx/internal/defs"
+	"github.com/bluenviron/mediamtx/internal/errordumper"
 	"github.com/bluenviron/mediamtx/internal/logger"
 	"github.com/bluenviron/mediamtx/internal/protocols/rtsp"
 	"github.com/bluenviron/mediamtx/internal/protocols/tls"
+	"github.com/bluenviron/mediamtx/internal/stream"
 )
 
 func createRangeHeader(cnf *conf.Path) (*headers.Range, error) {
@@ -89,7 +92,7 @@ func (s *Source) Log(level logger.Level, format string, args ...any) {
 func (s *Source) Run(params defs.StaticSourceRunParams) error {
 	s.Log(logger.Debug, "connecting")
 
-	packetsLost := &counterdumper.CounterDumper{
+	packetsLost := &counterdumper.Dumper{
 		OnReport: func(val uint64) {
 			s.Log(logger.Warn, "%d RTP %s lost",
 				val,
@@ -105,16 +108,13 @@ func (s *Source) Run(params defs.StaticSourceRunParams) error {
 	packetsLost.Start()
 	defer packetsLost.Stop()
 
-	decodeErrors := &counterdumper.CounterDumper{
-		OnReport: func(val uint64) {
-			s.Log(logger.Warn, "%d decode %s",
-				val,
-				func() string {
-					if val == 1 {
-						return "error"
-					}
-					return "errors"
-				}())
+	decodeErrors := &errordumper.Dumper{
+		OnReport: func(val uint64, last error) {
+			if val == 1 {
+				s.Log(logger.Warn, "decode error: %v", last)
+			} else {
+				s.Log(logger.Warn, "%d decode errors, last was: %v", val, last)
+			}
 		},
 	}
 
@@ -196,8 +196,8 @@ func (s *Source) Run(params defs.StaticSourceRunParams) error {
 		OnPacketsLost: func(lost uint64) {
 			packetsLost.Add(lost)
 		},
-		OnDecodeError: func(_ error) {
-			decodeErrors.Increase()
+		OnDecodeError: func(err error) {
+			decodeErrors.Add(err)
 		},
 	}
 
@@ -209,47 +209,7 @@ func (s *Source) Run(params defs.StaticSourceRunParams) error {
 
 	readErr := make(chan error)
 	go func() {
-		readErr <- func() error {
-			desc, _, err2 := c.Describe(u)
-			if err2 != nil {
-				return err2
-			}
-
-			err2 = c.SetupAll(desc.BaseURL, desc.Medias)
-			if err2 != nil {
-				return err2
-			}
-
-			res := s.Parent.SetReady(defs.PathSourceStaticSetReadyReq{
-				Desc:               desc,
-				GenerateRTPPackets: false,
-				FillNTP:            !params.Conf.UseAbsoluteTimestamp,
-			})
-			if res.Err != nil {
-				return res.Err
-			}
-
-			defer s.Parent.SetNotReady(defs.PathSourceStaticSetNotReadyReq{})
-
-			rtsp.ToStream(
-				c,
-				desc.Medias,
-				params.Conf,
-				res.Stream,
-				s)
-
-			rangeHeader, err2 := createRangeHeader(params.Conf)
-			if err2 != nil {
-				return err2
-			}
-
-			_, err2 = c.Play(rangeHeader)
-			if err2 != nil {
-				return err2
-			}
-
-			return c.Wait()
-		}()
+		readErr <- s.runInner(c, u, params.Conf)
 	}()
 
 	for {
@@ -267,6 +227,69 @@ func (s *Source) Run(params defs.StaticSourceRunParams) error {
 	}
 }
 
+func (s *Source) runInner(c *gortsplib.Client, u *base.URL, pathConf *conf.Path) error {
+	desc, _, err := c.Describe(u)
+	if err != nil {
+		return err
+	}
+
+	var medias []*description.Media
+
+	for _, m := range desc.Medias {
+		if !m.IsBackChannel {
+			_, err = c.Setup(desc.BaseURL, m, 0, 0)
+			if err != nil {
+				return err
+			}
+
+			medias = append(medias, m)
+		}
+	}
+
+	if medias == nil {
+		return fmt.Errorf("no medias have been setupped")
+	}
+
+	desc2 := &description.Session{
+		Title:  desc.Title,
+		Medias: medias,
+	}
+
+	var strm *stream.Stream
+
+	rtsp.ToStream(
+		c,
+		desc2.Medias,
+		pathConf,
+		&strm,
+		s)
+
+	res := s.Parent.SetReady(defs.PathSourceStaticSetReadyReq{
+		Desc:          desc2,
+		UseRTPPackets: true,
+		ReplaceNTP:    !pathConf.UseAbsoluteTimestamp,
+	})
+	if res.Err != nil {
+		return res.Err
+	}
+
+	defer s.Parent.SetNotReady(defs.PathSourceStaticSetNotReadyReq{})
+
+	strm = res.Stream
+
+	rangeHeader, err := createRangeHeader(pathConf)
+	if err != nil {
+		return err
+	}
+
+	_, err = c.Play(rangeHeader)
+	if err != nil {
+		return err
+	}
+
+	return c.Wait()
+}
+
 // APISourceDescribe implements StaticSource.
 func (*Source) APISourceDescribe() defs.APIPathSourceOrReader {
 	return defs.APIPathSourceOrReader{
diff --git a/internal/staticsources/rtsp/source_test.go b/internal/staticsources/rtsp/source_test.go
index 7f15ece9..d7242f74 100644
--- a/internal/staticsources/rtsp/source_test.go
+++ b/internal/staticsources/rtsp/source_test.go
@@ -11,6 +11,7 @@ import (
 	"github.com/bluenviron/gortsplib/v5/pkg/auth"
 	"github.com/bluenviron/gortsplib/v5/pkg/base"
 	"github.com/bluenviron/gortsplib/v5/pkg/description"
+	"github.com/bluenviron/gortsplib/v5/pkg/format"
 	"github.com/pion/rtp"
 	"github.com/stretchr/testify/require"
 
@@ -19,6 +20,10 @@ import (
 	"github.com/bluenviron/mediamtx/internal/test"
 )
 
+func ptrOf[T any](v T) *T {
+	return &v
+}
+
 type testServer struct {
 	onDescribe func(*gortsplib.ServerHandlerOnDescribeCtx) (*base.Response, *gortsplib.ServerStream, error)
 	onSetup    func(*gortsplib.ServerHandlerOnSetupCtx) (*base.Response, *gortsplib.ServerStream, error)
@@ -189,7 +194,7 @@ func TestSource(t *testing.T) {
 	}
 }
 
-func TestSourceNoPassword(t *testing.T) {
+func TestNoPassword(t *testing.T) {
 	var strm *gortsplib.ServerStream
 
 	nonce, err := auth.GenerateNonce()
@@ -290,7 +295,7 @@ func TestSourceNoPassword(t *testing.T) {
 	<-p.Unit
 }
 
-func TestSourceRange(t *testing.T) {
+func TestRange(t *testing.T) {
 	for _, ca := range []string{"clock", "npt", "smpte"} {
 		t.Run(ca, func(t *testing.T) {
 			var strm *gortsplib.ServerStream
@@ -403,3 +408,173 @@ func TestSourceRange(t *testing.T) {
 		})
 	}
 }
+
+func TestSkipBackChannel(t *testing.T) {
+	media0 := test.UniqueMediaH264()
+	media1 := test.UniqueMediaMPEG4Audio()
+	backChannelMedia := &description.Media{
+		Type:          description.MediaTypeAudio,
+		Formats:       []format.Format{&format.Opus{PayloadTyp: 96, ChannelCount: 2}},
+		IsBackChannel: true,
+	}
+
+	var strm *gortsplib.ServerStream
+	setupCount := 0
+
+	s := gortsplib.Server{
+		Handler: &testServer{
+			onDescribe: func(_ *gortsplib.ServerHandlerOnDescribeCtx) (*base.Response, *gortsplib.ServerStream, error) {
+				return &base.Response{
+					StatusCode: base.StatusOK,
+				}, strm, nil
+			},
+			onSetup: func(_ *gortsplib.ServerHandlerOnSetupCtx) (*base.Response, *gortsplib.ServerStream, error) {
+				setupCount++
+				return &base.Response{
+					StatusCode: base.StatusOK,
+				}, strm, nil
+			},
+			onPlay: func(_ *gortsplib.ServerHandlerOnPlayCtx) (*base.Response, error) {
+				go func() {
+					time.Sleep(100 * time.Millisecond)
+					err := strm.WritePacketRTP(media0, &rtp.Packet{
+						Header: rtp.Header{
+							Version:        0x02,
+							PayloadType:    96,
+							SequenceNumber: 57899,
+							Timestamp:      345234345,
+							SSRC:           978651231,
+							Marker:         true,
+						},
+						Payload: []byte{5, 1, 2, 3, 4},
+					})
+					require.NoError(t, err)
+				}()
+
+				return &base.Response{
+					StatusCode: base.StatusOK,
+				}, nil
+			},
+		},
+		RTSPAddress: "127.0.0.1:8555",
+	}
+
+	err := s.Start()
+	require.NoError(t, err)
+	defer s.Close()
+
+	strm = &gortsplib.ServerStream{
+		Server: &s,
+		Desc:   &description.Session{Medias: []*description.Media{media0, media1, backChannelMedia}},
+	}
+	err = strm.Initialize()
+	require.NoError(t, err)
+	defer strm.Close()
+
+	var sp conf.RTSPTransport
+	sp.UnmarshalJSON([]byte(`"tcp"`)) //nolint:errcheck
+
+	p := &test.StaticSourceParent{}
+	p.Initialize()
+	defer p.Close()
+
+	so := &Source{
+		ReadTimeout:    conf.Duration(10 * time.Second),
+		WriteTimeout:   conf.Duration(10 * time.Second),
+		WriteQueueSize: 2048,
+		Parent:         p,
+	}
+
+	done := make(chan struct{})
+	defer func() { <-done }()
+
+	ctx, ctxCancel := context.WithCancel(context.Background())
+	defer ctxCancel()
+
+	go func() {
+		so.Run(defs.StaticSourceRunParams{ //nolint:errcheck
+			Context:        ctx,
+			ResolvedSource: "rtsp://127.0.0.1:8555/teststream",
+			Conf: &conf.Path{
+				RTSPTransport: conf.RTSPTransport{Protocol: ptrOf(gortsplib.ProtocolTCP)},
+			},
+		})
+		close(done)
+	}()
+
+	<-p.Unit
+
+	require.Equal(t, 2, setupCount)
+}
+
+func TestOnlyBackChannelsError(t *testing.T) {
+	backChannelMedia1 := &description.Media{
+		Type:          description.MediaTypeAudio,
+		Formats:       []format.Format{&format.Opus{PayloadTyp: 96, ChannelCount: 2}},
+		IsBackChannel: true,
+	}
+	backChannelMedia2 := &description.Media{
+		Type:          description.MediaTypeAudio,
+		Formats:       []format.Format{&format.G711{PayloadTyp: 8, SampleRate: 8000, ChannelCount: 1}},
+		IsBackChannel: true,
+	}
+
+	var strm *gortsplib.ServerStream
+
+	s := gortsplib.Server{
+		Handler: &testServer{
+			onDescribe: func(_ *gortsplib.ServerHandlerOnDescribeCtx) (*base.Response, *gortsplib.ServerStream, error) {
+				return &base.Response{
+					StatusCode: base.StatusOK,
+				}, strm, nil
+			},
+			onSetup: func(_ *gortsplib.ServerHandlerOnSetupCtx) (*base.Response, *gortsplib.ServerStream, error) {
+				return &base.Response{
+					StatusCode: base.StatusOK,
+				}, strm, nil
+			},
+			onPlay: func(_ *gortsplib.ServerHandlerOnPlayCtx) (*base.Response, error) {
+				return &base.Response{
+					StatusCode: base.StatusOK,
+				}, nil
+			},
+		},
+		RTSPAddress: "127.0.0.1:8555",
+	}
+
+	err := s.Start()
+	require.NoError(t, err)
+	defer s.Close()
+
+	strm = &gortsplib.ServerStream{
+		Server: &s,
+		Desc:   &description.Session{Medias: []*description.Media{backChannelMedia1, backChannelMedia2}},
+	}
+	err = strm.Initialize()
+	require.NoError(t, err)
+	defer strm.Close()
+
+	p := &test.StaticSourceParent{}
+	p.Initialize()
+
+	so := &Source{
+		ReadTimeout:    conf.Duration(10 * time.Second),
+		WriteTimeout:   conf.Duration(10 * time.Second),
+		WriteQueueSize: 2048,
+		Parent:         p,
+	}
+
+	ctx, ctxCancel := context.WithCancel(context.Background())
+	defer ctxCancel()
+
+	err = so.Run(defs.StaticSourceRunParams{
+		Context:        ctx,
+		ResolvedSource: "rtsp://127.0.0.1:8555/teststream",
+		Conf: &conf.Path{
+			RTSPTransport: conf.RTSPTransport{Protocol: ptrOf(gortsplib.ProtocolTCP)},
+		},
+	})
+
+	require.Error(t, err)
+	require.Contains(t, err.Error(), "no media")
+}
diff --git a/internal/staticsources/srt/source.go b/internal/staticsources/srt/source.go
index 5e091750..4545e30e 100644
--- a/internal/staticsources/srt/source.go
+++ b/internal/staticsources/srt/source.go
@@ -8,8 +8,8 @@ import (
 	srt "github.com/datarhei/gosrt"
 
 	"github.com/bluenviron/mediamtx/internal/conf"
-	"github.com/bluenviron/mediamtx/internal/counterdumper"
 	"github.com/bluenviron/mediamtx/internal/defs"
+	"github.com/bluenviron/mediamtx/internal/errordumper"
 	"github.com/bluenviron/mediamtx/internal/logger"
 	"github.com/bluenviron/mediamtx/internal/protocols/mpegts"
 	"github.com/bluenviron/mediamtx/internal/stream"
@@ -81,37 +81,34 @@ func (s *Source) runReader(sconn srt.Conn) error {
 		return err
 	}
 
-	decodeErrors := &counterdumper.CounterDumper{
-		OnReport: func(val uint64) {
-			s.Log(logger.Warn, "%d decode %s",
-				val,
-				func() string {
-					if val == 1 {
-						return "error"
-					}
-					return "errors"
-				}())
+	decodeErrors := &errordumper.Dumper{
+		OnReport: func(val uint64, last error) {
+			if val == 1 {
+				s.Log(logger.Warn, "decode error: %v", last)
+			} else {
+				s.Log(logger.Warn, "%d decode errors, last was: %v", val, last)
+			}
 		},
 	}
 
 	decodeErrors.Start()
 	defer decodeErrors.Stop()
 
-	r.OnDecodeError(func(_ error) {
-		decodeErrors.Increase()
+	r.OnDecodeError(func(err error) {
+		decodeErrors.Add(err)
 	})
 
-	var stream *stream.Stream
+	var strm *stream.Stream
 
-	medias, err := mpegts.ToStream(r, &stream, s)
+	medias, err := mpegts.ToStream(r, &strm, s)
 	if err != nil {
 		return err
 	}
 
 	res := s.Parent.SetReady(defs.PathSourceStaticSetReadyReq{
-		Desc:               &description.Session{Medias: medias},
-		GenerateRTPPackets: true,
-		FillNTP:            true,
+		Desc:          &description.Session{Medias: medias},
+		UseRTPPackets: false,
+		ReplaceNTP:    true,
 	})
 	if res.Err != nil {
 		return res.Err
@@ -119,7 +116,7 @@ func (s *Source) runReader(sconn srt.Conn) error {
 
 	defer s.Parent.SetNotReady(defs.PathSourceStaticSetNotReadyReq{})
 
-	stream = res.Stream
+	strm = res.Stream
 
 	for {
 		sconn.SetReadDeadline(time.Now().Add(time.Duration(s.ReadTimeout)))
diff --git a/internal/staticsources/srt/source_test.go b/internal/staticsources/srt/source_test.go
index cc7561fe..d6ce1dd6 100644
--- a/internal/staticsources/srt/source_test.go
+++ b/internal/staticsources/srt/source_test.go
@@ -1,11 +1,13 @@
 package srt
 
 import (
+	"bufio"
 	"context"
 	"testing"
 	"time"
 
 	"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"
 
@@ -56,9 +58,10 @@ func TestSource(t *testing.T) {
 	require.NoError(t, err2)
 	defer conn.Close()
 
-	track := &mpegts.Track{Codec: &mpegts.CodecH264{}}
+	track := &mpegts.Track{Codec: &tscodecs.H264{}}
 
-	w := &mpegts.Writer{W: conn, Tracks: []*mpegts.Track{track}}
+	bw := bufio.NewWriter(conn)
+	w := &mpegts.Writer{W: bw, Tracks: []*mpegts.Track{track}}
 	err2 = w.Initialize()
 	require.NoError(t, err2)
 
@@ -67,11 +70,17 @@ func TestSource(t *testing.T) {
 	}})
 	require.NoError(t, err2)
 
+	err = bw.Flush()
+	require.NoError(t, err)
+
 	err = w.WriteH264(track, 0, 0, [][]byte{{ // non-IDR
 		5, 2,
 	}})
 	require.NoError(t, err)
 
+	err = bw.Flush()
+	require.NoError(t, err)
+
 	<-p.Unit
 
 	// the source must be listening on ReloadConf
diff --git a/internal/staticsources/webrtc/source.go b/internal/staticsources/webrtc/source.go
index 2ecbd9aa..fb216dad 100644
--- a/internal/staticsources/webrtc/source.go
+++ b/internal/staticsources/webrtc/source.go
@@ -67,18 +67,18 @@ func (s *Source) Run(params defs.StaticSourceRunParams) error {
 		return err
 	}
 
-	var stream *stream.Stream
+	var strm *stream.Stream
 
-	medias, err := webrtc.ToStream(client.PeerConnection(), params.Conf, &stream, s)
+	medias, err := webrtc.ToStream(client.PeerConnection(), params.Conf, &strm, s)
 	if err != nil {
 		client.Close() //nolint:errcheck
 		return err
 	}
 
 	rres := s.Parent.SetReady(defs.PathSourceStaticSetReadyReq{
-		Desc:               &description.Session{Medias: medias},
-		GenerateRTPPackets: true,
-		FillNTP:            !params.Conf.UseAbsoluteTimestamp,
+		Desc:          &description.Session{Medias: medias},
+		UseRTPPackets: true,
+		ReplaceNTP:    !params.Conf.UseAbsoluteTimestamp,
 	})
 	if rres.Err != nil {
 		client.Close() //nolint:errcheck
@@ -87,7 +87,7 @@ func (s *Source) Run(params defs.StaticSourceRunParams) error {
 
 	defer s.Parent.SetNotReady(defs.PathSourceStaticSetNotReadyReq{})
 
-	stream = rres.Stream
+	strm = rres.Stream
 
 	client.StartReading()
 
diff --git a/internal/stream/format_updater.go b/internal/stream/format_updater.go
new file mode 100644
index 00000000..152fc893
--- /dev/null
+++ b/internal/stream/format_updater.go
@@ -0,0 +1,113 @@
+package stream
+
+import (
+	"bytes"
+
+	"github.com/bluenviron/gortsplib/v5/pkg/format"
+	mch264 "github.com/bluenviron/mediacommon/v2/pkg/codecs/h264"
+	mch265 "github.com/bluenviron/mediacommon/v2/pkg/codecs/h265"
+	"github.com/bluenviron/mediacommon/v2/pkg/codecs/mpeg4video"
+	"github.com/bluenviron/mediamtx/internal/unit"
+)
+
+type formatUpdater func(format.Format, unit.Payload)
+
+func formatUpdaterH265(forma format.Format, payload unit.Payload) {
+	formatH265 := forma.(*format.H265)
+	au := payload.(unit.PayloadH265)
+
+	vps, sps, pps := formatH265.VPS, formatH265.SPS, formatH265.PPS
+	update := false
+
+	for _, nalu := range au {
+		typ := mch265.NALUType((nalu[0] >> 1) & 0b111111)
+
+		switch typ {
+		case mch265.NALUType_VPS_NUT:
+			if !bytes.Equal(nalu, formatH265.VPS) {
+				vps = nalu
+				update = true
+			}
+
+		case mch265.NALUType_SPS_NUT:
+			if !bytes.Equal(nalu, formatH265.SPS) {
+				sps = nalu
+				update = true
+			}
+
+		case mch265.NALUType_PPS_NUT:
+			if !bytes.Equal(nalu, formatH265.PPS) {
+				pps = nalu
+				update = true
+			}
+		}
+	}
+
+	if update {
+		formatH265.SafeSetParams(vps, sps, pps)
+	}
+}
+
+func formatUpdaterH264(forma format.Format, payload unit.Payload) {
+	formatH264 := forma.(*format.H264)
+	au := payload.(unit.PayloadH264)
+
+	sps, pps := formatH264.SPS, formatH264.PPS
+	update := false
+
+	for _, nalu := range au {
+		typ := mch264.NALUType(nalu[0] & 0x1F)
+
+		switch typ {
+		case mch264.NALUTypeSPS:
+			if !bytes.Equal(nalu, sps) {
+				sps = nalu
+				update = true
+			}
+
+		case mch264.NALUTypePPS:
+			if !bytes.Equal(nalu, pps) {
+				pps = nalu
+				update = true
+			}
+		}
+	}
+
+	if update {
+		formatH264.SafeSetParams(sps, pps)
+	}
+}
+
+func formatUpdaterMPEG4Video(forma format.Format, payload unit.Payload) {
+	formatMPEG4Video := forma.(*format.MPEG4Video)
+	frame := payload.(unit.PayloadMPEG4Video)
+
+	if bytes.HasPrefix(frame, []byte{0, 0, 1, byte(mpeg4video.VisualObjectSequenceStartCode)}) {
+		end := bytes.Index(frame[4:], []byte{0, 0, 1, byte(mpeg4video.GroupOfVOPStartCode)})
+		if end < 0 {
+			return
+		}
+		conf := frame[:end+4]
+
+		if !bytes.Equal(conf, formatMPEG4Video.Config) {
+			formatMPEG4Video.SafeSetParams(conf)
+		}
+	}
+}
+
+func newFormatUpdater(forma format.Format) formatUpdater {
+	switch forma.(type) {
+	case *format.H265:
+		return formatUpdaterH265
+
+	case *format.H264:
+		return formatUpdaterH264
+
+	case *format.MPEG4Video:
+		return formatUpdaterMPEG4Video
+
+	default:
+		return formatUpdater(func(_ format.Format, _ unit.Payload) {
+		})
+	}
+}
diff --git a/internal/stream/reader.go b/internal/stream/reader.go
index 9353496f..e1767072 100644
--- a/internal/stream/reader.go
+++ b/internal/stream/reader.go
@@ -22,7 +22,7 @@ type Reader struct {
 	onDatas         map[*description.Media]map[format.Format]OnDataFunc
 	queueSize       int
 	buffer          *ringbuffer.RingBuffer
-	discardedFrames *counterdumper.CounterDumper
+	discardedFrames *counterdumper.Dumper
 
 	// out
 	err chan error
@@ -41,11 +41,24 @@ func (r *Reader) OnData(medi *description.Media, forma format.Format, cb OnDataF
 
 // Formats returns all formats for which the reader has registered a OnData callback.
 func (r *Reader) Formats() []format.Format {
-	var out []format.Format
+	n := 0
+	for _, formats := range r.onDatas {
+		for range formats {
+			n++
+		}
+	}
+
+	if n == 0 {
+		return nil
+	}
+
+	out := make([]format.Format, n)
+	n = 0
 
 	for _, formats := range r.onDatas {
 		for forma := range formats {
-			out = append(out, forma)
+			out[n] = forma
+			n++
 		}
 	}
 
@@ -63,7 +76,7 @@ func (r *Reader) start() {
 	r.buffer = buffer
 	r.err = make(chan error)
 
-	r.discardedFrames = &counterdumper.CounterDumper{
+	r.discardedFrames = &counterdumper.Dumper{
 		OnReport: func(val uint64) {
 			r.Parent.Log(logger.Warn, "reader is too slow, discarding %d %s",
 				val,
diff --git a/internal/stream/rtp_decoder.go b/internal/stream/rtp_decoder.go
new file mode 100644
index 00000000..432a11c4
--- /dev/null
+++ b/internal/stream/rtp_decoder.go
@@ -0,0 +1,366 @@
+package stream
+
+import (
+	"errors"
+
+	"github.com/bluenviron/gortsplib/v5/pkg/format"
+	"github.com/bluenviron/gortsplib/v5/pkg/format/rtpac3"
+	"github.com/bluenviron/gortsplib/v5/pkg/format/rtpav1"
+	"github.com/bluenviron/gortsplib/v5/pkg/format/rtpfragmented"
+	"github.com/bluenviron/gortsplib/v5/pkg/format/rtph264"
+	"github.com/bluenviron/gortsplib/v5/pkg/format/rtph265"
+	"github.com/bluenviron/gortsplib/v5/pkg/format/rtpklv"
+	"github.com/bluenviron/gortsplib/v5/pkg/format/rtplpcm"
+	"github.com/bluenviron/gortsplib/v5/pkg/format/rtpmjpeg"
+	"github.com/bluenviron/gortsplib/v5/pkg/format/rtpmpeg1audio"
+	"github.com/bluenviron/gortsplib/v5/pkg/format/rtpmpeg1video"
+	"github.com/bluenviron/gortsplib/v5/pkg/format/rtpmpeg4audio"
+	"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"
+)
+
+type rtpDecoder interface {
+	decode(*rtp.Packet) (unit.Payload, error)
+}
+
+type rtpDecoderAV1 rtpav1.Decoder
+
+func (d *rtpDecoderAV1) decode(pkt *rtp.Packet) (unit.Payload, error) {
+	tu, err := (*rtpav1.Decoder)(d).Decode(pkt)
+	if err != nil {
+		if errors.Is(err, rtpav1.ErrNonStartingPacketAndNoPrevious) ||
+			errors.Is(err, rtpav1.ErrMorePacketsNeeded) {
+			return nil, nil
+		}
+		return nil, err
+	}
+
+	return unit.PayloadAV1(tu), nil
+}
+
+type rtpDecoderVP9 rtpvp9.Decoder
+
+func (d *rtpDecoderVP9) decode(pkt *rtp.Packet) (unit.Payload, error) {
+	frame, err := (*rtpvp9.Decoder)(d).Decode(pkt)
+	if err != nil {
+		if errors.Is(err, rtpvp9.ErrNonStartingPacketAndNoPrevious) ||
+			errors.Is(err, rtpvp9.ErrMorePacketsNeeded) {
+			return nil, nil
+		}
+		return nil, err
+	}
+
+	return unit.PayloadVP9(frame), nil
+}
+
+type rtpDecoderVP8 rtpvp8.Decoder
+
+func (d *rtpDecoderVP8) decode(pkt *rtp.Packet) (unit.Payload, error) {
+	frame, err := (*rtpvp8.Decoder)(d).Decode(pkt)
+	if err != nil {
+		if errors.Is(err, rtpvp8.ErrNonStartingPacketAndNoPrevious) ||
+			errors.Is(err, rtpvp8.ErrMorePacketsNeeded) {
+			return nil, nil
+		}
+		return nil, err
+	}
+
+	return unit.PayloadVP8(frame), nil
+}
+
+type rtpDecoderH265 rtph265.Decoder
+
+func (d *rtpDecoderH265) decode(pkt *rtp.Packet) (unit.Payload, error) {
+	au, err := (*rtph265.Decoder)(d).Decode(pkt)
+	if err != nil {
+		if errors.Is(err, rtph265.ErrNonStartingPacketAndNoPrevious) ||
+			errors.Is(err, rtph265.ErrMorePacketsNeeded) {
+			return nil, nil
+		}
+		return nil, err
+	}
+
+	return unit.PayloadH265(au), nil
+}
+
+type rtpDecoderH264 rtph264.Decoder
+
+func (d *rtpDecoderH264) decode(pkt *rtp.Packet) (unit.Payload, error) {
+	au, err := (*rtph264.Decoder)(d).Decode(pkt)
+	if err != nil {
+		if errors.Is(err, rtph264.ErrNonStartingPacketAndNoPrevious) ||
+			errors.Is(err, rtph264.ErrMorePacketsNeeded) {
+			return nil, nil
+		}
+		return nil, err
+	}
+
+	return unit.PayloadH264(au), nil
+}
+
+type rtpDecoderMPEG4Video rtpfragmented.Decoder
+
+func (d *rtpDecoderMPEG4Video) decode(pkt *rtp.Packet) (unit.Payload, error) {
+	frame, err := (*rtpfragmented.Decoder)(d).Decode(pkt)
+	if err != nil {
+		if errors.Is(err, rtpfragmented.ErrMorePacketsNeeded) {
+			return nil, nil
+		}
+		return nil, err
+	}
+
+	return unit.PayloadMPEG4Video(frame), nil
+}
+
+type rtpDecoderMPEG1Video rtpmpeg1video.Decoder
+
+func (d *rtpDecoderMPEG1Video) decode(pkt *rtp.Packet) (unit.Payload, error) {
+	frame, err := (*rtpmpeg1video.Decoder)(d).Decode(pkt)
+	if err != nil {
+		if errors.Is(err, rtpmpeg1video.ErrNonStartingPacketAndNoPrevious) ||
+			errors.Is(err, rtpmpeg1video.ErrMorePacketsNeeded) {
+			return nil, nil
+		}
+		return nil, err
+	}
+
+	return unit.PayloadMPEG1Video(frame), nil
+}
+
+type rtpDecoderMJPEG rtpmjpeg.Decoder
+
+func (d *rtpDecoderMJPEG) decode(pkt *rtp.Packet) (unit.Payload, error) {
+	frame, err := (*rtpmjpeg.Decoder)(d).Decode(pkt)
+	if err != nil {
+		if errors.Is(err, rtpmjpeg.ErrNonStartingPacketAndNoPrevious) ||
+			errors.Is(err, rtpmjpeg.ErrMorePacketsNeeded) {
+			return nil, nil
+		}
+		return nil, err
+	}
+
+	return unit.PayloadMJPEG(frame), nil
+}
+
+type rtpDecoderOpus rtpsimpleaudio.Decoder
+
+func (d *rtpDecoderOpus) decode(pkt *rtp.Packet) (unit.Payload, error) {
+	packet, err := (*rtpsimpleaudio.Decoder)(d).Decode(pkt)
+	if err != nil {
+		return nil, err
+	}
+
+	return unit.PayloadOpus{packet}, nil
+}
+
+type rtpDecoderMPEG4Audio rtpmpeg4audio.Decoder
+
+func (d *rtpDecoderMPEG4Audio) decode(pkt *rtp.Packet) (unit.Payload, error) {
+	aus, err := (*rtpmpeg4audio.Decoder)(d).Decode(pkt)
+	if err != nil {
+		if errors.Is(err, rtpmpeg4audio.ErrMorePacketsNeeded) {
+			return nil, nil
+		}
+		return nil, err
+	}
+
+	return unit.PayloadMPEG4Audio(aus), nil
+}
+
+type rtpDecoderMPEG4AudioLATM rtpfragmented.Decoder
+
+func (d *rtpDecoderMPEG4AudioLATM) decode(pkt *rtp.Packet) (unit.Payload, error) {
+	payload, err := (*rtpfragmented.Decoder)(d).Decode(pkt)
+	if err != nil {
+		if errors.Is(err, rtpfragmented.ErrMorePacketsNeeded) {
+			return nil, nil
+		}
+		return nil, err
+	}
+
+	return unit.PayloadMPEG4AudioLATM(payload), nil
+}
+
+type rtpDecoderMPEG1Audio rtpmpeg1audio.Decoder
+
+func (d *rtpDecoderMPEG1Audio) decode(pkt *rtp.Packet) (unit.Payload, error) {
+	frames, err := (*rtpmpeg1audio.Decoder)(d).Decode(pkt)
+	if err != nil {
+		if errors.Is(err, rtpmpeg1audio.ErrNonStartingPacketAndNoPrevious) ||
+			errors.Is(err, rtpmpeg1audio.ErrMorePacketsNeeded) {
+			return nil, nil
+		}
+		return nil, err
+	}
+
+	return unit.PayloadMPEG1Audio(frames), nil
+}
+
+type rtpDecoderAC3 rtpac3.Decoder
+
+func (d *rtpDecoderAC3) decode(pkt *rtp.Packet) (unit.Payload, error) {
+	frames, err := (*rtpac3.Decoder)(d).Decode(pkt)
+	if err != nil {
+		if errors.Is(err, rtpac3.ErrMorePacketsNeeded) {
+			return nil, nil
+		}
+		return nil, err
+	}
+
+	return unit.PayloadAC3(frames), nil
+}
+
+type rtpDecoderG711 rtplpcm.Decoder
+
+func (d *rtpDecoderG711) decode(pkt *rtp.Packet) (unit.Payload, error) {
+	samples, err := (*rtplpcm.Decoder)(d).Decode(pkt)
+	if err != nil {
+		return nil, err
+	}
+
+	return unit.PayloadG711(samples), nil
+}
+
+type rtpDecoderLPCM rtplpcm.Decoder
+
+func (d *rtpDecoderLPCM) decode(pkt *rtp.Packet) (unit.Payload, error) {
+	samples, err := (*rtplpcm.Decoder)(d).Decode(pkt)
+	if err != nil {
+		return nil, err
+	}
+
+	return unit.PayloadLPCM(samples), nil
+}
+
+type rtpDecoderKLV rtpklv.Decoder
+
+func (d *rtpDecoderKLV) decode(pkt *rtp.Packet) (unit.Payload, error) {
+	payload, err := (*rtpklv.Decoder)(d).Decode(pkt)
+	if err != nil {
+		return nil, err
+	}
+
+	return unit.PayloadKLV(payload), nil
+}
+
+func newRTPDecoder(forma format.Format) (rtpDecoder, error) {
+	switch forma := forma.(type) {
+	case *format.AV1:
+		wrapped, err := forma.CreateDecoder()
+		if err != nil {
+			return nil, err
+		}
+		return (*rtpDecoderAV1)(wrapped), nil
+
+	case *format.VP9:
+		wrapped, err := forma.CreateDecoder()
+		if err != nil {
+			return nil, err
+		}
+		return (*rtpDecoderVP9)(wrapped), nil
+
+	case *format.VP8:
+		wrapped, err := forma.CreateDecoder()
+		if err != nil {
+			return nil, err
+		}
+		return (*rtpDecoderVP8)(wrapped), nil
+
+	case *format.H265:
+		wrapped, err := forma.CreateDecoder()
+		if err != nil {
+			return nil, err
+		}
+		return (*rtpDecoderH265)(wrapped), nil
+
+	case *format.H264:
+		wrapped, err := forma.CreateDecoder()
+		if err != nil {
+			return nil, err
+		}
+		return (*rtpDecoderH264)(wrapped), nil
+
+	case *format.MPEG4Video:
+		wrapped, err := forma.CreateDecoder()
+		if err != nil {
+			return nil, err
+		}
+		return (*rtpDecoderMPEG4Video)(wrapped), nil
+
+	case *format.MPEG1Video:
+		wrapped, err := forma.CreateDecoder()
+		if err != nil {
+			return nil, err
+		}
+		return (*rtpDecoderMPEG1Video)(wrapped), nil
+
+	case *format.MJPEG:
+		wrapped, err := forma.CreateDecoder()
+		if err != nil {
+			return nil, err
+		}
+		return (*rtpDecoderMJPEG)(wrapped), nil
+
+	case *format.Opus:
+		wrapped, err := forma.CreateDecoder()
+		if err != nil {
+			return nil, err
+		}
+		return (*rtpDecoderOpus)(wrapped), nil
+
+	case *format.MPEG4Audio:
+		wrapped, err := forma.CreateDecoder()
+		if err != nil {
+			return nil, err
+		}
+		return (*rtpDecoderMPEG4Audio)(wrapped), nil
+
+	case *format.MPEG4AudioLATM:
+		wrapped, err := forma.CreateDecoder()
+		if err != nil {
+			return nil, err
+		}
+		return (*rtpDecoderMPEG4AudioLATM)(wrapped), nil
+
+	case *format.MPEG1Audio:
+		wrapped, err := forma.CreateDecoder()
+		if err != nil {
+			return nil, err
+		}
+		return (*rtpDecoderMPEG1Audio)(wrapped), nil
+
+	case *format.AC3:
+		wrapped, err := forma.CreateDecoder()
+		if err != nil {
+			return nil, err
+		}
+		return (*rtpDecoderAC3)(wrapped), nil
+
+	case *format.G711:
+		wrapped, err := forma.CreateDecoder()
+		if err != nil {
+			return nil, err
+		}
+		return (*rtpDecoderG711)(wrapped), nil
+
+	case *format.LPCM:
+		wrapped, err := forma.CreateDecoder()
+		if err != nil {
+			return nil, err
+		}
+		return (*rtpDecoderLPCM)(wrapped), nil
+
+	case *format.KLV:
+		wrapped, err := forma.CreateDecoder()
+		if err != nil {
+			return nil, err
+		}
+		return (*rtpDecoderKLV)(wrapped), nil
+
+	default:
+		return nil, nil
+	}
+}
diff --git a/internal/stream/rtp_encoder.go b/internal/stream/rtp_encoder.go
new file mode 100644
index 00000000..ca32063a
--- /dev/null
+++ b/internal/stream/rtp_encoder.go
@@ -0,0 +1,382 @@
+package stream
+
+import (
+	"github.com/bluenviron/gortsplib/v5/pkg/format"
+	"github.com/bluenviron/gortsplib/v5/pkg/format/rtpac3"
+	"github.com/bluenviron/gortsplib/v5/pkg/format/rtpav1"
+	"github.com/bluenviron/gortsplib/v5/pkg/format/rtpfragmented"
+	"github.com/bluenviron/gortsplib/v5/pkg/format/rtph264"
+	"github.com/bluenviron/gortsplib/v5/pkg/format/rtph265"
+	"github.com/bluenviron/gortsplib/v5/pkg/format/rtpklv"
+	"github.com/bluenviron/gortsplib/v5/pkg/format/rtplpcm"
+	"github.com/bluenviron/gortsplib/v5/pkg/format/rtpmjpeg"
+	"github.com/bluenviron/gortsplib/v5/pkg/format/rtpmpeg1audio"
+	"github.com/bluenviron/gortsplib/v5/pkg/format/rtpmpeg1video"
+	"github.com/bluenviron/gortsplib/v5/pkg/format/rtpmpeg4audio"
+	"github.com/bluenviron/gortsplib/v5/pkg/format/rtpsimpleaudio"
+	"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"
+)
+
+func ptrOf[T any](v T) *T {
+	return &v
+}
+
+type rtpEncoder interface {
+	encode(unit.Payload) ([]*rtp.Packet, error)
+}
+
+type rtpEncoderH265 rtph265.Encoder
+
+func (e *rtpEncoderH265) encode(payload unit.Payload) ([]*rtp.Packet, error) {
+	return (*rtph265.Encoder)(e).Encode(payload.(unit.PayloadH265))
+}
+
+type rtpEncoderH264 rtph264.Encoder
+
+func (e *rtpEncoderH264) encode(payload unit.Payload) ([]*rtp.Packet, error) {
+	return (*rtph264.Encoder)(e).Encode(payload.(unit.PayloadH264))
+}
+
+type rtpEncoderAV1 rtpav1.Encoder
+
+func (e *rtpEncoderAV1) encode(payload unit.Payload) ([]*rtp.Packet, error) {
+	return (*rtpav1.Encoder)(e).Encode(payload.(unit.PayloadAV1))
+}
+
+type rtpEncoderVP9 rtpvp9.Encoder
+
+func (e *rtpEncoderVP9) encode(payload unit.Payload) ([]*rtp.Packet, error) {
+	return (*rtpvp9.Encoder)(e).Encode(payload.(unit.PayloadVP9))
+}
+
+type rtpEncoderVP8 rtpvp8.Encoder
+
+func (e *rtpEncoderVP8) encode(payload unit.Payload) ([]*rtp.Packet, error) {
+	return (*rtpvp8.Encoder)(e).Encode(payload.(unit.PayloadVP8))
+}
+
+type rtpEncoderMPEG4Video rtpfragmented.Encoder
+
+func (e *rtpEncoderMPEG4Video) encode(payload unit.Payload) ([]*rtp.Packet, error) {
+	return (*rtpfragmented.Encoder)(e).Encode(payload.(unit.PayloadMPEG4Video))
+}
+
+type rtpEncoderMPEG1Video rtpmpeg1video.Encoder
+
+func (e *rtpEncoderMPEG1Video) encode(payload unit.Payload) ([]*rtp.Packet, error) {
+	return (*rtpmpeg1video.Encoder)(e).Encode(payload.(unit.PayloadMPEG1Video))
+}
+
+type rtpEncoderMJPEG rtpmjpeg.Encoder
+
+func (e *rtpEncoderMJPEG) encode(payload unit.Payload) ([]*rtp.Packet, error) {
+	return (*rtpmjpeg.Encoder)(e).Encode(payload.(unit.PayloadMJPEG))
+}
+
+type rtpEncoderOpus rtpsimpleaudio.Encoder
+
+func (e *rtpEncoderOpus) encode(payload unit.Payload) ([]*rtp.Packet, error) {
+	pts := int64(0)
+	packets := make([]*rtp.Packet, len(payload.(unit.PayloadOpus)))
+
+	for i, packet := range payload.(unit.PayloadOpus) {
+		pkt, err := (*rtpsimpleaudio.Encoder)(e).Encode(packet)
+		if err != nil {
+			return nil, err
+		}
+
+		pkt.Timestamp += uint32(pts)
+		pts += mcopus.PacketDuration2(packet)
+		packets[i] = pkt
+	}
+
+	return packets, nil
+}
+
+type rtpEncoderMPEG4Audio rtpmpeg4audio.Encoder
+
+func (e *rtpEncoderMPEG4Audio) encode(payload unit.Payload) ([]*rtp.Packet, error) {
+	return (*rtpmpeg4audio.Encoder)(e).Encode(payload.(unit.PayloadMPEG4Audio))
+}
+
+type rtpEncoderMPEG4AudioLATM rtpfragmented.Encoder
+
+func (e *rtpEncoderMPEG4AudioLATM) encode(payload unit.Payload) ([]*rtp.Packet, error) {
+	return (*rtpfragmented.Encoder)(e).Encode(payload.(unit.PayloadMPEG4AudioLATM))
+}
+
+type rtpEncoderMPEG1Audio rtpmpeg1audio.Encoder
+
+func (e *rtpEncoderMPEG1Audio) encode(payload unit.Payload) ([]*rtp.Packet, error) {
+	return (*rtpmpeg1audio.Encoder)(e).Encode(payload.(unit.PayloadMPEG1Audio))
+}
+
+type rtpEncoderAC3 rtpac3.Encoder
+
+func (e *rtpEncoderAC3) encode(payload unit.Payload) ([]*rtp.Packet, error) {
+	return (*rtpac3.Encoder)(e).Encode(payload.(unit.PayloadAC3))
+}
+
+type rtpEncoderG711 rtplpcm.Encoder
+
+func (e *rtpEncoderG711) encode(payload unit.Payload) ([]*rtp.Packet, error) {
+	return (*rtplpcm.Encoder)(e).Encode(payload.(unit.PayloadG711))
+}
+
+type rtpEncoderLPCM rtplpcm.Encoder
+
+func (e *rtpEncoderLPCM) encode(payload unit.Payload) ([]*rtp.Packet, error) {
+	return (*rtplpcm.Encoder)(e).Encode(payload.(unit.PayloadLPCM))
+}
+
+type rtpEncoderKLV rtpklv.Encoder
+
+func (e *rtpEncoderKLV) encode(payload unit.Payload) ([]*rtp.Packet, error) {
+	return (*rtpklv.Encoder)(e).Encode(payload.(unit.PayloadKLV))
+}
+
+func newRTPEncoder(
+	forma format.Format,
+	rtpMaxPayloadSize int,
+	ssrc *uint32,
+	initialSequenceNumber *uint16,
+) (rtpEncoder, error) {
+	switch forma := forma.(type) {
+	case *format.H265:
+		wrapped := &rtph265.Encoder{
+			PayloadMaxSize:        rtpMaxPayloadSize,
+			PayloadType:           forma.PayloadTyp,
+			SSRC:                  ssrc,
+			InitialSequenceNumber: initialSequenceNumber,
+			MaxDONDiff:            forma.MaxDONDiff,
+		}
+		err := wrapped.Init()
+		if err != nil {
+			return nil, err
+		}
+
+		return (*rtpEncoderH265)(wrapped), nil
+
+	case *format.H264:
+		wrapped := &rtph264.Encoder{
+			PayloadMaxSize:        rtpMaxPayloadSize,
+			PayloadType:           forma.PayloadTyp,
+			SSRC:                  ssrc,
+			InitialSequenceNumber: initialSequenceNumber,
+			PacketizationMode:     forma.PacketizationMode,
+		}
+		err := wrapped.Init()
+		if err != nil {
+			return nil, err
+		}
+
+		return (*rtpEncoderH264)(wrapped), nil
+
+	case *format.AV1:
+		wrapped := &rtpav1.Encoder{
+			PayloadMaxSize:        rtpMaxPayloadSize,
+			PayloadType:           forma.PayloadTyp,
+			SSRC:                  ssrc,
+			InitialSequenceNumber: initialSequenceNumber,
+		}
+		err := wrapped.Init()
+		if err != nil {
+			return nil, err
+		}
+
+		return (*rtpEncoderAV1)(wrapped), nil
+
+	case *format.VP9:
+		wrapped := &rtpvp9.Encoder{
+			PayloadMaxSize:        rtpMaxPayloadSize,
+			PayloadType:           forma.PayloadTyp,
+			SSRC:                  ssrc,
+			InitialSequenceNumber: initialSequenceNumber,
+			InitialPictureID:      ptrOf(uint16(0x35af)),
+		}
+		err := wrapped.Init()
+		if err != nil {
+			return nil, err
+		}
+
+		return (*rtpEncoderVP9)(wrapped), nil
+
+	case *format.VP8:
+		wrapped := &rtpvp8.Encoder{
+			PayloadMaxSize:        rtpMaxPayloadSize,
+			PayloadType:           forma.PayloadTyp,
+			SSRC:                  ssrc,
+			InitialSequenceNumber: initialSequenceNumber,
+		}
+		err := wrapped.Init()
+		if err != nil {
+			return nil, err
+		}
+
+		return (*rtpEncoderVP8)(wrapped), nil
+
+	case *format.MPEG4Video:
+		wrapped := &rtpfragmented.Encoder{
+			PayloadMaxSize:        rtpMaxPayloadSize,
+			PayloadType:           forma.PayloadTyp,
+			SSRC:                  ssrc,
+			InitialSequenceNumber: initialSequenceNumber,
+		}
+		err := wrapped.Init()
+		if err != nil {
+			return nil, err
+		}
+
+		return (*rtpEncoderMPEG4Video)(wrapped), nil
+
+	case *format.MPEG1Video:
+		wrapped := &rtpmpeg1video.Encoder{
+			PayloadMaxSize:        rtpMaxPayloadSize,
+			SSRC:                  ssrc,
+			InitialSequenceNumber: initialSequenceNumber,
+		}
+		err := wrapped.Init()
+		if err != nil {
+			return nil, err
+		}
+
+		return (*rtpEncoderMPEG1Video)(wrapped), nil
+
+	case *format.MJPEG:
+		wrapped := &rtpmjpeg.Encoder{
+			PayloadMaxSize:        rtpMaxPayloadSize,
+			SSRC:                  ssrc,
+			InitialSequenceNumber: initialSequenceNumber,
+		}
+		err := wrapped.Init()
+		if err != nil {
+			return nil, err
+		}
+
+		return (*rtpEncoderMJPEG)(wrapped), nil
+
+	case *format.Opus:
+		wrapped := &rtpsimpleaudio.Encoder{
+			PayloadMaxSize:        rtpMaxPayloadSize,
+			PayloadType:           forma.PayloadTyp,
+			SSRC:                  ssrc,
+			InitialSequenceNumber: initialSequenceNumber,
+		}
+		err := wrapped.Init()
+		if err != nil {
+			return nil, err
+		}
+
+		return (*rtpEncoderOpus)(wrapped), nil
+
+	case *format.MPEG4Audio:
+		wrapped := &rtpmpeg4audio.Encoder{
+			PayloadMaxSize:        rtpMaxPayloadSize,
+			PayloadType:           forma.PayloadTyp,
+			SSRC:                  ssrc,
+			InitialSequenceNumber: initialSequenceNumber,
+			SizeLength:            forma.SizeLength,
+			IndexLength:           forma.IndexLength,
+			IndexDeltaLength:      forma.IndexDeltaLength,
+		}
+		err := wrapped.Init()
+		if err != nil {
+			return nil, err
+		}
+
+		return (*rtpEncoderMPEG4Audio)(wrapped), nil
+
+	case *format.MPEG4AudioLATM:
+		wrapped := &rtpfragmented.Encoder{
+			PayloadMaxSize:        rtpMaxPayloadSize,
+			PayloadType:           forma.PayloadTyp,
+			SSRC:                  ssrc,
+			InitialSequenceNumber: initialSequenceNumber,
+		}
+		err := wrapped.Init()
+		if err != nil {
+			return nil, err
+		}
+
+		return (*rtpEncoderMPEG4AudioLATM)(wrapped), nil
+
+	case *format.MPEG1Audio:
+		wrapped := &rtpmpeg1audio.Encoder{
+			PayloadMaxSize:        rtpMaxPayloadSize,
+			SSRC:                  ssrc,
+			InitialSequenceNumber: initialSequenceNumber,
+		}
+		err := wrapped.Init()
+		if err != nil {
+			return nil, err
+		}
+
+		return (*rtpEncoderMPEG1Audio)(wrapped), nil
+
+	case *format.AC3:
+		wrapped := &rtpac3.Encoder{
+			PayloadType:           forma.PayloadTyp,
+			SSRC:                  ssrc,
+			InitialSequenceNumber: initialSequenceNumber,
+		}
+		err := wrapped.Init()
+		if err != nil {
+			return nil, err
+		}
+
+		return (*rtpEncoderAC3)(wrapped), nil
+
+	case *format.G711:
+		wrapped := &rtplpcm.Encoder{
+			PayloadMaxSize:        rtpMaxPayloadSize,
+			PayloadType:           forma.PayloadType(),
+			SSRC:                  ssrc,
+			InitialSequenceNumber: initialSequenceNumber,
+			BitDepth:              8,
+			ChannelCount:          forma.ChannelCount,
+		}
+		err := wrapped.Init()
+		if err != nil {
+			return nil, err
+		}
+
+		return (*rtpEncoderG711)(wrapped), nil
+
+	case *format.LPCM:
+		wrapped := &rtplpcm.Encoder{
+			PayloadMaxSize:        rtpMaxPayloadSize,
+			PayloadType:           forma.PayloadTyp,
+			SSRC:                  ssrc,
+			InitialSequenceNumber: initialSequenceNumber,
+			BitDepth:              forma.BitDepth,
+			ChannelCount:          forma.ChannelCount,
+		}
+		err := wrapped.Init()
+		if err != nil {
+			return nil, err
+		}
+
+		return (*rtpEncoderLPCM)(wrapped), nil
+
+	case *format.KLV:
+		wrapped := &rtpklv.Encoder{
+			PayloadMaxSize:        rtpMaxPayloadSize,
+			PayloadType:           forma.PayloadTyp,
+			SSRC:                  ssrc,
+			InitialSequenceNumber: initialSequenceNumber,
+		}
+		err := wrapped.Init()
+		if err != nil {
+			return nil, err
+		}
+
+		return (*rtpEncoderKLV)(wrapped), nil
+
+	default:
+		return nil, nil
+	}
+}
diff --git a/internal/stream/stream.go b/internal/stream/stream.go
index d066cfea..bdd46dc0 100644
--- a/internal/stream/stream.go
+++ b/internal/stream/stream.go
@@ -11,20 +11,20 @@ import (
 	"github.com/bluenviron/gortsplib/v5/pkg/format"
 	"github.com/pion/rtp"
 
-	"github.com/bluenviron/mediamtx/internal/counterdumper"
+	"github.com/bluenviron/mediamtx/internal/errordumper"
 	"github.com/bluenviron/mediamtx/internal/logger"
 	"github.com/bluenviron/mediamtx/internal/unit"
 )
 
 // Stream is a media stream.
-// It stores tracks, readers and allows to write data to readers, converting it when needed.
+// It stores tracks, readers and allows to write data to readers, remuxing it when needed.
 type Stream struct {
-	WriteQueueSize     int
-	RTPMaxPayloadSize  int
-	Desc               *description.Session
-	GenerateRTPPackets bool
-	FillNTP            bool
-	Parent             logger.Writer
+	Desc              *description.Session
+	UseRTPPackets     bool
+	WriteQueueSize    int
+	RTPMaxPayloadSize int
+	ReplaceNTP        bool
+	Parent            logger.Writer
 
 	bytesReceived    *uint64
 	bytesSent        *uint64
@@ -33,7 +33,9 @@ type Stream struct {
 	rtspStream       *gortsplib.ServerStream
 	rtspsStream      *gortsplib.ServerStream
 	readers          map[*Reader]struct{}
-	processingErrors *counterdumper.CounterDumper
+	processingErrors *errordumper.Dumper
+
+	hasReaders chan struct{}
 }
 
 // Initialize initializes a Stream.
@@ -42,29 +44,30 @@ func (s *Stream) Initialize() error {
 	s.bytesSent = new(uint64)
 	s.medias = make(map[*description.Media]*streamMedia)
 	s.readers = make(map[*Reader]struct{})
+	s.hasReaders = make(chan struct{})
 
-	s.processingErrors = &counterdumper.CounterDumper{
-		OnReport: func(val uint64) {
-			s.Parent.Log(logger.Warn, "%d processing %s",
-				val,
-				func() string {
-					if val == 1 {
-						return "error"
-					}
-					return "errors"
-				}())
+	s.processingErrors = &errordumper.Dumper{
+		OnReport: func(val uint64, last error) {
+			if val == 1 {
+				s.Parent.Log(logger.Warn, "processing error: %v", last)
+			} else {
+				s.Parent.Log(logger.Warn, "%d processing errors, last was: %v", val, last)
+			}
 		},
 	}
 	s.processingErrors.Start()
 
 	for _, media := range s.Desc.Medias {
 		s.medias[media] = &streamMedia{
-			rtpMaxPayloadSize:  s.RTPMaxPayloadSize,
-			media:              media,
-			generateRTPPackets: s.GenerateRTPPackets,
-			fillNTP:            s.FillNTP,
-			processingErrors:   s.processingErrors,
-			parent:             s.Parent,
+			media:             media,
+			useRTPPackets:     s.UseRTPPackets,
+			rtpMaxPayloadSize: s.RTPMaxPayloadSize,
+			replaceNTP:        s.ReplaceNTP,
+			onBytesReceived:   s.onBytesReceived,
+			onBytesSent:       s.onBytesSent,
+			writeRTSP:         s.writeRTSP,
+			processingErrors:  s.processingErrors,
+			parent:            s.Parent,
 		}
 		err := s.medias[media].initialize()
 		if err != nil {
@@ -166,6 +169,12 @@ func (s *Stream) AddReader(r *Reader) {
 
 	r.queueSize = s.WriteQueueSize
 	r.start()
+
+	select {
+	case <-s.hasReaders:
+	default:
+		close(s.hasReaders)
+	}
 }
 
 // RemoveReader removes a reader.
@@ -188,6 +197,11 @@ func (s *Stream) RemoveReader(r *Reader) {
 	delete(s.readers, r)
 }
 
+// WaitForReaders waits for the stream to have at least one reader.
+func (s *Stream) WaitForReaders() {
+	<-s.hasReaders
+}
+
 // WriteUnit writes a Unit.
 func (s *Stream) WriteUnit(medi *description.Media, forma format.Format, u *unit.Unit) {
 	sm := s.medias[medi]
@@ -196,22 +210,27 @@ func (s *Stream) WriteUnit(medi *description.Media, forma format.Format, u *unit
 	s.mutex.RLock()
 	defer s.mutex.RUnlock()
 
-	sf.writeUnit(s, medi, u)
+	sf.writeUnit(u)
 }
 
-// WriteRTPPacket writes a RTP packet.
-func (s *Stream) WriteRTPPacket(
-	medi *description.Media,
-	forma format.Format,
-	pkt *rtp.Packet,
-	ntp time.Time,
-	pts int64,
-) {
-	sm := s.medias[medi]
-	sf := sm.formats[forma]
-
-	s.mutex.RLock()
-	defer s.mutex.RUnlock()
-
-	sf.writeRTPPacket(s, medi, pkt, ntp, pts)
+func (s *Stream) onBytesReceived(v uint64) {
+	atomic.AddUint64(s.bytesReceived, v)
+}
+
+func (s *Stream) onBytesSent(v uint64) {
+	atomic.AddUint64(s.bytesSent, v)
+}
+
+func (s *Stream) writeRTSP(medi *description.Media, pkts []*rtp.Packet, ntp time.Time) {
+	if s.rtspStream != nil {
+		for _, pkt := range pkts {
+			s.rtspStream.WritePacketRTPWithNTP(medi, pkt, ntp) //nolint:errcheck
+		}
+	}
+
+	if s.rtspsStream != nil {
+		for _, pkt := range pkts {
+			s.rtspsStream.WritePacketRTPWithNTP(medi, pkt, ntp) //nolint:errcheck
+		}
+	}
 }
diff --git a/internal/stream/stream_format.go b/internal/stream/stream_format.go
index 30ad5296..ff221976 100644
--- a/internal/stream/stream_format.go
+++ b/internal/stream/stream_format.go
@@ -1,15 +1,15 @@
 package stream
 
 import (
-	"sync/atomic"
+	"crypto/rand"
+	"fmt"
 	"time"
 
 	"github.com/bluenviron/gortsplib/v5/pkg/description"
 	"github.com/bluenviron/gortsplib/v5/pkg/format"
 	"github.com/pion/rtp"
 
-	"github.com/bluenviron/mediamtx/internal/codecprocessor"
-	"github.com/bluenviron/mediamtx/internal/counterdumper"
+	"github.com/bluenviron/mediamtx/internal/errordumper"
 	"github.com/bluenviron/mediamtx/internal/logger"
 	"github.com/bluenviron/mediamtx/internal/ntpestimator"
 	"github.com/bluenviron/mediamtx/internal/unit"
@@ -23,98 +23,172 @@ func unitSize(u *unit.Unit) uint64 {
 	return n
 }
 
-type streamFormat struct {
-	rtpMaxPayloadSize  int
-	format             format.Format
-	generateRTPPackets bool
-	fillNTP            bool
-	processingErrors   *counterdumper.CounterDumper
-	parent             logger.Writer
+func randUint32() (uint32, error) {
+	var b [4]byte
+	_, err := rand.Read(b[:])
+	if err != nil {
+		return 0, err
+	}
+	return uint32(b[0])<<24 | uint32(b[1])<<16 | uint32(b[2])<<8 | uint32(b[3]), nil
+}
 
-	proc         codecprocessor.Processor
-	ntpEstimator *ntpestimator.Estimator
-	onDatas      map[*Reader]OnDataFunc
+type streamFormat struct {
+	format            format.Format
+	media             *description.Media
+	useRTPPackets     bool
+	rtpMaxPayloadSize int
+	replaceNTP        bool
+	processingErrors  *errordumper.Dumper
+	onBytesReceived   func(uint64)
+	onBytesSent       func(uint64)
+	writeRTSP         func(*description.Media, []*rtp.Packet, time.Time)
+	parent            logger.Writer
+
+	rtpDecoder    rtpDecoder
+	formatUpdater formatUpdater
+	unitRemuxer   unitRemuxer
+	rtpEncoder    rtpEncoder
+	ptsOffset     uint32
+	ntpEstimator  *ntpestimator.Estimator
+	onDatas       map[*Reader]OnDataFunc
 }
 
 func (sf *streamFormat) initialize() error {
 	sf.onDatas = make(map[*Reader]OnDataFunc)
 
-	var err error
-	sf.proc, err = codecprocessor.New(sf.rtpMaxPayloadSize, sf.format, sf.generateRTPPackets, sf.parent)
-	if err != nil {
-		return err
+	if sf.useRTPPackets {
+		var err error
+		sf.rtpDecoder, err = newRTPDecoder(sf.format)
+		if err != nil {
+			return err
+		}
 	}
 
-	sf.ntpEstimator = &ntpestimator.Estimator{
-		ClockRate: sf.format.ClockRate(),
+	sf.formatUpdater = newFormatUpdater(sf.format)
+	sf.unitRemuxer = newUnitRemuxer(sf.format)
+
+	if !sf.useRTPPackets {
+		var err error
+		sf.rtpEncoder, err = newRTPEncoder(sf.format, sf.rtpMaxPayloadSize, nil, nil)
+		if err != nil {
+			return err
+		}
+
+		if sf.rtpEncoder == nil {
+			return fmt.Errorf("RTP encoder not available for format %T", sf.format)
+		}
+
+		sf.ptsOffset, err = randUint32()
+		if err != nil {
+			return err
+		}
+	}
+
+	if sf.replaceNTP {
+		sf.ntpEstimator = &ntpestimator.Estimator{
+			ClockRate: sf.format.ClockRate(),
+		}
 	}
 
 	return nil
 }
 
-func (sf *streamFormat) writeUnit(s *Stream, medi *description.Media, u *unit.Unit) {
-	err := sf.proc.ProcessUnit(u)
+func (sf *streamFormat) writeUnit(u *unit.Unit) {
+	err := sf.writeUnitInner(u)
 	if err != nil {
-		sf.processingErrors.Increase()
+		sf.processingErrors.Add(err)
 		return
 	}
-
-	sf.writeUnitInner(s, medi, u)
 }
 
-func (sf *streamFormat) writeRTPPacket(
-	s *Stream,
-	medi *description.Media,
-	pkt *rtp.Packet,
-	ntp time.Time,
-	pts int64,
-) {
-	hasNonRTSPReaders := len(sf.onDatas) > 0
+func (sf *streamFormat) writeUnitInner(u *unit.Unit) error {
+	if sf.useRTPPackets {
+		if len(u.RTPPackets) != 1 {
+			panic("should not happen")
+		}
+		if !u.NilPayload() {
+			panic("should not happen")
+		}
 
-	u := &unit.Unit{
-		PTS:        pts,
-		NTP:        ntp,
-		RTPPackets: []*rtp.Packet{pkt},
+		if sf.rtpDecoder != nil {
+			var err error
+			u.Payload, err = sf.rtpDecoder.decode(u.RTPPackets[0])
+			if err != nil {
+				return err
+			}
+		}
+
+		if sf.rtpEncoder == nil {
+			for _, pkt := range u.RTPPackets {
+				if len(pkt.Payload) > sf.rtpMaxPayloadSize {
+					var err error
+					sf.rtpEncoder, err = newRTPEncoder(sf.format, sf.rtpMaxPayloadSize, ptrOf(pkt.SSRC), ptrOf(pkt.SequenceNumber))
+					if err != nil {
+						return err
+					}
+
+					if sf.rtpEncoder == nil {
+						return fmt.Errorf("RTP payload size (%d) is greater than maximum allowed (%d)",
+							len(pkt.Payload), sf.rtpMaxPayloadSize)
+					}
+
+					sf.ptsOffset = pkt.Timestamp - uint32(u.PTS)
+
+					sf.parent.Log(logger.Info, "RTP packets are too big, remuxing them into smaller ones")
+					break
+				}
+			}
+		}
+
+		if sf.rtpEncoder != nil {
+			u.RTPPackets = nil
+		}
+	} else {
+		if len(u.RTPPackets) != 0 {
+			panic("should not happen")
+		}
+		if u.NilPayload() {
+			panic("should not happen")
+		}
 	}
 
-	err := sf.proc.ProcessRTPPacket(u, hasNonRTSPReaders)
-	if err != nil {
-		sf.processingErrors.Increase()
-		return
+	if !u.NilPayload() {
+		sf.formatUpdater(sf.format, u.Payload)
+
+		u.Payload = sf.unitRemuxer(sf.format, u.Payload)
+
+		if sf.rtpEncoder != nil && !u.NilPayload() {
+			var err error
+			u.RTPPackets, err = sf.rtpEncoder.encode(u.Payload)
+			if err != nil {
+				return err
+			}
+
+			for _, pkt := range u.RTPPackets {
+				pkt.Timestamp += sf.ptsOffset + uint32(u.PTS)
+			}
+		}
 	}
 
-	sf.writeUnitInner(s, medi, u)
-}
-
-func (sf *streamFormat) writeUnitInner(s *Stream, medi *description.Media, u *unit.Unit) {
-	if sf.fillNTP {
+	if sf.replaceNTP {
 		u.NTP = sf.ntpEstimator.Estimate(u.PTS)
 	}
 
 	size := unitSize(u)
+	sf.onBytesReceived(size)
 
-	atomic.AddUint64(s.bytesReceived, size)
-
-	if s.rtspStream != nil {
-		for _, pkt := range u.RTPPackets {
-			s.rtspStream.WritePacketRTPWithNTP(medi, pkt, u.NTP) //nolint:errcheck
-		}
-	}
-
-	if s.rtspsStream != nil {
-		for _, pkt := range u.RTPPackets {
-			s.rtspsStream.WritePacketRTPWithNTP(medi, pkt, u.NTP) //nolint:errcheck
-		}
-	}
+	sf.writeRTSP(sf.media, u.RTPPackets, u.NTP)
 
 	for sr, onData := range sf.onDatas {
 		csr := sr
 		cOnData := onData
 		sr.push(func() error {
 			if !csr.SkipBytesSent {
-				atomic.AddUint64(s.bytesSent, size)
+				sf.onBytesSent(size)
 			}
 			return cOnData(u)
 		})
 	}
+
+	return nil
 }
diff --git a/internal/stream/stream_media.go b/internal/stream/stream_media.go
index a0037c05..c5933e96 100644
--- a/internal/stream/stream_media.go
+++ b/internal/stream/stream_media.go
@@ -1,19 +1,25 @@
 package stream
 
 import (
+	"time"
+
 	"github.com/bluenviron/gortsplib/v5/pkg/description"
 	"github.com/bluenviron/gortsplib/v5/pkg/format"
-	"github.com/bluenviron/mediamtx/internal/counterdumper"
+	"github.com/bluenviron/mediamtx/internal/errordumper"
 	"github.com/bluenviron/mediamtx/internal/logger"
+	"github.com/pion/rtp"
 )
 
 type streamMedia struct {
-	rtpMaxPayloadSize  int
-	media              *description.Media
-	generateRTPPackets bool
-	fillNTP            bool
-	processingErrors   *counterdumper.CounterDumper
-	parent             logger.Writer
+	media             *description.Media
+	useRTPPackets     bool
+	rtpMaxPayloadSize int
+	replaceNTP        bool
+	onBytesReceived   func(uint64)
+	onBytesSent       func(uint64)
+	writeRTSP         func(*description.Media, []*rtp.Packet, time.Time)
+	processingErrors  *errordumper.Dumper
+	parent            logger.Writer
 
 	formats map[format.Format]*streamFormat
 }
@@ -23,12 +29,16 @@ func (sm *streamMedia) initialize() error {
 
 	for _, forma := range sm.media.Formats {
 		sf := &streamFormat{
-			rtpMaxPayloadSize:  sm.rtpMaxPayloadSize,
-			format:             forma,
-			generateRTPPackets: sm.generateRTPPackets,
-			fillNTP:            sm.fillNTP,
-			processingErrors:   sm.processingErrors,
-			parent:             sm.parent,
+			format:            forma,
+			media:             sm.media,
+			useRTPPackets:     sm.useRTPPackets,
+			rtpMaxPayloadSize: sm.rtpMaxPayloadSize,
+			replaceNTP:        sm.replaceNTP,
+			processingErrors:  sm.processingErrors,
+			onBytesReceived:   sm.onBytesReceived,
+			onBytesSent:       sm.onBytesSent,
+			writeRTSP:         sm.writeRTSP,
+			parent:            sm.parent,
 		}
 		err := sf.initialize()
 		if err != nil {
diff --git a/internal/stream/stream_test.go b/internal/stream/stream_test.go
index 255e2fd2..559a13d3 100644
--- a/internal/stream/stream_test.go
+++ b/internal/stream/stream_test.go
@@ -5,10 +5,17 @@ import (
 
 	"github.com/bluenviron/gortsplib/v5/pkg/description"
 	"github.com/bluenviron/gortsplib/v5/pkg/format"
+	"github.com/bluenviron/mediamtx/internal/logger"
 	"github.com/bluenviron/mediamtx/internal/unit"
+	"github.com/pion/rtp"
 	"github.com/stretchr/testify/require"
 )
 
+type nilLogger struct{}
+
+func (nilLogger) Log(logger.Level, string, ...any) {
+}
+
 func TestStream(t *testing.T) {
 	desc := &description.Session{Medias: []*description.Media{
 		{
@@ -22,10 +29,10 @@ func TestStream(t *testing.T) {
 	}}
 
 	strm := &Stream{
-		WriteQueueSize:     512,
-		RTPMaxPayloadSize:  1450,
-		Desc:               desc,
-		GenerateRTPPackets: true,
+		Desc:              desc,
+		UseRTPPackets:     false,
+		WriteQueueSize:    512,
+		RTPMaxPayloadSize: 1450,
 	}
 	err := strm.Initialize()
 	require.NoError(t, err)
@@ -69,10 +76,9 @@ func TestStreamSkipBytesSent(t *testing.T) {
 	}}
 
 	strm := &Stream{
-		WriteQueueSize:     512,
-		RTPMaxPayloadSize:  1450,
-		Desc:               desc,
-		GenerateRTPPackets: true,
+		Desc:              desc,
+		WriteQueueSize:    512,
+		RTPMaxPayloadSize: 1450,
 	}
 	err := strm.Initialize()
 	require.NoError(t, err)
@@ -104,3 +110,1169 @@ func TestStreamSkipBytesSent(t *testing.T) {
 	require.Equal(t, uint64(14), strm.BytesReceived())
 	require.Equal(t, uint64(0), strm.BytesSent())
 }
+
+func TestStreamResizeOversizedRTPPackets(t *testing.T) {
+	desc := &description.Session{Medias: []*description.Media{
+		{
+			Type: description.MediaTypeVideo,
+			Formats: []format.Format{&format.H264{
+				SPS: []byte{ // 1920x1080 baseline
+					0x67, 0x42, 0xc0, 0x28, 0xd9, 0x00, 0x78, 0x02,
+					0x27, 0xe5, 0x84, 0x00, 0x00, 0x03, 0x00, 0x04,
+					0x00, 0x00, 0x03, 0x00, 0xf0, 0x3c, 0x60, 0xc9, 0x20,
+				},
+				PPS: []byte{0x08, 0x06, 0x07, 0x08},
+			}},
+		},
+	}}
+
+	strm := &Stream{
+		Desc:              desc,
+		UseRTPPackets:     true,
+		WriteQueueSize:    512,
+		RTPMaxPayloadSize: 400,
+		Parent:            &nilLogger{},
+	}
+	err := strm.Initialize()
+	require.NoError(t, err)
+	defer strm.Close()
+
+	r := &Reader{}
+
+	recv := make(chan *unit.Unit)
+	n := 0
+
+	r.OnData(desc.Medias[0], desc.Medias[0].Formats[0], func(u *unit.Unit) error {
+		switch n {
+		case 0:
+		case 1:
+			recv <- u
+		default:
+			t.Error("should not happen")
+		}
+		n++
+		return nil
+	})
+
+	strm.AddReader(r)
+	defer strm.RemoveReader(r)
+
+	strm.WriteUnit(desc.Medias[0], desc.Medias[0].Formats[0], &unit.Unit{
+		PTS: 90000,
+		RTPPackets: []*rtp.Packet{
+			{
+				Header: rtp.Header{
+					Version:        2,
+					Marker:         true,
+					PayloadType:    96,
+					SequenceNumber: 122,
+					Timestamp:      45343,
+					SSRC:           563423,
+				},
+				Payload: []byte{1, 2, 3, 4},
+			},
+		},
+	})
+
+	oversizedPayload := make([]byte, 1000)
+	for i := range oversizedPayload {
+		oversizedPayload[i] = byte(i % 256)
+	}
+
+	strm.WriteUnit(desc.Medias[0], desc.Medias[0].Formats[0], &unit.Unit{
+		PTS: 90000,
+		RTPPackets: []*rtp.Packet{
+			{
+				Header: rtp.Header{
+					Version:        2,
+					Marker:         true,
+					PayloadType:    96,
+					SequenceNumber: 123,
+					Timestamp:      45343,
+					SSRC:           563423,
+				},
+				Payload: oversizedPayload,
+			},
+		},
+	})
+
+	received := <-recv
+
+	require.Equal(t, 3, len(received.RTPPackets))
+
+	for i, pkt := range received.RTPPackets {
+		require.Equal(t, 123+uint16(i), pkt.SequenceNumber)
+		require.Equal(t, uint32(45343), pkt.Timestamp)
+	}
+
+	totalPayloadSize := 0
+	for _, pkt := range received.RTPPackets {
+		require.LessOrEqual(t, len(pkt.Payload), 400)
+		totalPayloadSize += len(pkt.Payload)
+	}
+
+	require.Equal(t, 1005, totalPayloadSize)
+}
+
+func TestStreamUpdateFormatParams(t *testing.T) {
+	for _, ca := range []string{"h264", "h265", "mpeg4video"} {
+		t.Run(ca, func(t *testing.T) {
+			var desc *description.Session
+			var media *description.Media
+			var forma format.Format
+			var u *unit.Unit
+
+			switch ca {
+			case "h264":
+				sps := []byte{
+					0x67, 0x64, 0x00, 0x20, 0xac, 0xd9, 0x40, 0x78,
+					0x02, 0x27, 0xe5, 0x9a, 0x80, 0x80, 0x80, 0xa0,
+				}
+				pps := []byte{0x08, 0x07, 0x08, 0x09}
+
+				formatH264 := &format.H264{
+					SPS: []byte{0x67, 0x42, 0xc0, 0x28},
+					PPS: []byte{0x08, 0x06},
+				}
+
+				desc = &description.Session{Medias: []*description.Media{{
+					Type:    description.MediaTypeVideo,
+					Formats: []format.Format{formatH264},
+				}}}
+				media = desc.Medias[0]
+				forma = formatH264
+
+				u = &unit.Unit{
+					PTS: 90000,
+					Payload: unit.PayloadH264{
+						sps,    // New SPS
+						pps,    // New PPS
+						{5, 1}, // IDR
+					},
+				}
+
+			case "h265":
+				vps := []byte{0x40, 0x01, 0x0c, 0x01, 0xff, 0xfe}
+				sps := []byte{0x42, 0x01, 0x01, 0x01, 0x60, 0x00, 0x00, 0x04}
+				pps := []byte{0x44, 0x01, 0xc1, 0x73, 0xd1, 0x8a}
+
+				formatH265 := &format.H265{
+					VPS: []byte{0x40, 0x01, 0x0c},
+					SPS: []byte{0x42, 0x01, 0x01},
+					PPS: []byte{0x44, 0x01, 0xc1},
+				}
+
+				desc = &description.Session{Medias: []*description.Media{{
+					Type:    description.MediaTypeVideo,
+					Formats: []format.Format{formatH265},
+				}}}
+				media = desc.Medias[0]
+				forma = formatH265
+
+				u = &unit.Unit{
+					PTS: 90000,
+					Payload: unit.PayloadH265{
+						vps,                      // New VPS
+						sps,                      // New SPS
+						pps,                      // New PPS
+						{0x26, 0x01, 0x01, 0x02}, // IDR
+					},
+				}
+
+			case "mpeg4video":
+				config := []byte{
+					0x00, 0x00, 0x01, 0xb0, // Visual Object Sequence Start
+					0x02, 0x00, 0x00, 0x01, 0xb5, 0x8a,
+					0x14, 0x00, 0x00, 0x01, 0x00,
+				}
+
+				formatMPEG4Video := &format.MPEG4Video{
+					Config: []byte{0x00, 0x00, 0x01, 0xb0, 0x01},
+				}
+
+				desc = &description.Session{Medias: []*description.Media{{
+					Type:    description.MediaTypeVideo,
+					Formats: []format.Format{formatMPEG4Video},
+				}}}
+				media = desc.Medias[0]
+				forma = formatMPEG4Video
+
+				frame := make([]byte, 0, len(config)+20)
+				frame = append(frame, config...)
+				frame = append(frame, []byte{0x00, 0x00, 0x01, 0xb3}...) // Group of VOP
+				frame = append(frame, []byte{0x01, 0x02, 0x03, 0x04}...)
+
+				u = &unit.Unit{
+					PTS:     90000,
+					Payload: unit.PayloadMPEG4Video(frame),
+				}
+			}
+
+			strm := &Stream{
+				Desc:              desc,
+				UseRTPPackets:     false,
+				WriteQueueSize:    512,
+				RTPMaxPayloadSize: 1450,
+			}
+			err := strm.Initialize()
+			require.NoError(t, err)
+			defer strm.Close()
+
+			r := &Reader{}
+			recv := make(chan struct{})
+
+			r.OnData(media, forma, func(_ *unit.Unit) error {
+				close(recv)
+				return nil
+			})
+
+			strm.AddReader(r)
+			defer strm.RemoveReader(r)
+
+			strm.WriteUnit(media, forma, u)
+			<-recv
+
+			// Verify that format parameters were updated
+			switch ca {
+			case "h264":
+				formatH264 := forma.(*format.H264)
+				require.Equal(t, []byte{
+					0x67, 0x64, 0x00, 0x20, 0xac, 0xd9, 0x40, 0x78,
+					0x02, 0x27, 0xe5, 0x9a, 0x80, 0x80, 0x80, 0xa0,
+				}, formatH264.SPS)
+				require.Equal(t, []byte{0x08, 0x07, 0x08, 0x09}, formatH264.PPS)
+
+			case "h265":
+				formatH265 := forma.(*format.H265)
+				require.Equal(t, []byte{0x40, 0x01, 0x0c, 0x01, 0xff, 0xfe}, formatH265.VPS)
+				require.Equal(t, []byte{0x42, 0x01, 0x01, 0x01, 0x60, 0x00, 0x00, 0x04}, formatH265.SPS)
+				require.Equal(t, []byte{0x44, 0x01, 0xc1, 0x73, 0xd1, 0x8a}, formatH265.PPS)
+
+			case "mpeg4video":
+				formatMPEG4Video := forma.(*format.MPEG4Video)
+				require.Equal(t, []byte{
+					0x00, 0x00, 0x01, 0xb0,
+					0x02, 0x00, 0x00, 0x01, 0xb5, 0x8a,
+					0x14, 0x00, 0x00, 0x01, 0x00,
+				}, formatMPEG4Video.Config)
+			}
+		})
+	}
+}
+
+var casesDecodeEncode = []struct {
+	name    string
+	format  format.Format
+	encoded []*rtp.Packet
+	decoded unit.Payload
+}{
+	{
+		name: "av1",
+		format: &format.AV1{
+			PayloadTyp: 96,
+		},
+		encoded: []*rtp.Packet{
+			{
+				Header: rtp.Header{
+					Version:        2,
+					Marker:         true,
+					PayloadType:    96,
+					SequenceNumber: 123,
+					Timestamp:      45343,
+					SSRC:           563423,
+				},
+				Payload: []byte{
+					0x10,
+					0x02,       // Size = 2
+					0x01, 0x02, // OBU data
+				},
+			},
+		},
+		decoded: unit.PayloadAV1{
+			{0x02, 0x01, 0x02}, // Size byte included with OBU data
+		},
+	},
+	{
+		name: "vp9",
+		format: &format.VP9{
+			PayloadTyp: 96,
+		},
+		encoded: []*rtp.Packet{
+			{
+				Header: rtp.Header{
+					Version:        2,
+					Marker:         true,
+					PayloadType:    96,
+					SequenceNumber: 123,
+					Timestamp:      45343,
+					SSRC:           563423,
+				},
+				Payload: []byte{
+					0x8f, 0xb5, 0xaf, 0x18, 0x07, 0x80, 0x03, 0x24,
+					0x01, 0x14, 0x01, 0x82, 0x49, 0x83, 0x42, 0x00,
+					0x77, 0xf0, 0x32, 0x34,
+				},
+			},
+		},
+		decoded: unit.PayloadVP9{0x82, 0x49, 0x83, 0x42, 0x0, 0x77, 0xf0, 0x32, 0x34},
+	},
+	{
+		name: "vp8",
+		format: &format.VP8{
+			PayloadTyp: 96,
+		},
+		encoded: []*rtp.Packet{
+			{
+				Header: rtp.Header{
+					Version:        2,
+					Marker:         true,
+					PayloadType:    96,
+					SequenceNumber: 123,
+					Timestamp:      45343,
+					SSRC:           563423,
+				},
+				Payload: []byte{
+					0x10, // X=0, R=0, N=0, S=1, PartID=0
+					0x01, 0x02, 0x03, 0x04,
+				},
+			},
+		},
+		decoded: unit.PayloadVP8{0x01, 0x02, 0x03, 0x04},
+	},
+	{
+		name: "h265",
+		format: &format.H265{
+			PayloadTyp: 96,
+			VPS:        []byte{0x40, 0x01, 0x0c, 0x01, 0xff, 0xfe},
+			SPS:        []byte{0x42, 0x01, 0x01, 0x01, 0x60, 0x00, 0x00, 0x04},
+			PPS:        []byte{0x44, 0x01, 0xc1, 0x73, 0xd1, 0x8a},
+		},
+		encoded: []*rtp.Packet{
+			{
+				Header: rtp.Header{
+					Version:        2,
+					Marker:         true,
+					PayloadType:    96,
+					SequenceNumber: 123,
+					Timestamp:      45343,
+					SSRC:           563423,
+				},
+				Payload: []byte{
+					0x60, 0x01, 0x00, 0x06, 0x40, 0x01, 0x0c, 0x01,
+					0xff, 0xfe, 0x00, 0x08, 0x42, 0x01, 0x01, 0x01,
+					0x60, 0x00, 0x00, 0x04, 0x00, 0x06, 0x44, 0x01,
+					0xc1, 0x73, 0xd1, 0x8a, 0x00, 0x05, 0x26, 0x01,
+					0x01, 0x02, 0x03,
+				},
+			},
+		},
+		decoded: unit.PayloadH265{
+			{0x40, 0x01, 0x0c, 0x01, 0xff, 0xfe},             // VPS
+			{0x42, 0x01, 0x01, 0x01, 0x60, 0x00, 0x00, 0x04}, // SPS
+			{0x44, 0x01, 0xc1, 0x73, 0xd1, 0x8a},             // PPS
+			{0x26, 0x01, 0x01, 0x02, 0x03},                   // IDR
+		},
+	},
+	{
+		name: "h264",
+		format: &format.H264{
+			PayloadTyp: 96,
+			SPS: []byte{
+				0x67, 0x42, 0xc0, 0x28, 0xd9, 0x00, 0x78, 0x02,
+				0x27, 0xe5, 0x84, 0x00, 0x00, 0x03, 0x00, 0x04,
+				0x00, 0x00, 0x03, 0x00, 0xf0, 0x3c, 0x60, 0xc9, 0x20,
+			},
+			PPS: []byte{0x08, 0x06, 0x07, 0x08},
+		},
+		encoded: []*rtp.Packet{
+			{
+				Header: rtp.Header{
+					Version:        2,
+					Marker:         true,
+					PayloadType:    96,
+					SequenceNumber: 123,
+					Timestamp:      45343,
+					SSRC:           563423,
+				},
+				Payload: []byte{
+					0x18, 0x00, 0x19, 0x67, 0x42, 0xc0, 0x28, 0xd9,
+					0x00, 0x78, 0x02, 0x27, 0xe5, 0x84, 0x00, 0x00,
+					0x03, 0x00, 0x04, 0x00, 0x00, 0x03, 0x00, 0xf0,
+					0x3c, 0x60, 0xc9, 0x20, 0x00, 0x04, 0x08, 0x06,
+					0x07, 0x08, 0x00, 0x05, 0x05, 0x01, 0x02, 0x03,
+					0x04,
+				},
+			},
+		},
+		decoded: unit.PayloadH264{
+			{
+				0x67, 0x42, 0xc0, 0x28, 0xd9, 0x00, 0x78, 0x02, 0x27, 0xe5, 0x84,
+				0x00, 0x00, 0x03, 0x00, 0x04, 0x00, 0x00, 0x03, 0x00, 0xf0, 0x3c, 0x60, 0xc9, 0x20,
+			}, // SPS
+			{0x08, 0x06, 0x07, 0x08},       // PPS
+			{0x05, 0x01, 0x02, 0x03, 0x04}, // IDR
+		},
+	},
+	{
+		name: "mpeg4video",
+		format: &format.MPEG4Video{
+			PayloadTyp: 96,
+			Config:     []byte{0x00, 0x00, 0x01, 0xb0, 0x01},
+		},
+		encoded: []*rtp.Packet{
+			{
+				Header: rtp.Header{
+					Version:        2,
+					Marker:         true,
+					PayloadType:    96,
+					SequenceNumber: 123,
+					Timestamp:      45343,
+					SSRC:           563423,
+				},
+				Payload: []byte{0x00, 0x01, 0x02, 0x03, 0x04},
+			},
+		},
+		decoded: unit.PayloadMPEG4Video{0x00, 0x01, 0x02, 0x03, 0x04},
+	},
+	{
+		name:   "mpeg1video",
+		format: &format.MPEG1Video{},
+		encoded: []*rtp.Packet{
+			{
+				Header: rtp.Header{
+					Version:        2,
+					Marker:         true, // Marker indicates complete frame
+					PayloadType:    32,
+					SequenceNumber: 123,
+					Timestamp:      45343,
+					SSRC:           563423,
+				},
+				Payload: []byte{
+					// MPEG-1 Video RTP header (4 bytes)
+					0x00, // MBZ=0, T=0 (MPEG-1)
+					0x00, // TR (temporal reference) - low 8 bits
+					0x18, // AN=0, N=0, S=0 (no sequence header), B=1, E=1 (complete slice), FBV=0, BFC=0, FFV=0, FFC=0
+					0x00, // FFC (continued)
+					// MPEG-1 Video data (slice or frame data)
+					0x00, 0x00, 0x01, 0x01, // Slice start code
+					0x01, 0x02, 0x03, 0x04, // Slice data
+				},
+			},
+		},
+		decoded: unit.PayloadMPEG1Video{
+			// Only the video data after the 4-byte RTP header
+			0x00, 0x00, 0x01, 0x01,
+			0x01, 0x02, 0x03, 0x04,
+		},
+	},
+	{
+		name:   "mjpeg",
+		format: &format.MJPEG{},
+		encoded: []*rtp.Packet{
+			{
+				Header: rtp.Header{
+					Version:     2,
+					PayloadType: 26,
+				},
+				Payload: []byte{
+					0x00, 0x00, 0x00, 0x00, 0x01, 0xff, 0xf0, 0x87,
+					0x00, 0x00, 0x00, 0x80, 0x0d, 0x09, 0x0a, 0x0b,
+					0x0a, 0x08, 0x0d, 0x0b, 0x0a, 0x0b, 0x0e, 0x0e,
+					0x0d, 0x0f, 0x13, 0x20, 0x15, 0x13, 0x12, 0x12,
+					0x13, 0x27, 0x1c, 0x1e, 0x17, 0x20, 0x2e, 0x29,
+					0x31, 0x30, 0x2e, 0x29, 0x2d, 0x2c, 0x33, 0x3a,
+					0x4a, 0x3e, 0x33, 0x36, 0x46, 0x37, 0x2c, 0x2d,
+					0x40, 0x57, 0x41, 0x46, 0x4c, 0x4e, 0x52, 0x53,
+					0x52, 0x32, 0x3e, 0x5a, 0x61, 0x5a, 0x50, 0x60,
+					0x4a, 0x51, 0x52, 0x4f, 0x0e, 0x0e, 0x0e, 0x13,
+					0x11, 0x13, 0x26, 0x15, 0x15, 0x26, 0x4f, 0x35,
+					0x2d, 0x35, 0x4f, 0x4f, 0x4f, 0x4f, 0x4f, 0x4f,
+					0x4f, 0x4f, 0x4f, 0x4f, 0x4f, 0x4f, 0x4f, 0x4f,
+					0x4f, 0x4f, 0x4f, 0x4f, 0x4f, 0x4f, 0x4f, 0x4f,
+					0x4f, 0x4f, 0x4f, 0x4f, 0x4f, 0x4f, 0x4f, 0x4f,
+					0x4f, 0x4f, 0x4f, 0x4f, 0x4f, 0x4f, 0x4f, 0x4f,
+					0x4f, 0x4f, 0x4f, 0x4f, 0x4f, 0x4f, 0x4f, 0x4f,
+					0x4f, 0x4f, 0x4f, 0x4f, 0x92, 0x8a, 0x28, 0xaf,
+					0x54, 0xf2, 0x42, 0x8a, 0x28, 0xa0, 0x02, 0x96,
+					0x92, 0x96, 0x80, 0x0a, 0x4a, 0x75, 0x25, 0x02,
+					0x12, 0x8a, 0x5a, 0x28, 0x18, 0x94, 0x52, 0xd1,
+					0x40, 0x09, 0x45, 0x2d, 0x14, 0x08, 0x29, 0x69,
+					0x29, 0x68, 0x00, 0xa5, 0xa4, 0xa5, 0xa0, 0x02,
+					0x8a, 0x28, 0xa0, 0x02, 0x8a, 0x28, 0xa0, 0x04,
+					0xa5, 0xa2, 0x8a, 0x00, 0x5a, 0x28, 0xa2, 0x80,
+					0x0a, 0x28, 0xa2, 0x80, 0x0a, 0x28, 0xa2, 0x80,
+					0x12, 0x8a, 0x5a, 0x28, 0x24, 0x29, 0x69, 0x29,
+					0x68, 0x00, 0xa2, 0x8a, 0x28, 0x00, 0xa2, 0x8a,
+					0x28, 0x00, 0xa2, 0x8a, 0x28, 0x00, 0xa2, 0x8a,
+					0x28, 0x00, 0xa2, 0x8a, 0x28, 0x00, 0xa2, 0x8a,
+					0x28, 0x00, 0xa2, 0x8a, 0x28, 0x00, 0xa2, 0x8a,
+					0x28, 0x00, 0xa2, 0x8a, 0x28, 0x00, 0xa2, 0x8a,
+					0x28, 0x00, 0xa2, 0x8a, 0x28, 0x00, 0xa4, 0xa5,
+					0xa4, 0xa0, 0x02, 0x8a, 0x28, 0xa0, 0x02, 0x8a,
+					0x28, 0xa0, 0x02, 0x8a, 0x28, 0xa0, 0x02, 0x8a,
+					0x28, 0xa0, 0x02, 0x8a, 0x28, 0xa0, 0x02, 0x8a,
+					0x28, 0xa0, 0x02, 0x8a, 0x28, 0xa0, 0x02, 0x8a,
+					0x28, 0xa0, 0x02, 0x96, 0x92, 0x96, 0x80, 0x0a,
+					0x28, 0xa2, 0x80, 0x0a, 0x28, 0xa2, 0x80, 0x0a,
+					0x28, 0xa2, 0x80, 0x0a, 0x28, 0xa2, 0x80, 0x0a,
+					0x28, 0xa2, 0x80, 0x0a, 0x28, 0xa2, 0x80, 0x0a,
+					0x28, 0xa2, 0x80, 0x0a, 0x28, 0xa2, 0x80, 0x0a,
+					0x28, 0xa2, 0x81, 0x85, 0x14, 0x51, 0x40, 0x05,
+					0x14, 0x51, 0x40, 0x05, 0x14, 0x51, 0x40, 0x05,
+					0x14, 0x52, 0xd0, 0x01, 0x45, 0x14, 0x50, 0x01,
+					0x45, 0x14, 0x50, 0x01, 0x45, 0x14, 0x50, 0x01,
+					0x45, 0x2d, 0x14, 0x00, 0x94, 0xb4, 0x51, 0x40,
+					0x05, 0x14, 0x52, 0xd0, 0x02, 0x51, 0x4b, 0x45,
+					0x00, 0x25, 0x2d, 0x14, 0x50, 0x01, 0x45, 0x14,
+					0x50, 0x01, 0x45, 0x14, 0x50, 0x20, 0xa5, 0xa4,
+					0xa5, 0xa0, 0x02, 0x8a, 0x28, 0xa0, 0x02, 0x8a,
+					0x28, 0xa0, 0x02, 0x8a, 0x5a, 0x28, 0x18, 0x94,
+					0xb4, 0x51, 0x40, 0xc2, 0x8a, 0x28, 0xa0, 0x05,
+					0xa2, 0x92, 0x9d, 0x40, 0x05, 0x14, 0x51, 0x48,
+					0x02, 0x8a, 0x28, 0xa4, 0x01, 0x4b, 0x49, 0x4b,
+					0x40, 0x05, 0x14, 0x51, 0x40, 0x05, 0x14, 0xb4,
+					0x50, 0x02, 0x51, 0x4b, 0x45, 0x00, 0x25, 0x2d,
+					0x14, 0x50, 0x03, 0xa8, 0xa2, 0x8a, 0x00, 0x28,
+					0xa2, 0x8a, 0x00, 0x5a, 0x29, 0x29, 0x68, 0x00,
+					0xa2, 0x8a, 0x28, 0x00, 0xa2, 0x96, 0x8a, 0x06,
+					0x25, 0x14, 0xb4, 0x50, 0x01, 0x45, 0x14, 0x50,
+					0x02, 0xd2, 0xd2, 0x52, 0xd0, 0x20, 0xa2, 0x8a,
+					0x28, 0x01, 0x68, 0xa2, 0x8a, 0x40, 0x14, 0x51,
+					0x45, 0x30, 0x0a, 0x5a, 0x4a, 0x5a, 0x06, 0x14,
+					0x51, 0x45, 0x02, 0x0a, 0x28, 0xa5, 0xa0, 0x62,
+					0x51, 0x4b, 0x45, 0x00, 0x2d, 0x14, 0x51, 0x48,
+					0x02, 0x8a, 0x28, 0xa0, 0x61, 0x45, 0x14, 0x50,
+					0x03, 0xa8, 0xa2, 0x8a, 0x06, 0x2d, 0x14, 0x51,
+					0x48, 0x02, 0x8a, 0x28, 0xa4, 0x30, 0xa2, 0x8a,
+					0x2a, 0x80, 0x28, 0xa2, 0x8a, 0x00, 0x28, 0xa2,
+					0x8a, 0x92, 0x45, 0xa5, 0xa2, 0x96, 0x82, 0x82,
+					0x8a, 0x28, 0xa0, 0x02, 0x8a, 0x28, 0xa0, 0x05,
+					0xa2, 0x8a, 0x29, 0x80, 0x52, 0xd2, 0x52, 0xd0,
+					0x01, 0x45, 0x14, 0x50, 0x01, 0x4e, 0xa2, 0x8a,
+					0x43, 0x0a, 0x28, 0xa2, 0x80, 0x0a, 0x28, 0xa4,
+					0xa4, 0x31, 0x68, 0xa4, 0xf3, 0x62, 0xff, 0x00,
+					0x9e, 0xd1, 0x7e, 0xea, 0x9f, 0xfe, 0xb6, 0xa4,
+					0x62, 0x52, 0x53, 0xa9, 0x28, 0x01, 0x28, 0xa2,
+					0x6f, 0xdd, 0x7f, 0xaf, 0xa5, 0xa0, 0x62, 0x51,
+					0x4b, 0x45, 0x00, 0x25, 0x14, 0xbf, 0xba, 0xff,
+					0x00, 0xae, 0xb4, 0xea, 0x60, 0x36, 0x9d, 0x49,
+					0x49, 0x34, 0xb1, 0x45, 0xfe, 0xbe, 0x6f, 0x2a,
+					0x98, 0x0f, 0xa2, 0xb9, 0xbd, 0x0f, 0x59, 0x97,
+					0x54, 0xf1, 0x2d, 0xd7, 0xfc, 0xf9, 0xd7, 0x49,
+					0x52, 0x30, 0xac, 0x7d, 0x5b, 0x54, 0xd5, 0x74,
+					0xbf, 0xdf, 0x41, 0x67, 0x15, 0xd4, 0x35, 0x63,
+					0x56, 0xd5, 0x22, 0xd2, 0xe0, 0xf3, 0xbc, 0x99,
+					0x65, 0xae, 0x4b, 0x51, 0xf1, 0x44, 0x52, 0xff,
+					0x00, 0xc7, 0x97, 0x9b, 0xe4, 0xd0, 0x69, 0x4c,
+					0x76, 0xa3, 0xe2, 0xd9, 0xa5, 0x82, 0x29, 0xb4,
+					0xbf, 0xdd, 0x79, 0xbf, 0xeb, 0x22, 0xaa, 0x7e,
+					0x1e, 0xd5, 0x3e, 0xc1, 0x3f, 0xfa, 0x9f, 0xfa,
+					0xe9, 0x25, 0x61, 0xd6, 0x9e, 0x87, 0xf6, 0xbf,
+					0xed, 0x68, 0xbc, 0x8a, 0x82, 0xcf, 0x4e, 0x86,
+					0x5f, 0x36, 0x0a, 0x92, 0x9b, 0xff, 0x00, 0x5d,
+					0xeb, 0x3a, 0x6d, 0x53, 0xfd, 0x3f, 0xec, 0x76,
+					0x3f, 0xbd, 0xff, 0x00, 0xa6, 0xbf, 0xc1, 0x54,
+					0x66, 0x69, 0x51, 0x50, 0x4b, 0x2c, 0x51, 0x7e,
+					0xe7, 0xce, 0xf3, 0x66, 0xff, 0x00, 0xa6, 0x75,
+					0x35, 0x00, 0x2d, 0x65, 0x6a, 0xde, 0x23, 0xd3,
+					0xec, 0x3f, 0xe5, 0xb7, 0x9b, 0x34, 0x5f, 0xf2,
+					0xce, 0xb4, 0x7e, 0xd5, 0x69, 0x2f, 0xfc, 0xbe,
+					0x45, 0x5e, 0x7b, 0xe2, 0x7d, 0x07, 0xec, 0x1e,
+					0x6e, 0xa5, 0xf6, 0xc8, 0xa5, 0xf3, 0x6a, 0xc0,
+					0xdf, 0xa2, 0x9d, 0x45, 0x6c, 0x72, 0x0d, 0xa5,
+					0xa5, 0xa2, 0x80, 0x12, 0x96, 0x8a, 0x28, 0x10,
+					0x51, 0x4b, 0x45, 0x00, 0x25, 0x14, 0xb4, 0x50,
+					0x02, 0x51, 0x4b, 0x45, 0x03, 0x12, 0x8a, 0x5a,
+					0x28, 0x10, 0x94, 0xb4, 0x51, 0x40, 0x05, 0x14,
+					0x51, 0x40, 0x05, 0x14, 0xb4, 0x50, 0x02, 0x51,
+					0x4b, 0x45, 0x00, 0x14, 0x51, 0x4b, 0x40, 0x84,
+					0xa2, 0x8a, 0x28, 0x00, 0xa2, 0x96, 0x8a, 0x00,
+					0x4a, 0x29, 0x68, 0xa0, 0x04, 0xa2, 0x96, 0x8a,
+					0x00, 0x4a, 0x29, 0x68, 0xa0, 0x41, 0x45, 0x14,
+					0x50, 0x01, 0x45, 0x14, 0x50, 0x01, 0x45, 0x14,
+					0x50, 0x01, 0x45, 0x14, 0x50, 0x01, 0x45, 0x14,
+					0x50, 0x01, 0x45, 0x14, 0x50, 0x01, 0x45, 0x14,
+					0x50, 0x01, 0x45, 0x14, 0x50, 0x01, 0x45, 0x14,
+					0x50, 0x01, 0x45, 0x14, 0x50, 0x01, 0x45, 0x14,
+					0x50, 0x01, 0x49, 0x4b, 0x45, 0x00, 0x25, 0x14,
+					0xb4, 0x50, 0x01, 0x45, 0x14, 0x50, 0x30, 0xa4,
+					0xa5, 0xa2, 0x81, 0x09, 0x45, 0x2d, 0x14, 0x00,
+					0x94, 0x52, 0xd1, 0x40, 0x09, 0x45, 0x2d, 0x14,
+					0x00, 0x94, 0x52, 0xd1, 0x40, 0x05, 0x14, 0xb4,
+					0x94, 0x0c, 0x28, 0xa2, 0x8a, 0x04, 0x14, 0x51,
+					0x45, 0x00, 0x14, 0x51, 0x45, 0x00, 0x14, 0x51,
+					0x45, 0x00, 0x14, 0x51, 0x45, 0x00, 0x14, 0x52,
+					0xd1, 0x40, 0xc4, 0xa2, 0x96, 0x8a, 0x04, 0x25,
+					0x14, 0xb4, 0x50, 0x31, 0x28, 0xa5, 0xa2, 0x80,
+					0x12, 0x8a, 0x5a, 0x4a, 0x00, 0x5a, 0x28, 0xa2,
+					0x80, 0x0a, 0x29, 0x68, 0xa0, 0x04, 0xa2, 0x96,
+					0x8a, 0x00, 0x4a, 0x29, 0x68, 0xa0, 0x04, 0xa2,
+					0x9d, 0x45, 0x03, 0x1b, 0x45, 0x3a, 0x8a, 0x00,
+					0x6d, 0x14, 0xea, 0x28, 0x10, 0x94, 0x52, 0xd1,
+					0x40, 0x09, 0x4b, 0x45, 0x14, 0x08, 0x28, 0xa2,
+					0x8a, 0x06, 0x14, 0x52, 0xd1, 0x40, 0x09, 0x45,
+					0x2d, 0x2d, 0x00, 0x25, 0x14, 0xb4, 0x50, 0x21,
+					0x28, 0xa5, 0xa2, 0x81, 0x89, 0x4b, 0x45, 0x14,
+					0x00, 0x51, 0x45, 0x14, 0x00, 0x51, 0x4b, 0x45,
+					0x00, 0x25, 0x14, 0xb4, 0x50, 0x01, 0x45, 0x2d,
+					0x14, 0x0c, 0x28, 0xa2, 0x8a, 0x00, 0x4a, 0x5a,
+					0x5a, 0x28, 0x01, 0x28, 0xa5, 0xa2, 0x90, 0x05,
+					0x14, 0x51, 0x40, 0x05, 0x14, 0xb4, 0x52, 0x01,
+					0x28, 0xa5, 0xa2, 0x80, 0x0a, 0x28, 0xa7, 0x50,
+					0x03, 0x68, 0xa7, 0x51, 0x40, 0x0d, 0xa7, 0x51,
+					0x45, 0x00, 0x14, 0x51, 0x4b, 0x40, 0x09, 0x45,
+					0x2d, 0x2d, 0x00, 0x25, 0x14, 0xb4, 0x50, 0x02,
+					0x51, 0x4b, 0x45, 0x00, 0x14, 0x51, 0x45, 0x00,
+					0x14, 0x51, 0x45, 0x00, 0x14, 0xb4, 0x53, 0xa8,
+					0x18, 0xda, 0x5a, 0x5a, 0x28, 0x10, 0x94, 0xb4,
+					0x51, 0x40, 0xc2, 0x8a, 0x5a, 0x29, 0x00, 0x94,
+					0x52, 0xd1, 0x40, 0x05, 0x14, 0x51, 0x4c, 0x02,
+					0x96, 0x8a, 0x29, 0x00, 0x52, 0xd2, 0x52, 0xd0,
+					0x01, 0x45, 0x14, 0x50, 0x02, 0xd1, 0x45, 0x14,
+					0x0c, 0x28, 0xa2, 0x96, 0x80, 0x0a, 0x28, 0xa2,
+					0x81, 0x85, 0x2d, 0x14, 0x50, 0x01, 0x45, 0x14,
+					0xb4, 0x80, 0x4a, 0x29, 0x68, 0xa0, 0x62, 0xd1,
+					0x45, 0x14, 0xc0, 0x28, 0xa5, 0xa2, 0x90, 0x0d,
+					0xa5, 0xa5, 0xa2, 0x80, 0x0a, 0x5a, 0x28, 0xa4,
+					0x01, 0x45, 0x14, 0xb4, 0x00, 0x94, 0x52, 0xd1,
+					0x40, 0x05, 0x14, 0x51, 0x4c, 0x02, 0x8a, 0x29,
+					0x68, 0x01, 0x28, 0xa5, 0xa2, 0x80, 0x16, 0x8a,
+					0x28, 0xa4, 0x30, 0xa7, 0x55, 0x7b, 0xbb, 0x5f,
+					0xb7, 0xc1, 0xe4, 0xff, 0x00, 0xaa, 0xac, 0x49,
+					0xb4, 0x6d, 0x57, 0x4b, 0xf3, 0x66, 0xd2, 0xef,
+					0x3c, 0xd8, 0x69, 0x17, 0x4c, 0xe9, 0x2b, 0x07,
+					0xc4, 0x32, 0xcb, 0x75, 0xa4, 0xff, 0x00, 0xc4,
+					0xae, 0x68, 0xbf, 0x75, 0xfe, 0xb2, 0xb9, 0x09,
+					0xb5, 0x9d, 0x42, 0x5f, 0x36, 0xcf, 0xce, 0xff,
+					0x00, 0x5b, 0x56, 0x3c, 0x3d, 0x6b, 0xfd, 0xa9,
+					0xab, 0x4b, 0x67, 0x3f, 0xfc, 0xf3, 0xff, 0x00,
+					0x96, 0x74, 0x8d, 0xbd, 0x99, 0x9b, 0x0d, 0xfc,
+					0xb2, 0xf9, 0xbf, 0xeb, 0x7f, 0x7b, 0x5a, 0xf0,
+					0xf8, 0x8e, 0xee, 0x2d, 0x27, 0xec, 0x70, 0x7f,
+					0xdf, 0xca, 0x66, 0xa3, 0xe1, 0x7f, 0xb0, 0x79,
+					0xbe, 0x46, 0xa5, 0x17, 0xfd, 0x73, 0x92, 0xb0,
+					0xe1, 0xa8, 0x0f, 0x66, 0x76, 0x90, 0xf8, 0xa2,
+					0x29, 0x6c, 0x3c, 0x9f, 0xde, 0xf9, 0xde, 0x5f,
+					0xef, 0x24, 0xaa, 0x76, 0x9e, 0x2d, 0xbb, 0x8b,
+					0x49, 0xf2, 0x7f, 0xe5, 0xb5, 0x62, 0x5a, 0x5f,
+					0xcb, 0x6b, 0xfe, 0xa3, 0xfe, 0x5a, 0xd1, 0xe5,
+					0x45, 0xff,
+				},
+			},
+			{
+				Header: rtp.Header{
+					Version:     2,
+					PayloadType: 26,
+					Marker:      true,
+				},
+				Payload: []byte{
+					0x00, 0x00, 0x05, 0x1e, 0x01, 0xff, 0xf0, 0x87,
+					0x00, 0x2c, 0x29, 0x0f, 0xd9, 0x97, 0xff, 0x00,
+					0xb6, 0x65, 0xba, 0x82, 0x5f, 0xb7, 0x4d, 0xe6,
+					0xcd, 0xff, 0x00, 0x2c, 0xe2, 0xae, 0xa7, 0x49,
+					0xd5, 0x3f, 0xe2, 0x9a, 0xf3, 0xa7, 0xff, 0x00,
+					0x5d, 0x15, 0x70, 0xb4, 0x43, 0xfb, 0xdf, 0xf5,
+					0xf3, 0x4b, 0xff, 0x00, 0x5c, 0xe8, 0xf6, 0x83,
+					0xf6, 0x67, 0xa1, 0x68, 0x7a, 0xcc, 0x5a, 0xcf,
+					0xfd, 0x32, 0x9b, 0xfe, 0x79, 0xd5, 0xeb, 0xbb,
+					0xab, 0x4b, 0x08, 0x3f, 0xd3, 0xab, 0xcd, 0x66,
+					0xba, 0xfb, 0x57, 0xfd, 0x32, 0x9a, 0x2a, 0x96,
+					0xd2, 0xff, 0x00, 0xcd, 0xbf, 0xf3, 0xb5, 0x49,
+					0xbc, 0xdf, 0x2b, 0xfe, 0x59, 0xd3, 0x27, 0xd9,
+					0x9a, 0x30, 0xdd, 0x7d, 0xab, 0x5e, 0xfb, 0x1d,
+					0x8c, 0xde, 0x55, 0x9c, 0xb2, 0x79, 0x95, 0xd3,
+					0x6a, 0x3a, 0xa7, 0xd9, 0x75, 0xdb, 0x5b, 0x39,
+					0xff, 0x00, 0xd4, 0xcb, 0xff, 0x00, 0x2d, 0x2b,
+					0xcf, 0xbe, 0xdf, 0xe5, 0x6a, 0xdf, 0x6c, 0x83,
+					0xfe, 0x59, 0x54, 0xda, 0xb6, 0xb3, 0x2e, 0xb3,
+					0x7f, 0xe7, 0x7f, 0xaa, 0xff, 0xff, 0xd9,
+				},
+			},
+		},
+		decoded: unit.PayloadMJPEG{
+			0xff, 0xd8, 0xff, 0xdb, 0x00, 0x84, 0x00, 0x0d,
+			0x09, 0x0a, 0x0b, 0x0a, 0x08, 0x0d, 0x0b, 0x0a,
+			0x0b, 0x0e, 0x0e, 0x0d, 0x0f, 0x13, 0x20, 0x15,
+			0x13, 0x12, 0x12, 0x13, 0x27, 0x1c, 0x1e, 0x17,
+			0x20, 0x2e, 0x29, 0x31, 0x30, 0x2e, 0x29, 0x2d,
+			0x2c, 0x33, 0x3a, 0x4a, 0x3e, 0x33, 0x36, 0x46,
+			0x37, 0x2c, 0x2d, 0x40, 0x57, 0x41, 0x46, 0x4c,
+			0x4e, 0x52, 0x53, 0x52, 0x32, 0x3e, 0x5a, 0x61,
+			0x5a, 0x50, 0x60, 0x4a, 0x51, 0x52, 0x4f, 0x01,
+			0x0e, 0x0e, 0x0e, 0x13, 0x11, 0x13, 0x26, 0x15,
+			0x15, 0x26, 0x4f, 0x35, 0x2d, 0x35, 0x4f, 0x4f,
+			0x4f, 0x4f, 0x4f, 0x4f, 0x4f, 0x4f, 0x4f, 0x4f,
+			0x4f, 0x4f, 0x4f, 0x4f, 0x4f, 0x4f, 0x4f, 0x4f,
+			0x4f, 0x4f, 0x4f, 0x4f, 0x4f, 0x4f, 0x4f, 0x4f,
+			0x4f, 0x4f, 0x4f, 0x4f, 0x4f, 0x4f, 0x4f, 0x4f,
+			0x4f, 0x4f, 0x4f, 0x4f, 0x4f, 0x4f, 0x4f, 0x4f,
+			0x4f, 0x4f, 0x4f, 0x4f, 0x4f, 0x4f, 0x4f, 0x4f,
+			0xff, 0xc0, 0x00, 0x11, 0x08, 0x04, 0x38, 0x07,
+			0x80, 0x03, 0x00, 0x22, 0x00, 0x01, 0x11, 0x01,
+			0x02, 0x11, 0x01, 0xff, 0xc4, 0x00, 0x1f, 0x00,
+			0x00, 0x01, 0x05, 0x01, 0x01, 0x01, 0x01, 0x01,
+			0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+			0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+			0x08, 0x09, 0x0a, 0x0b, 0xff, 0xc4, 0x00, 0xb5,
+			0x10, 0x00, 0x02, 0x01, 0x03, 0x03, 0x02, 0x04,
+			0x03, 0x05, 0x05, 0x04, 0x04, 0x00, 0x00, 0x01,
+			0x7d, 0x01, 0x02, 0x03, 0x00, 0x04, 0x11, 0x05,
+			0x12, 0x21, 0x31, 0x41, 0x06, 0x13, 0x51, 0x61,
+			0x07, 0x22, 0x71, 0x14, 0x32, 0x81, 0x91, 0xa1,
+			0x08, 0x23, 0x42, 0xb1, 0xc1, 0x15, 0x52, 0xd1,
+			0xf0, 0x24, 0x33, 0x62, 0x72, 0x82, 0x09, 0x0a,
+			0x16, 0x17, 0x18, 0x19, 0x1a, 0x25, 0x26, 0x27,
+			0x28, 0x29, 0x2a, 0x34, 0x35, 0x36, 0x37, 0x38,
+			0x39, 0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48,
+			0x49, 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58,
+			0x59, 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68,
+			0x69, 0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78,
+			0x79, 0x7a, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88,
+			0x89, 0x8a, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97,
+			0x98, 0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6,
+			0xa7, 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, 0xb5,
+			0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, 0xc4,
+			0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2, 0xd3,
+			0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xe1,
+			0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9,
+			0xea, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
+			0xf8, 0xf9, 0xfa, 0xff, 0xc4, 0x00, 0x1f, 0x01,
+			0x00, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+			0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
+			0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+			0x08, 0x09, 0x0a, 0x0b, 0xff, 0xc4, 0x00, 0xb5,
+			0x11, 0x00, 0x02, 0x01, 0x02, 0x04, 0x04, 0x03,
+			0x04, 0x07, 0x05, 0x04, 0x04, 0x00, 0x01, 0x02,
+			0x77, 0x00, 0x01, 0x02, 0x03, 0x11, 0x04, 0x05,
+			0x21, 0x31, 0x06, 0x12, 0x41, 0x51, 0x07, 0x61,
+			0x71, 0x13, 0x22, 0x32, 0x81, 0x08, 0x14, 0x42,
+			0x91, 0xa1, 0xb1, 0xc1, 0x09, 0x23, 0x33, 0x52,
+			0xf0, 0x15, 0x62, 0x72, 0xd1, 0x0a, 0x16, 0x24,
+			0x34, 0xe1, 0x25, 0xf1, 0x17, 0x18, 0x19, 0x1a,
+			0x26, 0x27, 0x28, 0x29, 0x2a, 0x35, 0x36, 0x37,
+			0x38, 0x39, 0x3a, 0x43, 0x44, 0x45, 0x46, 0x47,
+			0x48, 0x49, 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57,
+			0x58, 0x59, 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67,
+			0x68, 0x69, 0x6a, 0x73, 0x74, 0x75, 0x76, 0x77,
+			0x78, 0x79, 0x7a, 0x82, 0x83, 0x84, 0x85, 0x86,
+			0x87, 0x88, 0x89, 0x8a, 0x92, 0x93, 0x94, 0x95,
+			0x96, 0x97, 0x98, 0x99, 0x9a, 0xa2, 0xa3, 0xa4,
+			0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xb2, 0xb3,
+			0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xc2,
+			0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca,
+			0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9,
+			0xda, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8,
+			0xe9, 0xea, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
+			0xf8, 0xf9, 0xfa, 0xff, 0xda, 0x00, 0x0c, 0x03,
+			0x00, 0x00, 0x01, 0x11, 0x02, 0x11, 0x00, 0x3f,
+			0x00, 0x92, 0x8a, 0x28, 0xaf, 0x54, 0xf2, 0x42,
+			0x8a, 0x28, 0xa0, 0x02, 0x96, 0x92, 0x96, 0x80,
+			0x0a, 0x4a, 0x75, 0x25, 0x02, 0x12, 0x8a, 0x5a,
+			0x28, 0x18, 0x94, 0x52, 0xd1, 0x40, 0x09, 0x45,
+			0x2d, 0x14, 0x08, 0x29, 0x69, 0x29, 0x68, 0x00,
+			0xa5, 0xa4, 0xa5, 0xa0, 0x02, 0x8a, 0x28, 0xa0,
+			0x02, 0x8a, 0x28, 0xa0, 0x04, 0xa5, 0xa2, 0x8a,
+			0x00, 0x5a, 0x28, 0xa2, 0x80, 0x0a, 0x28, 0xa2,
+			0x80, 0x0a, 0x28, 0xa2, 0x80, 0x12, 0x8a, 0x5a,
+			0x28, 0x24, 0x29, 0x69, 0x29, 0x68, 0x00, 0xa2,
+			0x8a, 0x28, 0x00, 0xa2, 0x8a, 0x28, 0x00, 0xa2,
+			0x8a, 0x28, 0x00, 0xa2, 0x8a, 0x28, 0x00, 0xa2,
+			0x8a, 0x28, 0x00, 0xa2, 0x8a, 0x28, 0x00, 0xa2,
+			0x8a, 0x28, 0x00, 0xa2, 0x8a, 0x28, 0x00, 0xa2,
+			0x8a, 0x28, 0x00, 0xa2, 0x8a, 0x28, 0x00, 0xa2,
+			0x8a, 0x28, 0x00, 0xa4, 0xa5, 0xa4, 0xa0, 0x02,
+			0x8a, 0x28, 0xa0, 0x02, 0x8a, 0x28, 0xa0, 0x02,
+			0x8a, 0x28, 0xa0, 0x02, 0x8a, 0x28, 0xa0, 0x02,
+			0x8a, 0x28, 0xa0, 0x02, 0x8a, 0x28, 0xa0, 0x02,
+			0x8a, 0x28, 0xa0, 0x02, 0x8a, 0x28, 0xa0, 0x02,
+			0x96, 0x92, 0x96, 0x80, 0x0a, 0x28, 0xa2, 0x80,
+			0x0a, 0x28, 0xa2, 0x80, 0x0a, 0x28, 0xa2, 0x80,
+			0x0a, 0x28, 0xa2, 0x80, 0x0a, 0x28, 0xa2, 0x80,
+			0x0a, 0x28, 0xa2, 0x80, 0x0a, 0x28, 0xa2, 0x80,
+			0x0a, 0x28, 0xa2, 0x80, 0x0a, 0x28, 0xa2, 0x81,
+			0x85, 0x14, 0x51, 0x40, 0x05, 0x14, 0x51, 0x40,
+			0x05, 0x14, 0x51, 0x40, 0x05, 0x14, 0x52, 0xd0,
+			0x01, 0x45, 0x14, 0x50, 0x01, 0x45, 0x14, 0x50,
+			0x01, 0x45, 0x14, 0x50, 0x01, 0x45, 0x2d, 0x14,
+			0x00, 0x94, 0xb4, 0x51, 0x40, 0x05, 0x14, 0x52,
+			0xd0, 0x02, 0x51, 0x4b, 0x45, 0x00, 0x25, 0x2d,
+			0x14, 0x50, 0x01, 0x45, 0x14, 0x50, 0x01, 0x45,
+			0x14, 0x50, 0x20, 0xa5, 0xa4, 0xa5, 0xa0, 0x02,
+			0x8a, 0x28, 0xa0, 0x02, 0x8a, 0x28, 0xa0, 0x02,
+			0x8a, 0x5a, 0x28, 0x18, 0x94, 0xb4, 0x51, 0x40,
+			0xc2, 0x8a, 0x28, 0xa0, 0x05, 0xa2, 0x92, 0x9d,
+			0x40, 0x05, 0x14, 0x51, 0x48, 0x02, 0x8a, 0x28,
+			0xa4, 0x01, 0x4b, 0x49, 0x4b, 0x40, 0x05, 0x14,
+			0x51, 0x40, 0x05, 0x14, 0xb4, 0x50, 0x02, 0x51,
+			0x4b, 0x45, 0x00, 0x25, 0x2d, 0x14, 0x50, 0x03,
+			0xa8, 0xa2, 0x8a, 0x00, 0x28, 0xa2, 0x8a, 0x00,
+			0x5a, 0x29, 0x29, 0x68, 0x00, 0xa2, 0x8a, 0x28,
+			0x00, 0xa2, 0x96, 0x8a, 0x06, 0x25, 0x14, 0xb4,
+			0x50, 0x01, 0x45, 0x14, 0x50, 0x02, 0xd2, 0xd2,
+			0x52, 0xd0, 0x20, 0xa2, 0x8a, 0x28, 0x01, 0x68,
+			0xa2, 0x8a, 0x40, 0x14, 0x51, 0x45, 0x30, 0x0a,
+			0x5a, 0x4a, 0x5a, 0x06, 0x14, 0x51, 0x45, 0x02,
+			0x0a, 0x28, 0xa5, 0xa0, 0x62, 0x51, 0x4b, 0x45,
+			0x00, 0x2d, 0x14, 0x51, 0x48, 0x02, 0x8a, 0x28,
+			0xa0, 0x61, 0x45, 0x14, 0x50, 0x03, 0xa8, 0xa2,
+			0x8a, 0x06, 0x2d, 0x14, 0x51, 0x48, 0x02, 0x8a,
+			0x28, 0xa4, 0x30, 0xa2, 0x8a, 0x2a, 0x80, 0x28,
+			0xa2, 0x8a, 0x00, 0x28, 0xa2, 0x8a, 0x92, 0x45,
+			0xa5, 0xa2, 0x96, 0x82, 0x82, 0x8a, 0x28, 0xa0,
+			0x02, 0x8a, 0x28, 0xa0, 0x05, 0xa2, 0x8a, 0x29,
+			0x80, 0x52, 0xd2, 0x52, 0xd0, 0x01, 0x45, 0x14,
+			0x50, 0x01, 0x4e, 0xa2, 0x8a, 0x43, 0x0a, 0x28,
+			0xa2, 0x80, 0x0a, 0x28, 0xa4, 0xa4, 0x31, 0x68,
+			0xa4, 0xf3, 0x62, 0xff, 0x00, 0x9e, 0xd1, 0x7e,
+			0xea, 0x9f, 0xfe, 0xb6, 0xa4, 0x62, 0x52, 0x53,
+			0xa9, 0x28, 0x01, 0x28, 0xa2, 0x6f, 0xdd, 0x7f,
+			0xaf, 0xa5, 0xa0, 0x62, 0x51, 0x4b, 0x45, 0x00,
+			0x25, 0x14, 0xbf, 0xba, 0xff, 0x00, 0xae, 0xb4,
+			0xea, 0x60, 0x36, 0x9d, 0x49, 0x49, 0x34, 0xb1,
+			0x45, 0xfe, 0xbe, 0x6f, 0x2a, 0x98, 0x0f, 0xa2,
+			0xb9, 0xbd, 0x0f, 0x59, 0x97, 0x54, 0xf1, 0x2d,
+			0xd7, 0xfc, 0xf9, 0xd7, 0x49, 0x52, 0x30, 0xac,
+			0x7d, 0x5b, 0x54, 0xd5, 0x74, 0xbf, 0xdf, 0x41,
+			0x67, 0x15, 0xd4, 0x35, 0x63, 0x56, 0xd5, 0x22,
+			0xd2, 0xe0, 0xf3, 0xbc, 0x99, 0x65, 0xae, 0x4b,
+			0x51, 0xf1, 0x44, 0x52, 0xff, 0x00, 0xc7, 0x97,
+			0x9b, 0xe4, 0xd0, 0x69, 0x4c, 0x76, 0xa3, 0xe2,
+			0xd9, 0xa5, 0x82, 0x29, 0xb4, 0xbf, 0xdd, 0x79,
+			0xbf, 0xeb, 0x22, 0xaa, 0x7e, 0x1e, 0xd5, 0x3e,
+			0xc1, 0x3f, 0xfa, 0x9f, 0xfa, 0xe9, 0x25, 0x61,
+			0xd6, 0x9e, 0x87, 0xf6, 0xbf, 0xed, 0x68, 0xbc,
+			0x8a, 0x82, 0xcf, 0x4e, 0x86, 0x5f, 0x36, 0x0a,
+			0x92, 0x9b, 0xff, 0x00, 0x5d, 0xeb, 0x3a, 0x6d,
+			0x53, 0xfd, 0x3f, 0xec, 0x76, 0x3f, 0xbd, 0xff,
+			0x00, 0xa6, 0xbf, 0xc1, 0x54, 0x66, 0x69, 0x51,
+			0x50, 0x4b, 0x2c, 0x51, 0x7e, 0xe7, 0xce, 0xf3,
+			0x66, 0xff, 0x00, 0xa6, 0x75, 0x35, 0x00, 0x2d,
+			0x65, 0x6a, 0xde, 0x23, 0xd3, 0xec, 0x3f, 0xe5,
+			0xb7, 0x9b, 0x34, 0x5f, 0xf2, 0xce, 0xb4, 0x7e,
+			0xd5, 0x69, 0x2f, 0xfc, 0xbe, 0x45, 0x5e, 0x7b,
+			0xe2, 0x7d, 0x07, 0xec, 0x1e, 0x6e, 0xa5, 0xf6,
+			0xc8, 0xa5, 0xf3, 0x6a, 0xc0, 0xdf, 0xa2, 0x9d,
+			0x45, 0x6c, 0x72, 0x0d, 0xa5, 0xa5, 0xa2, 0x80,
+			0x12, 0x96, 0x8a, 0x28, 0x10, 0x51, 0x4b, 0x45,
+			0x00, 0x25, 0x14, 0xb4, 0x50, 0x02, 0x51, 0x4b,
+			0x45, 0x03, 0x12, 0x8a, 0x5a, 0x28, 0x10, 0x94,
+			0xb4, 0x51, 0x40, 0x05, 0x14, 0x51, 0x40, 0x05,
+			0x14, 0xb4, 0x50, 0x02, 0x51, 0x4b, 0x45, 0x00,
+			0x14, 0x51, 0x4b, 0x40, 0x84, 0xa2, 0x8a, 0x28,
+			0x00, 0xa2, 0x96, 0x8a, 0x00, 0x4a, 0x29, 0x68,
+			0xa0, 0x04, 0xa2, 0x96, 0x8a, 0x00, 0x4a, 0x29,
+			0x68, 0xa0, 0x41, 0x45, 0x14, 0x50, 0x01, 0x45,
+			0x14, 0x50, 0x01, 0x45, 0x14, 0x50, 0x01, 0x45,
+			0x14, 0x50, 0x01, 0x45, 0x14, 0x50, 0x01, 0x45,
+			0x14, 0x50, 0x01, 0x45, 0x14, 0x50, 0x01, 0x45,
+			0x14, 0x50, 0x01, 0x45, 0x14, 0x50, 0x01, 0x45,
+			0x14, 0x50, 0x01, 0x45, 0x14, 0x50, 0x01, 0x49,
+			0x4b, 0x45, 0x00, 0x25, 0x14, 0xb4, 0x50, 0x01,
+			0x45, 0x14, 0x50, 0x30, 0xa4, 0xa5, 0xa2, 0x81,
+			0x09, 0x45, 0x2d, 0x14, 0x00, 0x94, 0x52, 0xd1,
+			0x40, 0x09, 0x45, 0x2d, 0x14, 0x00, 0x94, 0x52,
+			0xd1, 0x40, 0x05, 0x14, 0xb4, 0x94, 0x0c, 0x28,
+			0xa2, 0x8a, 0x04, 0x14, 0x51, 0x45, 0x00, 0x14,
+			0x51, 0x45, 0x00, 0x14, 0x51, 0x45, 0x00, 0x14,
+			0x51, 0x45, 0x00, 0x14, 0x52, 0xd1, 0x40, 0xc4,
+			0xa2, 0x96, 0x8a, 0x04, 0x25, 0x14, 0xb4, 0x50,
+			0x31, 0x28, 0xa5, 0xa2, 0x80, 0x12, 0x8a, 0x5a,
+			0x4a, 0x00, 0x5a, 0x28, 0xa2, 0x80, 0x0a, 0x29,
+			0x68, 0xa0, 0x04, 0xa2, 0x96, 0x8a, 0x00, 0x4a,
+			0x29, 0x68, 0xa0, 0x04, 0xa2, 0x9d, 0x45, 0x03,
+			0x1b, 0x45, 0x3a, 0x8a, 0x00, 0x6d, 0x14, 0xea,
+			0x28, 0x10, 0x94, 0x52, 0xd1, 0x40, 0x09, 0x4b,
+			0x45, 0x14, 0x08, 0x28, 0xa2, 0x8a, 0x06, 0x14,
+			0x52, 0xd1, 0x40, 0x09, 0x45, 0x2d, 0x2d, 0x00,
+			0x25, 0x14, 0xb4, 0x50, 0x21, 0x28, 0xa5, 0xa2,
+			0x81, 0x89, 0x4b, 0x45, 0x14, 0x00, 0x51, 0x45,
+			0x14, 0x00, 0x51, 0x4b, 0x45, 0x00, 0x25, 0x14,
+			0xb4, 0x50, 0x01, 0x45, 0x2d, 0x14, 0x0c, 0x28,
+			0xa2, 0x8a, 0x00, 0x4a, 0x5a, 0x5a, 0x28, 0x01,
+			0x28, 0xa5, 0xa2, 0x90, 0x05, 0x14, 0x51, 0x40,
+			0x05, 0x14, 0xb4, 0x52, 0x01, 0x28, 0xa5, 0xa2,
+			0x80, 0x0a, 0x28, 0xa7, 0x50, 0x03, 0x68, 0xa7,
+			0x51, 0x40, 0x0d, 0xa7, 0x51, 0x45, 0x00, 0x14,
+			0x51, 0x4b, 0x40, 0x09, 0x45, 0x2d, 0x2d, 0x00,
+			0x25, 0x14, 0xb4, 0x50, 0x02, 0x51, 0x4b, 0x45,
+			0x00, 0x14, 0x51, 0x45, 0x00, 0x14, 0x51, 0x45,
+			0x00, 0x14, 0xb4, 0x53, 0xa8, 0x18, 0xda, 0x5a,
+			0x5a, 0x28, 0x10, 0x94, 0xb4, 0x51, 0x40, 0xc2,
+			0x8a, 0x5a, 0x29, 0x00, 0x94, 0x52, 0xd1, 0x40,
+			0x05, 0x14, 0x51, 0x4c, 0x02, 0x96, 0x8a, 0x29,
+			0x00, 0x52, 0xd2, 0x52, 0xd0, 0x01, 0x45, 0x14,
+			0x50, 0x02, 0xd1, 0x45, 0x14, 0x0c, 0x28, 0xa2,
+			0x96, 0x80, 0x0a, 0x28, 0xa2, 0x81, 0x85, 0x2d,
+			0x14, 0x50, 0x01, 0x45, 0x14, 0xb4, 0x80, 0x4a,
+			0x29, 0x68, 0xa0, 0x62, 0xd1, 0x45, 0x14, 0xc0,
+			0x28, 0xa5, 0xa2, 0x90, 0x0d, 0xa5, 0xa5, 0xa2,
+			0x80, 0x0a, 0x5a, 0x28, 0xa4, 0x01, 0x45, 0x14,
+			0xb4, 0x00, 0x94, 0x52, 0xd1, 0x40, 0x05, 0x14,
+			0x51, 0x4c, 0x02, 0x8a, 0x29, 0x68, 0x01, 0x28,
+			0xa5, 0xa2, 0x80, 0x16, 0x8a, 0x28, 0xa4, 0x30,
+			0xa7, 0x55, 0x7b, 0xbb, 0x5f, 0xb7, 0xc1, 0xe4,
+			0xff, 0x00, 0xaa, 0xac, 0x49, 0xb4, 0x6d, 0x57,
+			0x4b, 0xf3, 0x66, 0xd2, 0xef, 0x3c, 0xd8, 0x69,
+			0x17, 0x4c, 0xe9, 0x2b, 0x07, 0xc4, 0x32, 0xcb,
+			0x75, 0xa4, 0xff, 0x00, 0xc4, 0xae, 0x68, 0xbf,
+			0x75, 0xfe, 0xb2, 0xb9, 0x09, 0xb5, 0x9d, 0x42,
+			0x5f, 0x36, 0xcf, 0xce, 0xff, 0x00, 0x5b, 0x56,
+			0x3c, 0x3d, 0x6b, 0xfd, 0xa9, 0xab, 0x4b, 0x67,
+			0x3f, 0xfc, 0xf3, 0xff, 0x00, 0x96, 0x74, 0x8d,
+			0xbd, 0x99, 0x9b, 0x0d, 0xfc, 0xb2, 0xf9, 0xbf,
+			0xeb, 0x7f, 0x7b, 0x5a, 0xf0, 0xf8, 0x8e, 0xee,
+			0x2d, 0x27, 0xec, 0x70, 0x7f, 0xdf, 0xca, 0x66,
+			0xa3, 0xe1, 0x7f, 0xb0, 0x79, 0xbe, 0x46, 0xa5,
+			0x17, 0xfd, 0x73, 0x92, 0xb0, 0xe1, 0xa8, 0x0f,
+			0x66, 0x76, 0x90, 0xf8, 0xa2, 0x29, 0x6c, 0x3c,
+			0x9f, 0xde, 0xf9, 0xde, 0x5f, 0xef, 0x24, 0xaa,
+			0x76, 0x9e, 0x2d, 0xbb, 0x8b, 0x49, 0xf2, 0x7f,
+			0xe5, 0xb5, 0x62, 0x5a, 0x5f, 0xcb, 0x6b, 0xfe,
+			0xa3, 0xfe, 0x5a, 0xd1, 0xe5, 0x45, 0xff, 0x00,
+			0x2c, 0x29, 0x0f, 0xd9, 0x97, 0xff, 0x00, 0xb6,
+			0x65, 0xba, 0x82, 0x5f, 0xb7, 0x4d, 0xe6, 0xcd,
+			0xff, 0x00, 0x2c, 0xe2, 0xae, 0xa7, 0x49, 0xd5,
+			0x3f, 0xe2, 0x9a, 0xf3, 0xa7, 0xff, 0x00, 0x5d,
+			0x15, 0x70, 0xb4, 0x43, 0xfb, 0xdf, 0xf5, 0xf3,
+			0x4b, 0xff, 0x00, 0x5c, 0xe8, 0xf6, 0x83, 0xf6,
+			0x67, 0xa1, 0x68, 0x7a, 0xcc, 0x5a, 0xcf, 0xfd,
+			0x32, 0x9b, 0xfe, 0x79, 0xd5, 0xeb, 0xbb, 0xab,
+			0x4b, 0x08, 0x3f, 0xd3, 0xab, 0xcd, 0x66, 0xba,
+			0xfb, 0x57, 0xfd, 0x32, 0x9a, 0x2a, 0x96, 0xd2,
+			0xff, 0x00, 0xcd, 0xbf, 0xf3, 0xb5, 0x49, 0xbc,
+			0xdf, 0x2b, 0xfe, 0x59, 0xd3, 0x27, 0xd9, 0x9a,
+			0x30, 0xdd, 0x7d, 0xab, 0x5e, 0xfb, 0x1d, 0x8c,
+			0xde, 0x55, 0x9c, 0xb2, 0x79, 0x95, 0xd3, 0x6a,
+			0x3a, 0xa7, 0xd9, 0x75, 0xdb, 0x5b, 0x39, 0xff,
+			0x00, 0xd4, 0xcb, 0xff, 0x00, 0x2d, 0x2b, 0xcf,
+			0xbe, 0xdf, 0xe5, 0x6a, 0xdf, 0x6c, 0x83, 0xfe,
+			0x59, 0x54, 0xda, 0xb6, 0xb3, 0x2e, 0xb3, 0x7f,
+			0xe7, 0x7f, 0xaa, 0xff, 0xff, 0xd9,
+		},
+	},
+	{
+		name: "mpeg4audio",
+		format: &format.MPEG4Audio{
+			PayloadTyp:       96,
+			SizeLength:       13,
+			IndexLength:      3,
+			IndexDeltaLength: 3,
+		},
+		encoded: []*rtp.Packet{
+			{
+				Header: rtp.Header{
+					Version:        2,
+					Marker:         true,
+					PayloadType:    96,
+					SequenceNumber: 123,
+					Timestamp:      45343,
+					SSRC:           563423,
+				},
+				Payload: []byte{
+					// AU-headers-length: 16 bits (2 bytes) = 16 bits of headers
+					0x00, 0x10,
+					// AU-header: 13 bits size + 3 bits index
+					// size=4 (13 bits): 0000000000100
+					// index=0 (3 bits): 000
+					// Combined: 0000000000100000 = 0x0020
+					0x00, 0x20,
+					// AU data
+					0x01, 0x02, 0x03, 0x04,
+				},
+			},
+		},
+		decoded: unit.PayloadMPEG4Audio{
+			{0x01, 0x02, 0x03, 0x04},
+		},
+	},
+	{
+		name: "opus",
+		format: &format.Opus{
+			PayloadTyp:   96,
+			ChannelCount: 2,
+		},
+		encoded: []*rtp.Packet{
+			{
+				Header: rtp.Header{
+					Version:        2,
+					Marker:         false,
+					PayloadType:    96,
+					SequenceNumber: 123,
+					Timestamp:      45343,
+					SSRC:           563423,
+				},
+				Payload: []byte{0x01, 0x02, 0x03, 0x04},
+			},
+		},
+		decoded: unit.PayloadOpus{
+			{0x01, 0x02, 0x03, 0x04},
+		},
+	},
+	{
+		name: "g711",
+		format: &format.G711{
+			MULaw:        true,
+			SampleRate:   8000,
+			ChannelCount: 1,
+		},
+		encoded: []*rtp.Packet{
+			{
+				Header: rtp.Header{
+					Version:        2,
+					Marker:         false,
+					PayloadType:    0,
+					SequenceNumber: 123,
+					Timestamp:      45343,
+					SSRC:           563423,
+				},
+				Payload: []byte{0x01, 0x02, 0x03, 0x04},
+			},
+		},
+		decoded: unit.PayloadG711{0x01, 0x02, 0x03, 0x04},
+	},
+	{
+		name: "lpcm",
+		format: &format.LPCM{
+			PayloadTyp:   96,
+			BitDepth:     16,
+			SampleRate:   48000,
+			ChannelCount: 2,
+		},
+		encoded: []*rtp.Packet{
+			{
+				Header: rtp.Header{
+					Version:        2,
+					Marker:         false,
+					PayloadType:    96,
+					SequenceNumber: 123,
+					Timestamp:      45343,
+					SSRC:           563423,
+				},
+				Payload: []byte{0x01, 0x02, 0x03, 0x04},
+			},
+		},
+		decoded: unit.PayloadLPCM{0x01, 0x02, 0x03, 0x04},
+	},
+	{
+		name: "klv",
+		format: &format.KLV{
+			PayloadTyp: 96,
+		},
+		encoded: []*rtp.Packet{
+			{
+				Header: rtp.Header{
+					Version:        2,
+					Marker:         true, // Marker bit indicates complete KLV unit
+					PayloadType:    96,
+					SequenceNumber: 123,
+					Timestamp:      45343,
+					SSRC:           563423,
+				},
+				Payload: []byte{
+					// KLV Universal Label Key (16 bytes) - starts with 0x060e2b34
+					0x06, 0x0e, 0x2b, 0x34, 0x01, 0x01, 0x01, 0x01,
+					0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
+					// Length (1 byte, short form: 4 bytes of data)
+					0x04,
+					// Value (4 bytes)
+					0x01, 0x02, 0x03, 0x04,
+				},
+			},
+		},
+		decoded: unit.PayloadKLV{
+			// Complete KLV unit: Universal Label Key + Length + Value
+			0x06, 0x0e, 0x2b, 0x34, 0x01, 0x01, 0x01, 0x01,
+			0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
+			0x04,
+			0x01, 0x02, 0x03, 0x04,
+		},
+	},
+}
+
+func TestStreamDecode(t *testing.T) {
+	for _, ca := range casesDecodeEncode {
+		t.Run(ca.name, func(t *testing.T) {
+			desc := &description.Session{Medias: []*description.Media{{
+				Formats: []format.Format{ca.format},
+			}}}
+
+			strm := &Stream{
+				Desc:              desc,
+				UseRTPPackets:     true,
+				WriteQueueSize:    512,
+				RTPMaxPayloadSize: 1450,
+				Parent:            &nilLogger{},
+			}
+			err := strm.Initialize()
+			require.NoError(t, err)
+			defer strm.Close()
+
+			r := &Reader{}
+			recv := make(chan *unit.Unit)
+
+			r.OnData(desc.Medias[0], ca.format, func(u *unit.Unit) error {
+				if !u.NilPayload() {
+					recv <- u
+					close(recv)
+				}
+				return nil
+			})
+
+			strm.AddReader(r)
+			defer strm.RemoveReader(r)
+
+			for _, pkt := range ca.encoded {
+				strm.WriteUnit(desc.Medias[0], ca.format, &unit.Unit{
+					RTPPackets: []*rtp.Packet{pkt},
+				})
+			}
+
+			received := <-recv
+			require.Equal(t, ca.decoded, received.Payload)
+		})
+	}
+}
+
+func TestStreamEncode(t *testing.T) {
+	for _, ca := range casesDecodeEncode {
+		t.Run(ca.name, func(t *testing.T) {
+			desc := &description.Session{Medias: []*description.Media{{
+				Formats: []format.Format{ca.format},
+			}}}
+
+			strm := &Stream{
+				Desc:              desc,
+				UseRTPPackets:     false,
+				WriteQueueSize:    512,
+				RTPMaxPayloadSize: 1450,
+				Parent:            &nilLogger{},
+			}
+			err := strm.Initialize()
+			require.NoError(t, err)
+			defer strm.Close()
+
+			r := &Reader{}
+			recv := make(chan struct{})
+
+			r.OnData(desc.Medias[0], ca.format, func(u *unit.Unit) error {
+				for i := range min(len(u.RTPPackets), len(ca.encoded)) {
+					u.RTPPackets[i].Timestamp = ca.encoded[i].Timestamp
+					u.RTPPackets[i].SequenceNumber = ca.encoded[i].SequenceNumber
+					u.RTPPackets[i].SSRC = ca.encoded[i].SSRC
+				}
+				require.Equal(t, ca.encoded, u.RTPPackets)
+				close(recv)
+				return nil
+			})
+
+			strm.AddReader(r)
+			defer strm.RemoveReader(r)
+
+			strm.WriteUnit(desc.Medias[0], ca.format, &unit.Unit{
+				Payload: ca.decoded,
+			})
+
+			<-recv
+		})
+	}
+}
diff --git a/internal/stream/unit_remuxer.go b/internal/stream/unit_remuxer.go
new file mode 100644
index 00000000..9b90a7c6
--- /dev/null
+++ b/internal/stream/unit_remuxer.go
@@ -0,0 +1,181 @@
+package stream
+
+import (
+	"bytes"
+
+	"github.com/bluenviron/gortsplib/v5/pkg/format"
+	mch264 "github.com/bluenviron/mediacommon/v2/pkg/codecs/h264"
+	mch265 "github.com/bluenviron/mediacommon/v2/pkg/codecs/h265"
+	"github.com/bluenviron/mediacommon/v2/pkg/codecs/mpeg4video"
+	"github.com/bluenviron/mediamtx/internal/unit"
+)
+
+type unitRemuxer func(format.Format, unit.Payload) unit.Payload
+
+func unitRemuxerH265(forma format.Format, payload unit.Payload) unit.Payload {
+	formatH265 := forma.(*format.H265)
+	au := payload.(unit.PayloadH265)
+
+	isKeyFrame := false
+	n := 0
+
+	for _, nalu := range au {
+		typ := mch265.NALUType((nalu[0] >> 1) & 0b111111)
+
+		switch typ {
+		case mch265.NALUType_VPS_NUT, mch265.NALUType_SPS_NUT, mch265.NALUType_PPS_NUT:
+			continue
+
+		case mch265.NALUType_AUD_NUT:
+			continue
+
+		case mch265.NALUType_IDR_W_RADL, mch265.NALUType_IDR_N_LP, mch265.NALUType_CRA_NUT:
+			if !isKeyFrame {
+				isKeyFrame = true
+
+				// prepend parameters
+				if formatH265.VPS != nil && formatH265.SPS != nil && formatH265.PPS != nil {
+					n += 3
+				}
+			}
+		}
+		n++
+	}
+
+	if n == 0 {
+		return unit.PayloadH265(nil)
+	}
+
+	filteredAU := make([][]byte, n)
+	i := 0
+
+	if isKeyFrame && formatH265.VPS != nil && formatH265.SPS != nil && formatH265.PPS != nil {
+		filteredAU[0] = formatH265.VPS
+		filteredAU[1] = formatH265.SPS
+		filteredAU[2] = formatH265.PPS
+		i = 3
+	}
+
+	for _, nalu := range au {
+		typ := mch265.NALUType((nalu[0] >> 1) & 0b111111)
+
+		switch typ {
+		case mch265.NALUType_VPS_NUT, mch265.NALUType_SPS_NUT, mch265.NALUType_PPS_NUT:
+			continue
+
+		case mch265.NALUType_AUD_NUT:
+			continue
+		}
+
+		filteredAU[i] = nalu
+		i++
+	}
+
+	return unit.PayloadH265(filteredAU)
+}
+
+func unitRemuxerH264(forma format.Format, payload unit.Payload) unit.Payload {
+	formatH264 := forma.(*format.H264)
+	au := payload.(unit.PayloadH264)
+
+	isKeyFrame := false
+	n := 0
+
+	for _, nalu := range au {
+		typ := mch264.NALUType(nalu[0] & 0x1F)
+
+		switch typ {
+		case mch264.NALUTypeSPS, mch264.NALUTypePPS:
+			continue
+
+		case mch264.NALUTypeAccessUnitDelimiter:
+			continue
+
+		case mch264.NALUTypeIDR:
+			if !isKeyFrame {
+				isKeyFrame = true
+
+				// prepend parameters
+				if formatH264.SPS != nil && formatH264.PPS != nil {
+					n += 2
+				}
+			}
+		}
+		n++
+	}
+
+	if n == 0 {
+		return unit.PayloadH264(nil)
+	}
+
+	filteredAU := make([][]byte, n)
+	i := 0
+
+	if isKeyFrame && formatH264.SPS != nil && formatH264.PPS != nil {
+		filteredAU[0] = formatH264.SPS
+		filteredAU[1] = formatH264.PPS
+		i = 2
+	}
+
+	for _, nalu := range au {
+		typ := mch264.NALUType(nalu[0] & 0x1F)
+
+		switch typ {
+		case mch264.NALUTypeSPS, mch264.NALUTypePPS:
+			continue
+
+		case mch264.NALUTypeAccessUnitDelimiter:
+			continue
+		}
+
+		filteredAU[i] = nalu
+		i++
+	}
+
+	return unit.PayloadH264(filteredAU)
+}
+
+func unitRemuxerMPEG4Video(forma format.Format, payload unit.Payload) unit.Payload {
+	formatMPEG4Video := forma.(*format.MPEG4Video)
+	frame := payload.(unit.PayloadMPEG4Video)
+
+	// remove config
+	if bytes.HasPrefix(frame, []byte{0, 0, 1, byte(mpeg4video.VisualObjectSequenceStartCode)}) {
+		end := bytes.Index(frame[4:], []byte{0, 0, 1, byte(mpeg4video.GroupOfVOPStartCode)})
+		if end >= 0 {
+			frame = frame[end+4:]
+		}
+	}
+
+	// add config
+	if bytes.Contains(frame, []byte{0, 0, 1, byte(mpeg4video.GroupOfVOPStartCode)}) {
+		f := make([]byte, len(formatMPEG4Video.Config)+len(frame))
+		n := copy(f, formatMPEG4Video.Config)
+		copy(f[n:], frame)
+		frame = f
+	}
+
+	if len(frame) == 0 {
+		return unit.PayloadMPEG4Video(nil)
+	}
+
+	return frame
+}
+
+func newUnitRemuxer(forma format.Format) unitRemuxer {
+	switch forma.(type) {
+	case *format.H265:
+		return unitRemuxerH265
+
+	case *format.H264:
+		return unitRemuxerH264
+
+	case *format.MPEG4Video:
+		return unitRemuxerMPEG4Video
+
+	default:
+		return unitRemuxer(func(_ format.Format, payload unit.Payload) unit.Payload {
+			return payload
+		})
+	}
+}
diff --git a/internal/test/static_source_parent.go b/internal/test/static_source_parent.go
index d3b8c220..c50fda04 100644
--- a/internal/test/static_source_parent.go
+++ b/internal/test/static_source_parent.go
@@ -30,11 +30,12 @@ func (p *StaticSourceParent) Close() {
 // SetReady implements parent.
 func (p *StaticSourceParent) SetReady(req defs.PathSourceStaticSetReadyReq) defs.PathSourceStaticSetReadyRes {
 	p.stream = &stream.Stream{
-		WriteQueueSize:     512,
-		RTPMaxPayloadSize:  1450,
-		Desc:               req.Desc,
-		GenerateRTPPackets: req.GenerateRTPPackets,
-		Parent:             p,
+		Desc:              req.Desc,
+		UseRTPPackets:     req.UseRTPPackets,
+		WriteQueueSize:    512,
+		RTPMaxPayloadSize: 1450,
+		ReplaceNTP:        req.ReplaceNTP,
+		Parent:            p,
 	}
 	err := p.stream.Initialize()
 	if err != nil {
diff --git a/mediamtx.yml b/mediamtx.yml
index 2f616d01..06bdaaef 100644
--- a/mediamtx.yml
+++ b/mediamtx.yml
@@ -10,9 +10,11 @@
 logLevel: info
 # Destinations of log messages; available values are "stdout", "file" and "syslog".
 logDestinations: [stdout]
-# If "file" is in logDestinations, this is the file which will receive the logs.
+# When destination is "stdout" or "file", emit logs in structured format (JSON).
+logStructured: no
+# When "file" is in logDestinations, this is the file which will receive logs.
 logFile: mediamtx.log
-# If "syslog" is in logDestinations, use prefix for logs.
+# When "syslog" is in logDestinations, use prefix for logs.
 sysLogPrefix: mediamtx
 
 # Timeout of read operations.