update audio transcoding bitrate

This commit is contained in:
Luke Pulverenti
2015-04-25 23:25:07 -04:00
parent 25cdbf014e
commit a7b32d4ec0
29 changed files with 130 additions and 256 deletions

View File

@@ -456,7 +456,7 @@ namespace MediaBrowser.Model.Dlna
playlistItem.MaxAudioChannels = Math.Min(options.MaxAudioChannels.Value, currentValue);
}
int audioBitrate = GetAudioBitrate(playlistItem.TargetAudioChannels, playlistItem.TargetAudioCodec, audioStream);
int audioBitrate = GetAudioBitrate(options.GetMaxBitrate(), playlistItem.TargetAudioChannels, playlistItem.TargetAudioCodec, audioStream);
playlistItem.AudioBitrate = Math.Min(playlistItem.AudioBitrate ?? audioBitrate, audioBitrate);
int? maxBitrateSetting = options.GetMaxBitrate();
@@ -479,13 +479,13 @@ namespace MediaBrowser.Model.Dlna
return playlistItem;
}
private int GetAudioBitrate(int? channels, string outputCodec, MediaStream audioStream)
private int GetAudioBitrate(int? maxTotalBitrate, int? targetAudioChannels, string targetAudioCodec, MediaStream audioStream)
{
var defaultBitrate = 128000;
if (channels.HasValue)
if (targetAudioChannels.HasValue)
{
if (channels.Value >= 5)
if (targetAudioChannels.Value >= 5 && (maxTotalBitrate ?? 0) >= 1500000)
{
defaultBitrate = 320000;
}

View File

@@ -199,11 +199,6 @@
/// The series studio
/// </summary>
SeriesStudio,
/// <summary>
/// The soundtrack ids
/// </summary>
SoundtrackIds,
/// <summary>
/// The sort name of the item