lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update scaling with MaxHeight

Browse Source
This commit is contained in:
Luke Pulverenti 2016-08-25 00:54:06 -04:00
parent dc09bb8c08
commit f5a6a418f5
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Emby.Drawing/GDI/DynamicImageHelpers.cs
View File

@ -34,7 +34,7 @@ namespace Emby.Drawing.GDI
graphics.InterpolationMode = InterpolationMode.HighQualityBicubic; graphics.InterpolationMode = InterpolationMode.HighQualityBicubic;
graphics.PixelOffsetMode = PixelOffsetMode.HighQuality; graphics.PixelOffsetMode = PixelOffsetMode.HighQuality;
// This causes the image to be blank in OSX // SourceCopy causes the image to be blank in OSX
//graphics.CompositingMode = CompositingMode.SourceCopy; //graphics.CompositingMode = CompositingMode.SourceCopy;
for (var row = 0; row < rows; row++) for (var row = 0; row < rows; row++)
@ -83,7 +83,7 @@ namespace Emby.Drawing.GDI
graphics.InterpolationMode = InterpolationMode.HighQualityBicubic; graphics.InterpolationMode = InterpolationMode.HighQualityBicubic;
graphics.PixelOffsetMode = PixelOffsetMode.HighQuality; graphics.PixelOffsetMode = PixelOffsetMode.HighQuality;
// This causes the image to be blank in OSX // SourceCopy causes the image to be blank in OSX
//graphics.CompositingMode = CompositingMode.SourceCopy; //graphics.CompositingMode = CompositingMode.SourceCopy;
for (var row = 0; row < rows; row++) for (var row = 0; row < rows; row++)

8
Emby.Drawing/GDI/GDIImageEncoder.cs
View File

@ -119,9 +119,11 @@ namespace Emby.Drawing.GDI
thumbnailGraph.SmoothingMode = SmoothingMode.HighQuality; thumbnailGraph.SmoothingMode = SmoothingMode.HighQuality;
thumbnailGraph.InterpolationMode = InterpolationMode.HighQualityBicubic; thumbnailGraph.InterpolationMode = InterpolationMode.HighQualityBicubic;
thumbnailGraph.PixelOffsetMode = PixelOffsetMode.HighQuality; thumbnailGraph.PixelOffsetMode = PixelOffsetMode.HighQuality;
thumbnailGraph.CompositingMode = !hasPostProcessing ?
CompositingMode.SourceCopy : // SourceCopy causes the image to be blank in OSX
CompositingMode.SourceOver; //thumbnailGraph.CompositingMode = !hasPostProcessing ?
// CompositingMode.SourceCopy :
// CompositingMode.SourceOver;
SetBackgroundColor(thumbnailGraph, options); SetBackgroundColor(thumbnailGraph, options);

2
MediaBrowser.Api/Playback/BaseStreamingService.cs
View File

@ -644,7 +644,7 @@ namespace MediaBrowser.Api.Playback
{ {
var maxHeightParam = request.MaxHeight.Value.ToString(UsCulture); var maxHeightParam = request.MaxHeight.Value.ToString(UsCulture);
filters.Add(string.Format("scale=trunc(oh*a/2)*2:min(ih\\,{0})", maxHeightParam)); filters.Add(string.Format("scale=trunc(oh*a/2)*2:min(max(iw/dar\\,ih)\\,{0})", maxHeightParam));
} }
} }

2
MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs
View File

@ -978,7 +978,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
{ {
var maxHeightParam = request.MaxHeight.Value.ToString(UsCulture); var maxHeightParam = request.MaxHeight.Value.ToString(UsCulture);
filters.Add(string.Format("scale=trunc(oh*a/2)*2:min(ih\\,{0})", maxHeightParam)); filters.Add(string.Format("scale=trunc(oh*a/2)*2:min(max(iw/dar\\,ih)\\,{0})", maxHeightParam));
} }
} }