diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-02-02 21:11:25 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-02-02 21:11:25 -0500 |
| commit | 6261f157f340e4f544f8f41a81b3cc1f2c69f5b1 (patch) | |
| tree | 915d797f590b47424414a2ffad2faed66764518f | |
| parent | 8b3485968f183777d5727e93413f690d1493316f (diff) | |
removed resolution exception
| -rw-r--r-- | MediaBrowser.Api/Playback/BaseStreamingService.cs | 28 |
1 files changed, 1 insertions, 27 deletions
diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs index 4f85f1922..fa44a1998 100644 --- a/MediaBrowser.Api/Playback/BaseStreamingService.cs +++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs @@ -1276,33 +1276,7 @@ namespace MediaBrowser.Api.Playback return; } - int? videoWidth = null; - int? videoHeight = null; - - // Grab the values from the source video, if we have them - if (state.VideoStream != null) - { - videoWidth = state.VideoStream.Width; - videoHeight = state.VideoStream.Height; - } - - if (videoRequest.Width.HasValue && videoWidth.HasValue) - { - if (videoRequest.Width.Value > videoWidth.Value) - { - throw new ArgumentException("Video upscaling has not been enabled by the user"); - } - } - - if (videoRequest.Height.HasValue && videoHeight.HasValue) - { - if (videoRequest.Height.Value > videoHeight.Value) - { - throw new ArgumentException("Video upscaling has not been enabled by the user"); - } - } - - // We don't know the source resolution. Don't allow an exact resolution unless upscaling is allowed + // Switch the incoming params to be ceilings rather than fixed values videoRequest.MaxWidth = videoRequest.MaxWidth ?? videoRequest.Width; videoRequest.MaxHeight = videoRequest.MaxHeight ?? videoRequest.Height; |
