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

fixes #1310 - Downscaling 1280x720 to 720x404

Browse Source
This commit is contained in:
Luke 2015-12-24 15:06:52 -05:00
parent f9804ce6d1
commit 2841eba202
3 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1623,7 +1623,10 @@ namespace MediaBrowser.Api.Playback
if (state.OutputVideoBitrate.HasValue) if (state.OutputVideoBitrate.HasValue)
{ {
var resolution = ResolutionNormalizer.Normalize(state.OutputVideoBitrate.Value, var resolution = ResolutionNormalizer.Normalize(
state.VideoStream == null ? (int?)null : state.VideoStream.BitRate,
state.OutputVideoBitrate.Value,
state.VideoStream == null ? null : state.VideoStream.Codec,
state.OutputVideoCodec, state.OutputVideoCodec,
videoRequest.MaxWidth, videoRequest.MaxWidth,
videoRequest.MaxHeight); videoRequest.MaxHeight);

5
MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs
View File

@ -82,7 +82,10 @@ namespace MediaBrowser.MediaEncoding.Encoder
if (state.OutputVideoBitrate.HasValue) if (state.OutputVideoBitrate.HasValue)
{ {
var resolution = ResolutionNormalizer.Normalize(state.OutputVideoBitrate.Value, var resolution = ResolutionNormalizer.Normalize(
state.VideoStream == null ? (int?)null : state.VideoStream.BitRate,
state.OutputVideoBitrate.Value,
state.VideoStream == null ? null : state.VideoStream.Codec,
state.OutputVideoCodec, state.OutputVideoCodec,
request.MaxWidth, request.MaxWidth,
request.MaxHeight); request.MaxHeight);

23
MediaBrowser.Model/Dlna/ResolutionNormalizer.cs
View File

@ -14,14 +14,29 @@ namespace MediaBrowser.Model.Dlna
new ResolutionConfiguration(1280, 2500000) new ResolutionConfiguration(1280, 2500000)
}; };
public static ResolutionOptions Normalize(int maxBitrate, public static ResolutionOptions Normalize(int? inputBitrate,
string codec, int outputBitrate,
string inputCodec,
string outputCodec,
int? maxWidth, int? maxWidth,
int? maxHeight) int? maxHeight)
{ {
foreach (var config in Configurations) // If the bitrate isn't changing, then don't downlscale the resolution
if (inputBitrate.HasValue && outputBitrate >= inputBitrate.Value)
{
if (maxWidth.HasValue || maxHeight.HasValue)
{
return new ResolutionOptions
{
MaxWidth = maxWidth,
MaxHeight = maxHeight
};
}
}
foreach (var config in Configurations)
{ {
if (maxBitrate <= config.MaxBitrate) if (outputBitrate <= config.MaxBitrate)
{ {
var originvalValue = maxWidth; var originvalValue = maxWidth;