Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-07 10:14:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Refactor GetResolutionText

Browse Source 
This improves GetResolutionText a little by making it easier to read and better parsing resolutions (Also adding a few new ones like PAL resolutions and 8K)

Co-authored-by: Maxr1998 <max.rumpf1998@gmail.com>
This commit is contained in:
MrTimscampi 2021-07-03 01:32:57 +02:00
parent 1dcf03e33c
commit bcae195cc3
1 changed files with 22 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
MediaBrowser.Model/Entities/MediaStream.cs
View File

@ -471,64 +471,33 @@ namespace MediaBrowser.Model.Entities
private string GetResolutionText() private string GetResolutionText()
{ {
var i = this; if (!this.Width.HasValue || !this.Height.HasValue)
if (i.Width.HasValue && i.Height.HasValue)
{ {
var width = i.Width.Value;
var height = i.Height.Value;
if (width >= 3800 || height >= 2000)
{
return "4K";
}
if (width >= 2500)
{
if (i.IsInterlaced)
{
return "1440i";
}
return "1440p";
}
if (width >= 1900 || height >= 1000)
{
if (i.IsInterlaced)
{
return "1080i";
}
return "1080p";
}
if (width >= 1260 || height >= 700)
{
if (i.IsInterlaced)
{
return "720i";
}
return "720p";
}
if (width >= 700 || height >= 440)
{
if (i.IsInterlaced)
{
return "480i";
}
return "480p";
}
return "SD";
}
return null; return null;
} }
var width = this.Width.Value;
var height = this.Height.Value;
return width switch
{
<= 720 when height <= 480 => this.IsInterlaced ? "480i" : "480p",
// 720x576 (PAL) (768 when rescaled for square pixels)
<= 768 when height <= 576 => this.IsInterlaced ? "576i" : "576p",
// 960x540 (sometimes 544 which is multiple of 16)
<= 960 when height <= 544 => this.IsInterlaced ? "540i" : "540p",
// 1280x720
<= 1280 when height <= 962 => this.IsInterlaced ? "720i" : "720p",
// 1920x1080
<= 1920 when height <= 1440 => this.IsInterlaced ? "1080i" : "1080p",
// 4K
<= 4096 when height <= 3072 => "4K",
// 8K
<= 8192 when height <= 6144 => "8K",
_ => null
};
}
public static bool IsTextFormat(string format) public static bool IsTextFormat(string format)
{ {
string codec = format ?? string.Empty; string codec = format ?? string.Empty;