docs: remove the "variants" column from publish and read pages (#5717)
This commit is contained in:
@@ -1,20 +1,18 @@
|
||||
# Publish a stream
|
||||
|
||||
Live streams can be published to the server with the following protocols and codecs:
|
||||
Live streams can be published to the server with the following protocols:
|
||||
|
||||
| protocol | variants |
|
||||
| ----------------------------------------------------------------------- | ------------------------------------------------- |
|
||||
| [SRT clients](../3-publish/01-srt-clients.md) | |
|
||||
| [SRT cameras and servers](../3-publish/02-srt-cameras-and-servers.md) | |
|
||||
| [WebRTC clients](../3-publish/03-webrtc-clients.md) | WHIP |
|
||||
| [WebRTC servers](../3-publish/04-webrtc-servers.md) | WHEP |
|
||||
| [RTSP clients](../3-publish/05-rtsp-clients.md) | UDP, TCP, RTSPS |
|
||||
| [RTSP cameras and servers](../3-publish/06-rtsp-cameras-and-servers.md) | UDP, UDP-Multicast, TCP, RTSPS |
|
||||
| [RTMP clients](../3-publish/07-rtmp-clients.md) | RTMP, RTMPS, Enhanced RTMP |
|
||||
| [RTMP cameras and servers](../3-publish/08-rtmp-cameras-and-servers.md) | RTMP, RTMPS, Enhanced RTMP |
|
||||
| [HLS cameras and servers](../3-publish/09-hls-cameras-and-servers.md) | Low-Latency HLS, MP4-based HLS, MPEG-TS-based HLS |
|
||||
| [MPEG-TS](../3-publish/10-mpeg-ts.md) | MPEG-TS over UDP, MPEG-TS over Unix socket |
|
||||
| [RTP](../3-publish/11-rtp.md) | RTP over UDP |
|
||||
- [SRT clients](../3-publish/01-srt-clients.md)
|
||||
- [SRT cameras and servers](../3-publish/02-srt-cameras-and-servers.md)
|
||||
- [WebRTC clients](../3-publish/03-webrtc-clients.md)
|
||||
- [WebRTC servers](../3-publish/04-webrtc-servers.md)
|
||||
- [RTSP clients](../3-publish/05-rtsp-clients.md)
|
||||
- [RTSP cameras and servers](../3-publish/06-rtsp-cameras-and-servers.md)
|
||||
- [RTMP clients](../3-publish/07-rtmp-clients.md)
|
||||
- [RTMP cameras and servers](../3-publish/08-rtmp-cameras-and-servers.md)
|
||||
- [HLS cameras and servers](../3-publish/09-hls-cameras-and-servers.md)
|
||||
- [MPEG-TS](../3-publish/10-mpeg-ts.md)
|
||||
- [RTP](../3-publish/11-rtp.md)
|
||||
|
||||
We provide instructions for publishing with the following devices:
|
||||
|
||||
|
||||
@@ -1,14 +1,12 @@
|
||||
# Read a stream
|
||||
|
||||
Live streams can be read from the server with the following protocols and codecs:
|
||||
Live streams can be read from the server with the following protocols:
|
||||
|
||||
| protocol | variants |
|
||||
| ---------------------------------------- | ------------------------------------------------- |
|
||||
| [SRT clients](../4-read/01-srt.md) | |
|
||||
| [WebRTC clients](../4-read/02-webrtc.md) | WHEP |
|
||||
| [RTSP clients](../4-read/03-rtsp.md) | UDP, UDP-Multicast, TCP, RTSPS |
|
||||
| [RTMP clients](../4-read/04-rtmp.md) | RTMP, RTMPS, Enhanced RTMP |
|
||||
| [HLS](../4-read/05-hls.md) | Low-Latency HLS, MP4-based HLS, MPEG-TS-based HLS |
|
||||
- [SRT clients](../4-read/01-srt.md)
|
||||
- [WebRTC clients](../4-read/02-webrtc.md)
|
||||
- [RTSP clients](../4-read/03-rtsp.md)
|
||||
- [RTMP clients](../4-read/04-rtmp.md)
|
||||
- [HLS](../4-read/05-hls.md)
|
||||
|
||||
We provide instructions for reading with the following software:
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
| **video** | AV1, VP9, H265, H264 |
|
||||
| **audio** | Opus, MPEG-4 Audio (AAC), MPEG-1/2 Audio (MP3), AC-3, G711 (PCMA, PCMU), LPCM |
|
||||
|
||||
RTMP is a protocol that allows to read and publish streams. It supports encryption, read [RTMP-specific features](../2-features/28-rtmp-specific-features.md). Streams can be published to the server by using the URL:
|
||||
RTMP is a protocol that allows to read and publish streams. It has been expanded to support modern codecs (Enhanced RTMP) and it supports encryption, read [RTMP-specific features](../2-features/28-rtmp-specific-features.md). Streams can be published to the server by using the URL:
|
||||
|
||||
```
|
||||
rtmp://localhost/mystream
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
| **video** | AV1, VP9, H265, H264 |
|
||||
| **audio** | Opus, MPEG-4 Audio (AAC), MPEG-1/2 Audio (MP3), AC-3, G711 (PCMA, PCMU), LPCM |
|
||||
|
||||
RTMP is a protocol that allows to read and publish streams. It supports encryption, read [RTMP-specific features](../2-features/28-rtmp-specific-features.md). Streams can be read from the server by using the URL:
|
||||
RTMP is a protocol that allows to read and publish streams. It has been expanded to support modern codecs (Enhanced RTMP) and it supports encryption, read [RTMP-specific features](../2-features/28-rtmp-specific-features.md). Streams can be read from the server by using the URL:
|
||||
|
||||
```
|
||||
rtmp://localhost/mystream
|
||||
|
||||
@@ -19,3 +19,13 @@ http://localhost:8888/mystream/index.m3u8
|
||||
```
|
||||
|
||||
Some clients that can read with HLS are [FFmpeg](06-ffmpeg.md), [GStreamer](07-gstreamer.md), [VLC](08-vlc.md) and [web browsers](13-web-browsers.md).
|
||||
|
||||
HLS content can be generated in several variants:
|
||||
|
||||
- MPEG-TS: uses MPEG-TS segments, for maximum compatibility.
|
||||
- fMP4: uses fragmented MP4 segments, more efficient.
|
||||
- Low-Latency: based on blocking requests that are unlocked as soon as content is available.
|
||||
|
||||
All HLS pameters are listed in the [configuration file](../5-references/1-configuration-file.md).
|
||||
|
||||
HLS can also be used to [scale the server](../2-features/20-scaling.md) through a CDN.
|
||||
|
||||
Reference in New Issue
Block a user