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

fixed EnforceResolutionLimit to check configuration

Browse Source
This commit is contained in:
Luke Pulverenti 2014-02-02 10:25:42 -05:00
parent d69894d09b
commit b28df9a3af
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1242,6 +1242,12 @@ namespace MediaBrowser.Api.Playback
/// <param name="videoRequest">The video request.</param> /// <param name="videoRequest">The video request.</param>
private void EnforceResolutionLimit(StreamState state, VideoStreamRequest videoRequest) private void EnforceResolutionLimit(StreamState state, VideoStreamRequest videoRequest)
{ {
// If enabled, allow whatever the client asks for
if (ServerConfigurationManager.Configuration.AllowVideoUpscaling)
{
return;
}
int? videoWidth = null; int? videoWidth = null;
int? videoHeight = null; int? videoHeight = null;
@ -1269,14 +1275,11 @@ namespace MediaBrowser.Api.Playback
} }
// We don't know the source resolution. Don't allow an exact resolution unless upscaling is allowed // We don't know the source resolution. Don't allow an exact resolution unless upscaling is allowed
if (!ServerConfigurationManager.Configuration.AllowVideoUpscaling) videoRequest.MaxWidth = videoRequest.MaxWidth ?? videoRequest.Width;
{ videoRequest.MaxHeight = videoRequest.MaxHeight ?? videoRequest.Height;
videoRequest.MaxWidth = videoRequest.MaxWidth ?? videoRequest.Width;
videoRequest.MaxHeight = videoRequest.MaxHeight ?? videoRequest.Height;
videoRequest.Width = null; videoRequest.Width = null;
videoRequest.Height = null; videoRequest.Height = null;
}
} }
protected string GetInputModifier(StreamState state) protected string GetInputModifier(StreamState state)