diff options
Diffstat (limited to 'server/initializers')
-rw-r--r-- | server/initializers/checker-before-init.ts | 4 | ||||
-rw-r--r-- | server/initializers/config.ts | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/server/initializers/checker-before-init.ts b/server/initializers/checker-before-init.ts index 359f0c31d..f4057b81b 100644 --- a/server/initializers/checker-before-init.ts +++ b/server/initializers/checker-before-init.ts | |||
@@ -30,7 +30,7 @@ function checkMissedConfig () { | |||
30 | 'transcoding.profile', 'transcoding.concurrency', | 30 | 'transcoding.profile', 'transcoding.concurrency', |
31 | 'transcoding.resolutions.0p', 'transcoding.resolutions.144p', 'transcoding.resolutions.240p', 'transcoding.resolutions.360p', | 31 | 'transcoding.resolutions.0p', 'transcoding.resolutions.144p', 'transcoding.resolutions.240p', 'transcoding.resolutions.360p', |
32 | 'transcoding.resolutions.480p', 'transcoding.resolutions.720p', 'transcoding.resolutions.1080p', 'transcoding.resolutions.1440p', | 32 | 'transcoding.resolutions.480p', 'transcoding.resolutions.720p', 'transcoding.resolutions.1080p', 'transcoding.resolutions.1440p', |
33 | 'transcoding.resolutions.2160p', 'video_studio.enabled', | 33 | 'transcoding.resolutions.2160p', 'transcoding.always_transcode_original_resolution', 'video_studio.enabled', |
34 | 'import.videos.http.enabled', 'import.videos.torrent.enabled', 'import.videos.concurrency', 'import.videos.timeout', | 34 | 'import.videos.http.enabled', 'import.videos.torrent.enabled', 'import.videos.concurrency', 'import.videos.timeout', |
35 | 'auto_blacklist.videos.of_users.enabled', 'trending.videos.interval_days', | 35 | 'auto_blacklist.videos.of_users.enabled', 'trending.videos.interval_days', |
36 | 'client.videos.miniature.display_author_avatar', | 36 | 'client.videos.miniature.display_author_avatar', |
@@ -59,7 +59,7 @@ function checkMissedConfig () { | |||
59 | 'live.transcoding.enabled', 'live.transcoding.threads', 'live.transcoding.profile', | 59 | 'live.transcoding.enabled', 'live.transcoding.threads', 'live.transcoding.profile', |
60 | 'live.transcoding.resolutions.144p', 'live.transcoding.resolutions.240p', 'live.transcoding.resolutions.360p', | 60 | 'live.transcoding.resolutions.144p', 'live.transcoding.resolutions.240p', 'live.transcoding.resolutions.360p', |
61 | 'live.transcoding.resolutions.480p', 'live.transcoding.resolutions.720p', 'live.transcoding.resolutions.1080p', | 61 | 'live.transcoding.resolutions.480p', 'live.transcoding.resolutions.720p', 'live.transcoding.resolutions.1080p', |
62 | 'live.transcoding.resolutions.1440p', 'live.transcoding.resolutions.2160p' | 62 | 'live.transcoding.resolutions.1440p', 'live.transcoding.resolutions.2160p', 'live.transcoding.always_transcode_original_resolution' |
63 | ] | 63 | ] |
64 | 64 | ||
65 | const requiredAlternatives = [ | 65 | const requiredAlternatives = [ |
diff --git a/server/initializers/config.ts b/server/initializers/config.ts index ba0f756ef..1a0b8942c 100644 --- a/server/initializers/config.ts +++ b/server/initializers/config.ts | |||
@@ -309,6 +309,7 @@ const CONFIG = { | |||
309 | get THREADS () { return config.get<number>('transcoding.threads') }, | 309 | get THREADS () { return config.get<number>('transcoding.threads') }, |
310 | get CONCURRENCY () { return config.get<number>('transcoding.concurrency') }, | 310 | get CONCURRENCY () { return config.get<number>('transcoding.concurrency') }, |
311 | get PROFILE () { return config.get<string>('transcoding.profile') }, | 311 | get PROFILE () { return config.get<string>('transcoding.profile') }, |
312 | get ALWAYS_TRANSCODE_ORIGINAL_RESOLUTION () { return config.get<boolean>('transcoding.always_transcode_original_resolution') }, | ||
312 | RESOLUTIONS: { | 313 | RESOLUTIONS: { |
313 | get '0p' () { return config.get<boolean>('transcoding.resolutions.0p') }, | 314 | get '0p' () { return config.get<boolean>('transcoding.resolutions.0p') }, |
314 | get '144p' () { return config.get<boolean>('transcoding.resolutions.144p') }, | 315 | get '144p' () { return config.get<boolean>('transcoding.resolutions.144p') }, |
@@ -361,6 +362,8 @@ const CONFIG = { | |||
361 | get THREADS () { return config.get<number>('live.transcoding.threads') }, | 362 | get THREADS () { return config.get<number>('live.transcoding.threads') }, |
362 | get PROFILE () { return config.get<string>('live.transcoding.profile') }, | 363 | get PROFILE () { return config.get<string>('live.transcoding.profile') }, |
363 | 364 | ||
365 | get ALWAYS_TRANSCODE_ORIGINAL_RESOLUTION () { return config.get<boolean>('live.transcoding.always_transcode_original_resolution') }, | ||
366 | |||
364 | RESOLUTIONS: { | 367 | RESOLUTIONS: { |
365 | get '144p' () { return config.get<boolean>('live.transcoding.resolutions.144p') }, | 368 | get '144p' () { return config.get<boolean>('live.transcoding.resolutions.144p') }, |
366 | get '240p' () { return config.get<boolean>('live.transcoding.resolutions.240p') }, | 369 | get '240p' () { return config.get<boolean>('live.transcoding.resolutions.240p') }, |