From 056aa7f2b4de1ef128a5fd35527de6dd7a9ebad1 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 27 Feb 2018 15:57:28 +0100 Subject: Fix resolution for portrait videos --- server/lib/job-queue/handlers/video-file.ts | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'server/lib/job-queue/handlers/video-file.ts') diff --git a/server/lib/job-queue/handlers/video-file.ts b/server/lib/job-queue/handlers/video-file.ts index 5294483bd..bd9412290 100644 --- a/server/lib/job-queue/handlers/video-file.ts +++ b/server/lib/job-queue/handlers/video-file.ts @@ -11,7 +11,8 @@ import { JobQueue } from '../job-queue' export type VideoFilePayload = { videoUUID: string - resolution?: VideoResolution + resolution?: VideoResolution, + isPortraitMode?: boolean } async function processVideoFile (job: kue.Job) { @@ -27,7 +28,7 @@ async function processVideoFile (job: kue.Job) { // Transcoding in other resolution if (payload.resolution) { - await video.transcodeOriginalVideofile(payload.resolution) + await video.transcodeOriginalVideofile(payload.resolution, payload.isPortraitMode) await onVideoFileTranscoderSuccess(video) } else { await video.optimizeOriginalVideofile() @@ -66,12 +67,12 @@ async function onVideoFileOptimizerSuccess (video: VideoModel) { await shareVideoByServerAndChannel(video, undefined) } - const originalFileHeight = await videoDatabase.getOriginalFileHeight() + const { videoFileResolution } = await videoDatabase.getOriginalFileResolution() // Create transcoding jobs if there are enabled resolutions - const resolutionsEnabled = computeResolutionsToTranscode(originalFileHeight) + const resolutionsEnabled = computeResolutionsToTranscode(videoFileResolution) logger.info( - 'Resolutions computed for video %s and origin file height of %d.', videoDatabase.uuid, originalFileHeight, + 'Resolutions computed for video %s and origin file height of %d.', videoDatabase.uuid, videoFileResolution, { resolutions: resolutionsEnabled } ) -- cgit v1.2.3