3 files changed, 32 insertions, 1 deletions

diff --git a/shared/core-utils/miscs/http-error-codes.ts b/shared/core-utils/miscs/http-error-codes.ts
index 9ac8a6c83..b2fbdfc5a 100644
--- a/shared/core-utils/miscs/http-error-codes.ts
+++ b/shared/core-utils/miscs/http-error-codes.ts
@@ -196,6 +196,8 @@ export enum HttpStatusCode {
    *
    * Indicates that the request could not be processed because of conflict in the request,
    * such as an edit conflict between multiple simultaneous updates.
+   *
+   * @see HttpStatusCode.UNPROCESSABLE_ENTITY_422 to denote a disabled feature
    */
   CONFLICT_409 = 409,
 
@@ -269,6 +271,12 @@ export enum HttpStatusCode {
    * Official Documentation @ https://tools.ietf.org/html/rfc2518#section-10.3
    *
    * The request was well-formed but was unable to be followed due to semantic errors.
+   * The server understands the content type of the request entity (hence a 415 (Unsupported Media Type) status code is inappropriate),
+   * and the syntax of the request entity is correct (thus a 400 (Bad Request) status code is inappropriate) but was unable to process
+   * the contained instructions. For example, this error condition may occur if an JSON request body contains well-formed (i.e.,
+   * syntactically correct), but semantically erroneous, JSON instructions.
+   *
+   * Can also be used to denote disabled features (akin to disabled syntax).
    *
    * @see HttpStatusCode.UNSUPPORTED_MEDIA_TYPE_415 if the `Content-Type` was not supported.
    * @see HttpStatusCode.BAD_REQUEST_400 if the request was not parsable (broken JSON, XML)
diff --git a/shared/extra-utils/videos/video-imports.ts b/shared/extra-utils/videos/video-imports.ts
index 52e0075fb..259b8a314 100644
--- a/shared/extra-utils/videos/video-imports.ts
+++ b/shared/extra-utils/videos/video-imports.ts
@@ -4,7 +4,28 @@ 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 <url> -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=MSJ25EqI19c'
 }
 
 function getMagnetURI () {
@@ -61,6 +82,7 @@ function getMyVideoImports (url: string, token: string, sort?: string) {
 export {
   getBadVideoUrl,
   getYoutubeVideoUrl,
+  getYoutubeHDRVideoUrl,
   importVideo,
   getMagnetURI,
   getMyVideoImports,
diff --git a/shared/models/server/job.model.ts b/shared/models/server/job.model.ts
index b0ed860a7..2af2a25a6 100644
--- a/shared/models/server/job.model.ts
+++ b/shared/models/server/job.model.ts
@@ -82,6 +82,7 @@ export type VideoImportYoutubeDLPayload = {
   generatePreview: boolean
 
   fileExt?: string
+  mergeExt?: string
 }
 export type VideoImportTorrentPayload = {
   type: VideoImportTorrentPayloadType