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

Try to use Width and Height from ImageInfo to determine aspect ratio

Browse Source
This commit is contained in:
cvium 2021-11-10 23:25:01 +01:00
parent 4c88bf3fe3
commit d10de5b7f9
1 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Emby.Server.Implementations/Dto/DtoService.cs
View File

@ -1398,41 +1398,33 @@ namespace Emby.Server.Implementations.Dto
return null; return null;
} }
ImageDimensions size;
var defaultAspectRatio = item.GetDefaultPrimaryImageAspectRatio();
if (defaultAspectRatio > 0)
{
return defaultAspectRatio;
}
if (!imageInfo.IsLocalFile) if (!imageInfo.IsLocalFile)
{ {
return null; return item.GetDefaultPrimaryImageAspectRatio();
} }
try var width = imageInfo.Width;
{ var height = imageInfo.Height;
size = _imageProcessor.GetImageDimensions(item, imageInfo);
if (size.Width <= 0 || size.Height <= 0) // Fallback to the image processor if the image info is somehow incorrect
if (width <= 0 || height <= 0)
{
try
{ {
return null; var size = _imageProcessor.GetImageDimensions(item, imageInfo);
width = size.Width;
height = size.Height;
}
catch (Exception ex)
{
_logger.LogError(ex, "Failed to determine primary image aspect ratio for {ImagePath}", imageInfo.Path);
return item.GetDefaultPrimaryImageAspectRatio();
} }
} }
catch (Exception ex)
{
_logger.LogError(ex, "Failed to determine primary image aspect ratio for {0}", imageInfo.Path);
return null;
}
var width = size.Width;
var height = size.Height;
if (width <= 0 || height <= 0) if (width <= 0 || height <= 0)
{ {
return null; return item.GetDefaultPrimaryImageAspectRatio();
} }
return (double)width / height; return (double)width / height;