github-mirrors/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-04-24 05:57:20 -04:00
Code Issues Projects Releases Packages Wiki Activity

Apply review suggestions

Browse source
This commit is contained in:
Shadowghost 2023-02-27 16:03:12 +01:00
parent 060097703b
commit 31712e5da9
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
View file

@ -2085,7 +2085,7 @@ namespace MediaBrowser.Controller.MediaEncoding
var inputChannels = audioStream.Channels ?? 0;
var outputChannels = outputAudioChannels ?? 0;
var bitrate = audioBitRate.HasValue ? audioBitRate.Value : int.MaxValue;
var bitrate = audioBitRate ?? int.MaxValue;
if (string.IsNullOrEmpty(audioCodec)
|| string.Equals(audioCodec, "aac", StringComparison.OrdinalIgnoreCase)

18
MediaBrowser.Model/Dlna/StreamBuilder.cs
View file

@ -23,6 +23,9 @@ namespace MediaBrowser.Model.Dlna
private readonly ILogger _logger;
private readonly ITranscoderSupport _transcoderSupport;
private static readonly string[] _supportedHlsVideoCodecs = new string[] { "h264", "hevc" };
private static readonly string[] _supportedHlsAudioCodecsTs = new string[] { "aac", "ac3", "eac3", "mp3" };
private static readonly string[] _supportedHlsAudioCodecsMp4 = new string[] { "aac", "ac3", "eac3", "mp3", "alac", "flac", "opus" };
public StreamBuilder(ITranscoderSupport transcoderSupport, ILogger logger)
{
@ -774,8 +777,7 @@ namespace MediaBrowser.Model.Dlna
// Enforce HLS video codec restrictions
if (string.Equals(playlistItem.SubProtocol, "hls", StringComparison.OrdinalIgnoreCase))
{
var supportedHlsVideoCodecs = new List<string> { "h264", "hevc" };
videoCodecs = videoCodecs.Where(codec => supportedHlsVideoCodecs.Contains(codec)).ToArray();
videoCodecs = videoCodecs.Where(codec => _supportedHlsVideoCodecs.Contains(codec)).ToArray();
}
var directVideoCodec = ContainerProfile.ContainsContainer(videoCodecs, videoStream?.Codec) ? videoStream?.Codec : null;
@ -817,16 +819,14 @@ namespace MediaBrowser.Model.Dlna
// Enforce HLS audio codec restrictions
if (string.Equals(playlistItem.SubProtocol, "hls", StringComparison.OrdinalIgnoreCase))
{
var supportedHlsAudioCodecs = new List<string> { "aac", "ac3", "eac3", "mp3" };
if (string.Equals(playlistItem.Container, "mp4", StringComparison.OrdinalIgnoreCase))
{
// fMP4 supports more codecs than TS
supportedHlsAudioCodecs.Add("alac");
supportedHlsAudioCodecs.Add("flac");
supportedHlsAudioCodecs.Add("opus");
audioCodecs = audioCodecs.Where(codec => _supportedHlsAudioCodecsMp4.Contains(codec)).ToArray();
}
else
{
audioCodecs = audioCodecs.Where(codec => _supportedHlsAudioCodecsTs.Contains(codec)).ToArray();
}
audioCodecs = audioCodecs.Where(codec => supportedHlsAudioCodecs.Contains(codec)).ToArray();
}
var directAudioStream = candidateAudioStreams.FirstOrDefault(stream => ContainerProfile.ContainsContainer(audioCodecs, stream.Codec));