diff options
| author | Rigel Kent <sendmemail@rigelk.eu> | 2021-01-15 15:56:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-15 15:56:56 +0100 |
| commit | 454c20fa7cdb05eba7f1be3c83389b54807af0b3 (patch) | |
| tree | e9b364da69eaf88f0470414c506c3b5631984c60 /server/middlewares/validators/videos | |
| parent | d43c6b1ffc5e6c895f9e9f9de6625f17a9755c20 (diff) | |
| download | PeerTube-454c20fa7cdb05eba7f1be3c83389b54807af0b3.tar.gz PeerTube-454c20fa7cdb05eba7f1be3c83389b54807af0b3.tar.zst PeerTube-454c20fa7cdb05eba7f1be3c83389b54807af0b3.zip | |
stricter youtubedl format selectors (#3516)
* stricter youtubedl format selectors
make sure selectors avoid av1, and otherwise match as closely to the
maximum resolution enabled for transcoding
* add support for merge formats in youtubedl
* avoid vp9.2 in youtubedl to avoid any HDR
* move getEnabledResolutions, safer replace of imported extension
* add test for youtube-dl selectors
Diffstat (limited to 'server/middlewares/validators/videos')
| -rw-r--r-- | server/middlewares/validators/videos/video-imports.ts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/server/middlewares/validators/videos/video-imports.ts b/server/middlewares/validators/videos/video-imports.ts index 0d41933a6..c53af3861 100644 --- a/server/middlewares/validators/videos/video-imports.ts +++ b/server/middlewares/validators/videos/video-imports.ts | |||
| @@ -43,7 +43,7 @@ const videoImportAddValidator = getCommonVideoEditAttributes().concat([ | |||
| 43 | 43 | ||
| 44 | if (areValidationErrors(req, res)) return cleanUpReqFiles(req) | 44 | if (areValidationErrors(req, res)) return cleanUpReqFiles(req) |
| 45 | 45 | ||
| 46 | if (req.body.targetUrl && CONFIG.IMPORT.VIDEOS.HTTP.ENABLED !== true) { | 46 | if (CONFIG.IMPORT.VIDEOS.HTTP.ENABLED !== true && req.body.targetUrl) { |
| 47 | cleanUpReqFiles(req) | 47 | cleanUpReqFiles(req) |
| 48 | return res.status(HttpStatusCode.CONFLICT_409) | 48 | return res.status(HttpStatusCode.CONFLICT_409) |
| 49 | .json({ error: 'HTTP import is not enabled on this instance.' }) | 49 | .json({ error: 'HTTP import is not enabled on this instance.' }) |