michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1439 from MediaBrowser/dev

Browse Source 
merge from dev
This commit is contained in:
Luke 2016-02-10 00:32:31 -05:00
commit 126976a38e
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -373,15 +373,15 @@ namespace MediaBrowser.MediaEncoding.Encoder
if (request.MaxAudioChannels.HasValue) if (request.MaxAudioChannels.HasValue)
{ {
if (inputChannels.HasValue)
{
return Math.Min(request.MaxAudioChannels.Value, inputChannels.Value);
}
var channelLimit = codec.IndexOf("mp3", StringComparison.OrdinalIgnoreCase) != -1 var channelLimit = codec.IndexOf("mp3", StringComparison.OrdinalIgnoreCase) != -1
? 2 ? 2
: 6; : 6;
if (inputChannels.HasValue)
{
channelLimit = Math.Min(channelLimit, inputChannels.Value);
}
// If we don't have any media info then limit it to 5 to prevent encoding errors due to asking for too many channels // If we don't have any media info then limit it to 5 to prevent encoding errors due to asking for too many channels
return Math.Min(request.MaxAudioChannels.Value, channelLimit); return Math.Min(request.MaxAudioChannels.Value, channelLimit);
} }
@ -436,16 +436,11 @@ namespace MediaBrowser.MediaEncoding.Encoder
} }
// h264 // h264
if (isHls)
{
return string.Format(" -b:v {0} -maxrate {0} -bufsize {1}", return string.Format(" -b:v {0} -maxrate {0} -bufsize {1}",
bitrate.Value.ToString(UsCulture), bitrate.Value.ToString(UsCulture),
(bitrate.Value * 2).ToString(UsCulture)); (bitrate.Value * 2).ToString(UsCulture));
} }
return string.Format(" -b:v {0}", bitrate.Value.ToString(UsCulture));
}
return string.Empty; return string.Empty;
} }