michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

adjusted aspect ratio normalization

Browse Source
This commit is contained in:
Luke Pulverenti 2013-11-06 10:45:25 -05:00
parent 33c0b0e99c
commit ec3caf5865
1 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
MediaBrowser.Providers/MediaInfo/BaseFFProbeProvider.cs
View File

@ -251,17 +251,33 @@ namespace MediaBrowser.Providers.MediaInfo
private string GetAspectRatio(MediaStreamInfo info)
{
if (info.height > 0 && info.width > 0)
{
double ratio = info.width;
ratio /= info.height;
var original = info.display_aspect_ratio;
if (IsClose(ratio, 1.777777778))
int height;
int width;
var parts = (original ?? string.Empty).Split(':');
if (!(parts.Length == 2 &&
int.TryParse(parts[0], NumberStyles.Any, UsCulture, out width) &&
int.TryParse(parts[1], NumberStyles.Any, UsCulture, out height) &&
width > 0 &&
height > 0))
{
width = info.width;
height = info.height;
}
if (width > 0 && height > 0)
{
double ratio = width;
ratio /= height;
if (IsClose(ratio, 1.777777778, .03))
{
return "16:9";
}
if (IsClose(ratio, 1.3333333333))
if (IsClose(ratio, 1.3333333333, .05))
{
return "4:3";
}
@ -286,31 +302,30 @@ namespace MediaBrowser.Providers.MediaInfo
return "5:3";
}
if (IsClose(ratio, 1.85))
if (IsClose(ratio, 1.85, .02))
{
return "1.85:1";
}
if (IsClose(ratio, 2.39))
if (IsClose(ratio, 2.35, .025))
{
return "2.39:1";
return "2.35:1";
}
if (IsClose(ratio, 2.4))
if (IsClose(ratio, 2.4, .025))
{
return "2.4:1";
return "2.40:1";
}
}
return info.display_aspect_ratio;
return original;
}
private bool IsClose(double d1, double d2)
private bool IsClose(double d1, double d2, double variance = .005)
{
return Math.Abs(d1 - d2) <= .005;
return Math.Abs(d1 - d2) <= variance;
}
/// <summary>
/// Gets a frame rate from a string value in ffprobe output
/// This could be a number or in the format of 2997/125.