Mirrors/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2025-12-18 04:44:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Make displayed resolution information coherent for 2:1/VR files (#3798)

Browse Source 
* Update text.ts

Displayed resolutions in Stash were confusing as hell when it came to VR files - which are typically 2:1. Now I understand why, it's assuming 16:9 files/looking at height only.
This commit is contained in:
vt-idiot
2023-06-15 20:19:46 -04:00
committed by GitHub
parent 4f11a2820f
commit 47c3e855c8
4 changed files with 34 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ui/v2.5/src/utils/resolution.ts
View File

@@ -9,11 +9,13 @@ const stringResolutionMap = new Map<string, ResolutionEnum>([
["720p", ResolutionEnum.StandardHd],
["1080p", ResolutionEnum.FullHd],
["1440p", ResolutionEnum.QuadHd],
["1920p", ResolutionEnum.VrHd],
// ["1920p", ResolutionEnum.VrHd],
["4k", ResolutionEnum.FourK],
["5k", ResolutionEnum.FiveK],
["6k", ResolutionEnum.SixK],
["7k", ResolutionEnum.SevenK],
["8k", ResolutionEnum.EightK],
["Huge", ResolutionEnum.Huge],
]);
export const stringToResolution = (

17
ui/v2.5/src/utils/text.ts
View File

@@ -280,20 +280,23 @@ const bitRate = (bitrate: number) => {
const resolution = (width: number, height: number) => {
const number = width > height ? height : width;
if (number >= 4320) {
if (number >= 6144) {
return "HUGE";
}
if (number >= 3840) {
return "8K";
}
if (number >= 3384) {
if (number >= 3584) {
return "7K";
}
if (number >= 3000) {
return "6K";
}
if (number >= 2880) {
if (number >= 2560) {
return "5K";
}
if (number >= 2160) {
return "4K";
}
if (number >= 1920) {
return "1920p";
return "4K";
}
if (number >= 1440) {
return "1440p";