aboutsummaryrefslogtreecommitdiffhomepage
path: root/server
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2019-06-12 17:26:23 +0200
committerChocobozzz <me@florianbigard.com>2019-06-12 17:26:23 +0200
commit00aa1f0d9b9a976a102773cb520f2464ef5c7540 (patch)
tree90ed4d44d75470ff0890332fe6038422859b2f11 /server
parenta80e84f047dc3d2229f1c5df9f008298fafb85a0 (diff)
downloadPeerTube-00aa1f0d9b9a976a102773cb520f2464ef5c7540.tar.gz
PeerTube-00aa1f0d9b9a976a102773cb520f2464ef5c7540.tar.zst
PeerTube-00aa1f0d9b9a976a102773cb520f2464ef5c7540.zip
Add 4k conf in transcoding in admin panel
Diffstat (limited to 'server')
-rw-r--r--server/controllers/api/config.ts3
-rw-r--r--server/initializers/config.ts3
2 files changed, 4 insertions, 2 deletions
diff --git a/server/controllers/api/config.ts b/server/controllers/api/config.ts
index 27c416a12..1d12f701b 100644
--- a/server/controllers/api/config.ts
+++ b/server/controllers/api/config.ts
@@ -262,7 +262,8 @@ function customConfig (): CustomConfig {
262 '360p': CONFIG.TRANSCODING.RESOLUTIONS[ '360p' ], 262 '360p': CONFIG.TRANSCODING.RESOLUTIONS[ '360p' ],
263 '480p': CONFIG.TRANSCODING.RESOLUTIONS[ '480p' ], 263 '480p': CONFIG.TRANSCODING.RESOLUTIONS[ '480p' ],
264 '720p': CONFIG.TRANSCODING.RESOLUTIONS[ '720p' ], 264 '720p': CONFIG.TRANSCODING.RESOLUTIONS[ '720p' ],
265 '1080p': CONFIG.TRANSCODING.RESOLUTIONS[ '1080p' ] 265 '1080p': CONFIG.TRANSCODING.RESOLUTIONS[ '1080p' ],
266 '2160p': CONFIG.TRANSCODING.RESOLUTIONS[ '2160p' ]
266 }, 267 },
267 hls: { 268 hls: {
268 enabled: CONFIG.TRANSCODING.HLS.ENABLED 269 enabled: CONFIG.TRANSCODING.HLS.ENABLED
diff --git a/server/initializers/config.ts b/server/initializers/config.ts
index 50653b0a0..bb278ba43 100644
--- a/server/initializers/config.ts
+++ b/server/initializers/config.ts
@@ -156,7 +156,8 @@ const CONFIG = {
156 get '360p' () { return config.get<boolean>('transcoding.resolutions.360p') }, 156 get '360p' () { return config.get<boolean>('transcoding.resolutions.360p') },
157 get '480p' () { return config.get<boolean>('transcoding.resolutions.480p') }, 157 get '480p' () { return config.get<boolean>('transcoding.resolutions.480p') },
158 get '720p' () { return config.get<boolean>('transcoding.resolutions.720p') }, 158 get '720p' () { return config.get<boolean>('transcoding.resolutions.720p') },
159 get '1080p' () { return config.get<boolean>('transcoding.resolutions.1080p') } 159 get '1080p' () { return config.get<boolean>('transcoding.resolutions.1080p') },
160 get '2160p' () { return config.get<boolean>('transcoding.resolutions.2160p') }
160 }, 161 },
161 HLS: { 162 HLS: {
162 get ENABLED () { return config.get<boolean>('transcoding.hls.enabled') } 163 get ENABLED () { return config.get<boolean>('transcoding.hls.enabled') }