Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add DTS and TrueHD bitrate limits, enforce bitrate limits if no bitrate is requested

Browse Source
This commit is contained in:
Shadowghost 2023-02-24 15:21:22 +01:00
parent eafd785eb6
commit 233e079e58
1 changed files with 34 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
View File

@ -2085,37 +2085,60 @@ namespace MediaBrowser.Controller.MediaEncoding
var inputChannels = audioStream.Channels ?? 0; var inputChannels = audioStream.Channels ?? 0;
var outputChannels = outputAudioChannels ?? 0; var outputChannels = outputAudioChannels ?? 0;
var bitrate = audioBitRate.HasValue ? audioBitRate.Value : int.MaxValue;
if (audioBitRate.HasValue && (string.IsNullOrEmpty(audioCodec) if (string.IsNullOrEmpty(audioCodec)
|| string.Equals(audioCodec, "aac", StringComparison.OrdinalIgnoreCase) || string.Equals(audioCodec, "aac", StringComparison.OrdinalIgnoreCase)
|| string.Equals(audioCodec, "mp3", StringComparison.OrdinalIgnoreCase) || string.Equals(audioCodec, "mp3", StringComparison.OrdinalIgnoreCase)
|| string.Equals(audioCodec, "opus", StringComparison.OrdinalIgnoreCase) || string.Equals(audioCodec, "opus", StringComparison.OrdinalIgnoreCase)
|| string.Equals(audioCodec, "vorbis", StringComparison.OrdinalIgnoreCase) || string.Equals(audioCodec, "vorbis", StringComparison.OrdinalIgnoreCase)
|| string.Equals(audioCodec, "ac3", StringComparison.OrdinalIgnoreCase) || string.Equals(audioCodec, "ac3", StringComparison.OrdinalIgnoreCase)
|| string.Equals(audioCodec, "eac3", StringComparison.OrdinalIgnoreCase))) || string.Equals(audioCodec, "eac3", StringComparison.OrdinalIgnoreCase))
{ {
return (inputChannels, outputChannels) switch return (inputChannels, outputChannels) switch
{ {
(>= 6, >= 6 or 0) => Math.Min(640000, audioBitRate.Value), (>= 6, >= 6 or 0) => Math.Min(640000, bitrate),
(> 0, > 0) => Math.Min(outputChannels * 128000, audioBitRate.Value), (> 0, > 0) => Math.Min(outputChannels * 128000, bitrate),
(> 0, _) => Math.Min(inputChannels * 128000, audioBitRate.Value), (> 0, _) => Math.Min(inputChannels * 128000, bitrate),
(_, _) => Math.Min(384000, audioBitRate.Value) (_, _) => Math.Min(384000, bitrate)
}; };
} }
if (audioBitRate.HasValue && (string.Equals(audioCodec, "flac", StringComparison.OrdinalIgnoreCase) if (string.Equals(audioCodec, "flac", StringComparison.OrdinalIgnoreCase)
|| string.Equals(audioCodec, "alac", StringComparison.OrdinalIgnoreCase))) || string.Equals(audioCodec, "alac", StringComparison.OrdinalIgnoreCase))
{ {
if (inputChannels >= 6) if (inputChannels >= 6)
{ {
return Math.Min(3584000, audioBitRate.Value); return Math.Min(3584000, bitrate);
} }
return Math.Min(1536000, audioBitRate.Value); return Math.Min(1536000, bitrate);
}
if (string.Equals(audioCodec, "dts", StringComparison.OrdinalIgnoreCase)
|| string.Equals(audioCodec, "dca", StringComparison.OrdinalIgnoreCase))
{
return (inputChannels, outputChannels) switch
{
(>= 6, >= 6 or 0) => Math.Min(768000, bitrate),
(> 0, > 0) => Math.Min(outputChannels * 136000, bitrate),
(> 0, _) => Math.Min(inputChannels * 136000, bitrate),
(_, _) => Math.Min(672000, bitrate)
};
}
if (string.Equals(audioCodec, "truehd", StringComparison.OrdinalIgnoreCase))
{
return (inputChannels, outputChannels) switch
{
(> 0, > 0) => Math.Min(outputChannels * 768000, bitrate),
(> 0, _) => Math.Min(inputChannels * 768000, bitrate),
(_, _) => Math.Min(768000, bitrate)
};
} }
// Empty bitrate area is not allow on iOS // Empty bitrate area is not allow on iOS
// Default audio bitrate to 128K per channel if it is not being requested // Default audio bitrate to 128K per channel if we don't have codec specific defaults
// https://ffmpeg.org/ffmpeg-codecs.html#toc-Codec-Options // https://ffmpeg.org/ffmpeg-codecs.html#toc-Codec-Options
return 128000 * (outputAudioChannels ?? audioStream.Channels ?? 1); return 128000 * (outputAudioChannels ?? audioStream.Channels ?? 1);
} }