diff options
Diffstat (limited to 'config')
-rw-r--r-- | config/default.yaml | 4 | ||||
-rw-r--r-- | config/production.yaml.example | 4 | ||||
-rw-r--r-- | config/test.yaml | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/config/default.yaml b/config/default.yaml index d400e1067..f9b6c50a3 100644 --- a/config/default.yaml +++ b/config/default.yaml | |||
@@ -272,7 +272,7 @@ transcoding: | |||
272 | # If you also enabled the hls format, it will multiply videos storage by 2 | 272 | # If you also enabled the hls format, it will multiply videos storage by 2 |
273 | # If disabled, breaks federation with PeerTube instances < 2.1 | 273 | # If disabled, breaks federation with PeerTube instances < 2.1 |
274 | webtorrent: | 274 | webtorrent: |
275 | enabled: true | 275 | enabled: false |
276 | 276 | ||
277 | # /!\ Requires ffmpeg >= 4.1 | 277 | # /!\ Requires ffmpeg >= 4.1 |
278 | # Generate HLS playlists and fragmented MP4 files. Better playback than with WebTorrent: | 278 | # Generate HLS playlists and fragmented MP4 files. Better playback than with WebTorrent: |
@@ -281,7 +281,7 @@ transcoding: | |||
281 | # * More stable playback (less bugs/infinite loading) | 281 | # * More stable playback (less bugs/infinite loading) |
282 | # If you also enabled the webtorrent format, it will multiply videos storage by 2 | 282 | # If you also enabled the webtorrent format, it will multiply videos storage by 2 |
283 | hls: | 283 | hls: |
284 | enabled: false | 284 | enabled: true |
285 | 285 | ||
286 | live: | 286 | live: |
287 | enabled: false | 287 | enabled: false |
diff --git a/config/production.yaml.example b/config/production.yaml.example index 895931e7c..f2e75af32 100644 --- a/config/production.yaml.example +++ b/config/production.yaml.example | |||
@@ -282,7 +282,7 @@ transcoding: | |||
282 | # If you also enabled the hls format, it will multiply videos storage by 2 | 282 | # If you also enabled the hls format, it will multiply videos storage by 2 |
283 | # If disabled, breaks federation with PeerTube instances < 2.1 | 283 | # If disabled, breaks federation with PeerTube instances < 2.1 |
284 | webtorrent: | 284 | webtorrent: |
285 | enabled: true | 285 | enabled: false |
286 | 286 | ||
287 | # /!\ Requires ffmpeg >= 4.1 | 287 | # /!\ Requires ffmpeg >= 4.1 |
288 | # Generate HLS playlists and fragmented MP4 files. Better playback than with WebTorrent: | 288 | # Generate HLS playlists and fragmented MP4 files. Better playback than with WebTorrent: |
@@ -291,7 +291,7 @@ transcoding: | |||
291 | # * More stable playback (less bugs/infinite loading) | 291 | # * More stable playback (less bugs/infinite loading) |
292 | # If you also enabled the webtorrent format, it will multiply videos storage by 2 | 292 | # If you also enabled the webtorrent format, it will multiply videos storage by 2 |
293 | hls: | 293 | hls: |
294 | enabled: false | 294 | enabled: true |
295 | 295 | ||
296 | live: | 296 | live: |
297 | enabled: false | 297 | enabled: false |
diff --git a/config/test.yaml b/config/test.yaml index 4f0a7e5d9..9a522a983 100644 --- a/config/test.yaml +++ b/config/test.yaml | |||
@@ -87,6 +87,8 @@ transcoding: | |||
87 | 1080p: true | 87 | 1080p: true |
88 | 1440p: true | 88 | 1440p: true |
89 | 2160p: true | 89 | 2160p: true |
90 | webtorrent: | ||
91 | enabled: true | ||
90 | hls: | 92 | hls: |
91 | enabled: true | 93 | enabled: true |
92 | 94 | ||