diff --git a/src/transcode/workflows/transcode.ts b/src/transcode/workflows/transcode.ts index 5036bfca..19f2fc42 100644 --- a/src/transcode/workflows/transcode.ts +++ b/src/transcode/workflows/transcode.ts @@ -265,9 +265,12 @@ const TARGET_RESOLUTIONS = [ { name: '360p', longSide: 640 }, ] -function getBestMatchResolution(originalWidth: number, originalHeight: number): { name: string; longSide: number } { +function getBestMatchResolution( + originalWidth: number, + originalHeight: number, +): { name: string; longSide: number } { const rawLongSide = Math.max(originalWidth, originalHeight) - const lower = TARGET_RESOLUTIONS.filter((r) => r.longSide < rawLongSide) + const lower = TARGET_RESOLUTIONS.filter((r) => r.longSide <= rawLongSide) if (lower.length > 0) { lower.sort((a, b) => b.longSide - a.longSide) return lower[0] diff --git a/src/ui/components/viewers/video-player.tsx b/src/ui/components/viewers/video-player.tsx index 3a92c0a9..867c3d8e 100644 --- a/src/ui/components/viewers/video-player.tsx +++ b/src/ui/components/viewers/video-player.tsx @@ -376,10 +376,21 @@ const VideoPlayer: React.FC = ({ resolution: 'Original', } as DisplayTranscode - const resolutions: DisplayTranscode[] = (data.media.videoTranscodes ?? []).map((t) => ({ - ...t, - resolution: t.isRaw ? 'Original' : `${t.height}p`, - })) + const resolutions: DisplayTranscode[] = (data.media.videoTranscodes ?? []).map((t) => { + const longSide = Math.max(t.width, t.height) + let resolution = `${t.height}p` + if (longSide >= 3840) resolution = '2160p' + else if (longSide >= 1920) resolution = '1080p' + else if (longSide >= 1280) resolution = '720p' + else if (longSide >= 960) resolution = '540p' + else if (longSide >= 640) resolution = '360p' + else if (longSide >= 320) resolution = '180p' + + return { + ...t, + resolution: t.isRaw ? 'Original' : resolution, + } + }) const previewResolutions = resolutions.filter((r) => !r.isRaw)