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

limit bitrate to original file

Browse Source
This commit is contained in:
Luke Pulverenti 2014-02-03 15:37:18 -05:00
parent 4205dcac9d
commit b7a811992b
1 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -355,10 +355,10 @@ namespace MediaBrowser.Api.Playback
param += " -crf 18"; param += " -crf 18";
break; break;
case EncodingQuality.HighQuality: case EncodingQuality.HighQuality:
param += " -crf 14"; param += " -crf 10";
break; break;
case EncodingQuality.MaxQuality: case EncodingQuality.MaxQuality:
param += " -crf 10"; param += " -crf 4";
break; break;
} }
} }
@ -968,7 +968,35 @@ namespace MediaBrowser.Api.Playback
protected int? GetVideoBitrateParamValue(StreamState state) protected int? GetVideoBitrateParamValue(StreamState state)
{ {
return state.VideoRequest.VideoBitRate; var bitrate = state.VideoRequest.VideoBitRate;
if (state.VideoStream != null)
{
var isUpscaling = false;
if (state.VideoRequest.Height.HasValue && state.VideoStream.Height.HasValue &&
state.VideoRequest.Height.Value > state.VideoStream.Height.Value)
{
isUpscaling = true;
}
if (state.VideoRequest.Width.HasValue && state.VideoStream.Width.HasValue &&
state.VideoRequest.Width.Value > state.VideoStream.Width.Value)
{
isUpscaling = true;
}
// Don't allow bitrate increases unless upscaling
if (!isUpscaling)
{
if (bitrate.HasValue && state.VideoStream.BitRate.HasValue)
{
bitrate = Math.Min(bitrate.Value, state.VideoStream.BitRate.Value);
}
}
}
return bitrate;
} }
protected string GetVideoBitrateParam(StreamState state, string videoCodec, bool isHls) protected string GetVideoBitrateParam(StreamState state, string videoCodec, bool isHls)