diff options
author | Chocobozzz <me@florianbigard.com> | 2019-11-15 15:06:03 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2019-11-25 10:59:43 +0100 |
commit | d7a25329f9e607894d29ab342b9cb66638b56dc0 (patch) | |
tree | 6cd6bc4f2689f78944238b313c93427423a932ac /config | |
parent | 14981d7331da3f63fe6cfaf020ccb7c910006eaf (diff) | |
download | PeerTube-d7a25329f9e607894d29ab342b9cb66638b56dc0.tar.gz PeerTube-d7a25329f9e607894d29ab342b9cb66638b56dc0.tar.zst PeerTube-d7a25329f9e607894d29ab342b9cb66638b56dc0.zip |
Add ability to disable webtorrent
In favour of HLS
Diffstat (limited to 'config')
-rw-r--r-- | config/default.yaml | 8 | ||||
-rw-r--r-- | config/production.yaml.example | 8 |
2 files changed, 14 insertions, 2 deletions
diff --git a/config/default.yaml b/config/default.yaml index b16ebe934..9d102f760 100644 --- a/config/default.yaml +++ b/config/default.yaml | |||
@@ -209,12 +209,18 @@ transcoding: | |||
209 | 720p: false | 209 | 720p: false |
210 | 1080p: false | 210 | 1080p: false |
211 | 2160p: false | 211 | 2160p: false |
212 | |||
213 | # Generate videos in a WebTorrent format (what we do since the first PeerTube release) | ||
214 | # If you also enabled the hls format, it will multiply videos storage by 2 | ||
215 | webtorrent: | ||
216 | enabled: true | ||
217 | |||
212 | # /!\ Requires ffmpeg >= 4.1 | 218 | # /!\ Requires ffmpeg >= 4.1 |
213 | # Generate HLS playlists and fragmented MP4 files. Better playback than with WebTorrent: | 219 | # Generate HLS playlists and fragmented MP4 files. Better playback than with WebTorrent: |
214 | # * Resolution change is smoother | 220 | # * Resolution change is smoother |
215 | # * Faster playback in particular with long videos | 221 | # * Faster playback in particular with long videos |
216 | # * More stable playback (less bugs/infinite loading) | 222 | # * More stable playback (less bugs/infinite loading) |
217 | # /!\ Multiplies videos storage by 2 /!\ | 223 | # If you also enabled the webtorrent format, it will multiply videos storage by 2 |
218 | hls: | 224 | hls: |
219 | enabled: false | 225 | enabled: false |
220 | 226 | ||
diff --git a/config/production.yaml.example b/config/production.yaml.example index d563c7cf2..68ae22944 100644 --- a/config/production.yaml.example +++ b/config/production.yaml.example | |||
@@ -223,12 +223,18 @@ transcoding: | |||
223 | 720p: false | 223 | 720p: false |
224 | 1080p: false | 224 | 1080p: false |
225 | 2160p: false | 225 | 2160p: false |
226 | |||
227 | # Generate videos in a WebTorrent format (what we do since the first PeerTube release) | ||
228 | # If you also enabled the hls format, it will multiply videos storage by 2 | ||
229 | webtorrent: | ||
230 | enabled: true | ||
231 | |||
226 | # /!\ Requires ffmpeg >= 4.1 | 232 | # /!\ Requires ffmpeg >= 4.1 |
227 | # Generate HLS playlists and fragmented MP4 files. Better playback than with WebTorrent: | 233 | # Generate HLS playlists and fragmented MP4 files. Better playback than with WebTorrent: |
228 | # * Resolution change is smoother | 234 | # * Resolution change is smoother |
229 | # * Faster playback in particular with long videos | 235 | # * Faster playback in particular with long videos |
230 | # * More stable playback (less bugs/infinite loading) | 236 | # * More stable playback (less bugs/infinite loading) |
231 | # /!\ Multiplies videos storage by 2 /!\ | 237 | # If you also enabled the webtorrent format, it will multiply videos storage by 2 |
232 | hls: | 238 | hls: |
233 | enabled: false | 239 | enabled: false |
234 | 240 | ||