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/controllers/api/config.ts | |
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/controllers/api/config.ts')
-rw-r--r-- | server/controllers/api/config.ts | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/server/controllers/api/config.ts b/server/controllers/api/config.ts index 8965cacc9..805ad99c7 100644 --- a/server/controllers/api/config.ts +++ b/server/controllers/api/config.ts | |||
@@ -208,6 +208,7 @@ function customConfig (): CustomConfig { | |||
208 | profile: CONFIG.TRANSCODING.PROFILE, | 208 | profile: CONFIG.TRANSCODING.PROFILE, |
209 | resolutions: { | 209 | resolutions: { |
210 | '0p': CONFIG.TRANSCODING.RESOLUTIONS['0p'], | 210 | '0p': CONFIG.TRANSCODING.RESOLUTIONS['0p'], |
211 | '144p': CONFIG.TRANSCODING.RESOLUTIONS['144p'], | ||
211 | '240p': CONFIG.TRANSCODING.RESOLUTIONS['240p'], | 212 | '240p': CONFIG.TRANSCODING.RESOLUTIONS['240p'], |
212 | '360p': CONFIG.TRANSCODING.RESOLUTIONS['360p'], | 213 | '360p': CONFIG.TRANSCODING.RESOLUTIONS['360p'], |
213 | '480p': CONFIG.TRANSCODING.RESOLUTIONS['480p'], | 214 | '480p': CONFIG.TRANSCODING.RESOLUTIONS['480p'], |
@@ -234,6 +235,7 @@ function customConfig (): CustomConfig { | |||
234 | threads: CONFIG.LIVE.TRANSCODING.THREADS, | 235 | threads: CONFIG.LIVE.TRANSCODING.THREADS, |
235 | profile: CONFIG.LIVE.TRANSCODING.PROFILE, | 236 | profile: CONFIG.LIVE.TRANSCODING.PROFILE, |
236 | resolutions: { | 237 | resolutions: { |
238 | '144p': CONFIG.LIVE.TRANSCODING.RESOLUTIONS['144p'], | ||
237 | '240p': CONFIG.LIVE.TRANSCODING.RESOLUTIONS['240p'], | 239 | '240p': CONFIG.LIVE.TRANSCODING.RESOLUTIONS['240p'], |
238 | '360p': CONFIG.LIVE.TRANSCODING.RESOLUTIONS['360p'], | 240 | '360p': CONFIG.LIVE.TRANSCODING.RESOLUTIONS['360p'], |
239 | '480p': CONFIG.LIVE.TRANSCODING.RESOLUTIONS['480p'], | 241 | '480p': CONFIG.LIVE.TRANSCODING.RESOLUTIONS['480p'], |