aboutsummaryrefslogtreecommitdiffhomepage
path: root/config
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2021-04-06 08:41:18 +0200
committerChocobozzz <me@florianbigard.com>2021-04-06 09:52:53 +0200
commit6a882428e11f924db2ae8ff188df11a42eaaec46 (patch)
tree0df4166fcdc15c1ca272f8a50a2ab814fae8b1fc /config
parenteff9f818109d4fe280684d80f7e100667dfa9dc5 (diff)
downloadPeerTube-6a882428e11f924db2ae8ff188df11a42eaaec46.tar.gz
PeerTube-6a882428e11f924db2ae8ff188df11a42eaaec46.tar.zst
PeerTube-6a882428e11f924db2ae8ff188df11a42eaaec46.zip
Enable HLS transcoding by default
Diffstat (limited to 'config')
-rw-r--r--config/default.yaml4
-rw-r--r--config/production.yaml.example4
-rw-r--r--config/test.yaml2
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
286live: 286live:
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
296live: 296live:
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