update live tv hls

This commit is contained in:
Luke Pulverenti
2016-09-20 15:42:53 -04:00
parent bcfef5dd83
commit 97ea2ff43a
3 changed files with 30 additions and 22 deletions

View File

@@ -609,26 +609,13 @@ namespace MediaBrowser.Model.Dlna
defaultBitrate = StringHelper.EqualsIgnoreCase(targetAudioCodec, "ac3") ? 192000 : 128000;
}
if (targetAudioChannels.HasValue)
if (StringHelper.EqualsIgnoreCase(subProtocol, "hls"))
{
if (targetAudioChannels.Value >= 5 && (maxTotalBitrate ?? 0) >= 1200000)
{
if (StringHelper.EqualsIgnoreCase(targetAudioCodec, "ac3"))
{
if (StringHelper.EqualsIgnoreCase(subProtocol, "hls"))
{
defaultBitrate = Math.Max(384000, defaultBitrate);
}
else
{
defaultBitrate = Math.Max(448000, defaultBitrate);
}
}
else
{
defaultBitrate = Math.Max(320000, defaultBitrate);
}
}
defaultBitrate = Math.Min(384000, defaultBitrate);
}
else
{
defaultBitrate = Math.Min(448000, defaultBitrate);
}
int encoderAudioBitrateLimit = int.MaxValue;
@@ -647,6 +634,14 @@ namespace MediaBrowser.Model.Dlna
}
}
if (maxTotalBitrate.HasValue)
{
if (maxTotalBitrate.Value < 640000)
{
defaultBitrate = Math.Min(128000, defaultBitrate);
}
}
return Math.Min(defaultBitrate, encoderAudioBitrateLimit);
}