KevinMidboe/immich
1
0
Fork 0
mirror of https://github.com/KevinMidboe/immich.git synced 2025-12-08 20:29:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(server): option to transcode to original resolution (#2709)

Browse Source 
* option to transcode to original resolution

* changed value for target res setting

* updated test, clarified scaling condition
This commit is contained in:
Mert
2023-06-10 00:15:12 -04:00
committed by GitHub
parent e3694695ae
commit 9cdec62918
3 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
server/src/domain/media/media.service.ts
View File

@@ -179,9 +179,9 @@ export class MediaService {
);
const allTargetsMatching = isTargetVideoCodec && isTargetAudioCodec && isTargetContainer;
const targetResolution = Number.parseInt(ffmpegConfig.targetResolution);
const isLargerThanTargetResolution = Math.min(videoStream.height, videoStream.width) > targetResolution;
const scalingEnabled = ffmpegConfig.targetResolution !== 'original';
const targetRes = Number.parseInt(ffmpegConfig.targetResolution);
const isLargerThanTargetRes = scalingEnabled && Math.min(videoStream.height, videoStream.width) > targetRes;
switch (ffmpegConfig.transcode) {
case TranscodePreset.DISABLED:
@@ -194,7 +194,7 @@ export class MediaService {
return !allTargetsMatching;
case TranscodePreset.OPTIMAL:
return !allTargetsMatching || isLargerThanTargetResolution;
return !allTargetsMatching || isLargerThanTargetRes;
default:
return false;
@@ -212,10 +212,11 @@ export class MediaService {
// video dimensions
const videoIsRotated = Math.abs(stream.rotation) === 90;
const scalingEnabled = ffmpeg.targetResolution !== 'original';
const targetResolution = Number.parseInt(ffmpeg.targetResolution);
const isVideoVertical = stream.height > stream.width || videoIsRotated;
const scaling = isVideoVertical ? `${targetResolution}:-2` : `-2:${targetResolution}`;
const shouldScale = Math.min(stream.height, stream.width) > targetResolution;
const shouldScale = scalingEnabled && Math.min(stream.height, stream.width) > targetResolution;
// video codec
const isVP9 = ffmpeg.targetVideoCodec === 'vp9';