X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=shared%2Fextra-utils%2Fvideos%2Fvideo-imports.ts;h=81c0163cbdeba84cf4fc0178886c2bdaa42b9aa7;hb=3ce48a0cd062d9ff64d9411d702453503a49f3b1;hp=8e5abd2f54a8db956ae6b59d42f6a6ce5e4e1b0a;hpb=a15871560f80e07386c1dabb8370cd2664ecfd1f;p=github%2FChocobozzz%2FPeerTube.git diff --git a/shared/extra-utils/videos/video-imports.ts b/shared/extra-utils/videos/video-imports.ts index 8e5abd2f5..81c0163cb 100644 --- a/shared/extra-utils/videos/video-imports.ts +++ b/shared/extra-utils/videos/video-imports.ts @@ -1,9 +1,31 @@ import { VideoImportCreate } from '../../models/videos' import { makeGetRequest, makeUploadRequest } from '../requests/requests' +import { HttpStatusCode } from '../../../shared/core-utils/miscs/http-error-codes' function getYoutubeVideoUrl () { - return 'http://www.youtube.com/watch?v=msX3jv1XdvM' + return 'https://www.youtube.com/watch?v=msX3jv1XdvM' +} + +function getYoutubeHDRVideoUrl () { + /** + * The video is used to check format-selection correctness wrt. HDR, + * which brings its own set of oddities outside of a MediaSource. + * FIXME: refactor once HDR is supported at playback + * + * The video needs to have the following format_ids: + * (which you can check by using `youtube-dl -F`): + * - 303 (1080p webm vp9) + * - 299 (1080p mp4 avc1) + * - 335 (1080p webm vp9.2 HDR) + * + * 15 jan. 2021: TEST VIDEO NOT CURRENTLY PROVIDING + * - 400 (1080p mp4 av01) + * - 315 (2160p webm vp9 HDR) + * - 337 (2160p webm vp9.2 HDR) + * - 401 (2160p mp4 av01 HDR) + */ + return 'https://www.youtube.com/watch?v=qR5vOXbZsI4' } function getMagnetURI () { @@ -15,7 +37,16 @@ function getBadVideoUrl () { return 'https://download.cpy.re/peertube/bad_video.mp4' } -function importVideo (url: string, token: string, attributes: VideoImportCreate) { +function getGoodVideoUrl () { + return 'https://download.cpy.re/peertube/good_video.mp4' +} + +function importVideo ( + url: string, + token: string, + attributes: VideoImportCreate & { torrentfile?: string }, + statusCodeExpected = HttpStatusCode.OK_200 +) { const path = '/api/v1/videos/imports' let attaches: any = {} @@ -27,7 +58,7 @@ function importVideo (url: string, token: string, attributes: VideoImportCreate) token, attaches, fields: attributes, - statusCodeExpected: 200 + statusCodeExpected }) } @@ -42,7 +73,7 @@ function getMyVideoImports (url: string, token: string, sort?: string) { query, path, token, - statusCodeExpected: 200 + statusCodeExpected: HttpStatusCode.OK_200 }) } @@ -51,7 +82,9 @@ function getMyVideoImports (url: string, token: string, sort?: string) { export { getBadVideoUrl, getYoutubeVideoUrl, + getYoutubeHDRVideoUrl, importVideo, getMagnetURI, - getMyVideoImports + getMyVideoImports, + getGoodVideoUrl }