diff options
author | Florian CUNY <poslovitch@bentobox.world> | 2021-11-05 10:23:02 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-05 10:23:02 +0100 |
commit | 8dd754c76735417305c4b68e2ada6f623e9d7650 (patch) | |
tree | ac08054cc81f7aff812e175443298f287f66b96d /server/initializers | |
parent | dd6d2a7ce50e7ff02e00995ccc87f8f929ad9709 (diff) | |
download | PeerTube-8dd754c76735417305c4b68e2ada6f623e9d7650.tar.gz PeerTube-8dd754c76735417305c4b68e2ada6f623e9d7650.tar.zst PeerTube-8dd754c76735417305c4b68e2ada6f623e9d7650.zip |
Added 144p encoding (#4492)
* Added 144p encoding
Implements https://github.com/Chocobozzz/PeerTube/issues/4428
* Fixed typo in core-utils
* Increased BitPerPixel for 144p
* Disabled 144p by default in test.yaml
* Another try at fixing tests
* Fixed test in video-transcoder (api-3)
* Fixed test in video-imports (api-4)
* Fixed test in live-constraints (api-2)
* Tried to fix tests in api-3 again
* Revert "Tried to fix tests in api-3 again"
This reverts commit 266e1143fa37f333d149c2c2791c7bd33621ac14.
* Fixed test in config.ts (api-2)
* Try to fix test in video-hls.ts (api-3)
* Fixed test in video-transcoder.ts (api-3)
* Fix tests
Co-authored-by: Chocobozzz <me@florianbigard.com>
Diffstat (limited to 'server/initializers')
-rw-r--r-- | server/initializers/checker-before-init.ts | 11 | ||||
-rw-r--r-- | server/initializers/config.ts | 2 |
2 files changed, 8 insertions, 5 deletions
diff --git a/server/initializers/checker-before-init.ts b/server/initializers/checker-before-init.ts index 72acdd422..39f0cebf6 100644 --- a/server/initializers/checker-before-init.ts +++ b/server/initializers/checker-before-init.ts | |||
@@ -28,8 +28,9 @@ function checkMissedConfig () { | |||
28 | 'redundancy.videos.strategies', 'redundancy.videos.check_interval', | 28 | 'redundancy.videos.strategies', 'redundancy.videos.check_interval', |
29 | 'transcoding.enabled', 'transcoding.threads', 'transcoding.allow_additional_extensions', 'transcoding.hls.enabled', | 29 | 'transcoding.enabled', 'transcoding.threads', 'transcoding.allow_additional_extensions', 'transcoding.hls.enabled', |
30 | 'transcoding.profile', 'transcoding.concurrency', | 30 | 'transcoding.profile', 'transcoding.concurrency', |
31 | 'transcoding.resolutions.0p', 'transcoding.resolutions.240p', 'transcoding.resolutions.360p', 'transcoding.resolutions.480p', | 31 | 'transcoding.resolutions.0p', 'transcoding.resolutions.144p', 'transcoding.resolutions.240p', 'transcoding.resolutions.360p', |
32 | 'transcoding.resolutions.720p', 'transcoding.resolutions.1080p', 'transcoding.resolutions.1440p', 'transcoding.resolutions.2160p', | 32 | 'transcoding.resolutions.480p', 'transcoding.resolutions.720p', 'transcoding.resolutions.1080p', 'transcoding.resolutions.1440p', |
33 | 'transcoding.resolutions.2160p', | ||
33 | 'import.videos.http.enabled', 'import.videos.torrent.enabled', 'import.videos.concurrency', 'auto_blacklist.videos.of_users.enabled', | 34 | 'import.videos.http.enabled', 'import.videos.torrent.enabled', 'import.videos.concurrency', 'auto_blacklist.videos.of_users.enabled', |
34 | 'trending.videos.interval_days', | 35 | 'trending.videos.interval_days', |
35 | 'instance.name', 'instance.short_description', 'instance.description', 'instance.terms', 'instance.default_client_route', | 36 | 'instance.name', 'instance.short_description', 'instance.description', 'instance.terms', 'instance.default_client_route', |
@@ -47,9 +48,9 @@ function checkMissedConfig () { | |||
47 | 'search.search_index.disable_local_search', 'search.search_index.is_default_search', | 48 | 'search.search_index.disable_local_search', 'search.search_index.is_default_search', |
48 | 'live.enabled', 'live.allow_replay', 'live.max_duration', 'live.max_user_lives', 'live.max_instance_lives', | 49 | 'live.enabled', 'live.allow_replay', 'live.max_duration', 'live.max_user_lives', 'live.max_instance_lives', |
49 | 'live.transcoding.enabled', 'live.transcoding.threads', 'live.transcoding.profile', | 50 | 'live.transcoding.enabled', 'live.transcoding.threads', 'live.transcoding.profile', |
50 | 'live.transcoding.resolutions.240p', 'live.transcoding.resolutions.360p', 'live.transcoding.resolutions.480p', | 51 | 'live.transcoding.resolutions.144p', 'live.transcoding.resolutions.240p', 'live.transcoding.resolutions.360p', |
51 | 'live.transcoding.resolutions.720p', 'live.transcoding.resolutions.1080p', 'live.transcoding.resolutions.1440p', | 52 | 'live.transcoding.resolutions.480p', 'live.transcoding.resolutions.720p', 'live.transcoding.resolutions.1080p', |
52 | 'live.transcoding.resolutions.2160p' | 53 | 'live.transcoding.resolutions.1440p', 'live.transcoding.resolutions.2160p' |
53 | ] | 54 | ] |
54 | 55 | ||
55 | const requiredAlternatives = [ | 56 | const requiredAlternatives = [ |
diff --git a/server/initializers/config.ts b/server/initializers/config.ts index 8375bf430..0d5e29499 100644 --- a/server/initializers/config.ts +++ b/server/initializers/config.ts | |||
@@ -245,6 +245,7 @@ const CONFIG = { | |||
245 | get PROFILE () { return config.get<string>('transcoding.profile') }, | 245 | get PROFILE () { return config.get<string>('transcoding.profile') }, |
246 | RESOLUTIONS: { | 246 | RESOLUTIONS: { |
247 | get '0p' () { return config.get<boolean>('transcoding.resolutions.0p') }, | 247 | get '0p' () { return config.get<boolean>('transcoding.resolutions.0p') }, |
248 | get '144p' () { return config.get<boolean>('transcoding.resolutions.144p') }, | ||
248 | get '240p' () { return config.get<boolean>('transcoding.resolutions.240p') }, | 249 | get '240p' () { return config.get<boolean>('transcoding.resolutions.240p') }, |
249 | get '360p' () { return config.get<boolean>('transcoding.resolutions.360p') }, | 250 | get '360p' () { return config.get<boolean>('transcoding.resolutions.360p') }, |
250 | get '480p' () { return config.get<boolean>('transcoding.resolutions.480p') }, | 251 | get '480p' () { return config.get<boolean>('transcoding.resolutions.480p') }, |
@@ -279,6 +280,7 @@ const CONFIG = { | |||
279 | get PROFILE () { return config.get<string>('live.transcoding.profile') }, | 280 | get PROFILE () { return config.get<string>('live.transcoding.profile') }, |
280 | 281 | ||
281 | RESOLUTIONS: { | 282 | RESOLUTIONS: { |
283 | get '144p' () { return config.get<boolean>('live.transcoding.resolutions.144p') }, | ||
282 | get '240p' () { return config.get<boolean>('live.transcoding.resolutions.240p') }, | 284 | get '240p' () { return config.get<boolean>('live.transcoding.resolutions.240p') }, |
283 | get '360p' () { return config.get<boolean>('live.transcoding.resolutions.360p') }, | 285 | get '360p' () { return config.get<boolean>('live.transcoding.resolutions.360p') }, |
284 | get '480p' () { return config.get<boolean>('live.transcoding.resolutions.480p') }, | 286 | get '480p' () { return config.get<boolean>('live.transcoding.resolutions.480p') }, |