open-source-mirrors
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clean up streambuilder

Browse Source
pull/702/head
Bond_009 6 years ago
parent edcfd8b565
commit c9b88ab741
1 changed files with 49 additions and 81 deletions
Show Stats Download Patch File Download Diff File

130
MediaBrowser.Model/Dlna/StreamBuilder.cs
Unescape View File

@ -317,14 +317,14 @@ namespace MediaBrowser.Model.Dlna
var conditionProcessor = new ConditionProcessor(); var conditionProcessor = new ConditionProcessor();
int? inputAudioChannels = audioStream == null ? null : audioStream.Channels; int? inputAudioChannels = audioStream?.Channels;
int? inputAudioBitrate = audioStream == null ? null : audioStream.BitDepth; int? inputAudioBitrate = audioStream?.BitDepth;
int? inputAudioSampleRate = audioStream == null ? null : audioStream.SampleRate; int? inputAudioSampleRate = audioStream?.SampleRate;
int? inputAudioBitDepth = audioStream == null ? null : audioStream.BitDepth; int? inputAudioBitDepth = audioStream.BitDepth;
if (directPlayMethods.Count > 0) if (directPlayMethods.Count() > 0)
{ {
string audioCodec = audioStream == null ? null : audioStream.Codec; string audioCodec = audioStream?.Codec;
// Make sure audio codec profiles are satisfied // Make sure audio codec profiles are satisfied
var conditions = new List<ProfileCondition>(); var conditions = new List<ProfileCondition>();
@ -345,10 +345,7 @@ namespace MediaBrowser.Model.Dlna
if (applyConditions) if (applyConditions)
{ {
foreach (ProfileCondition c in i.Conditions) conditions.AddRange(i.Conditions);
{
conditions.Add(c);
}
} }
} }
} }
@ -473,65 +470,56 @@ namespace MediaBrowser.Model.Dlna
return options.GetMaxBitrate(isAudio); return options.GetMaxBitrate(isAudio);
} }
private Tuple<List<PlayMethod>, List<TranscodeReason>> GetAudioDirectPlayMethods(MediaSourceInfo item, MediaStream audioStream, AudioOptions options) private (IEnumerable<PlayMethod>, IEnumerable<TranscodeReason>) GetAudioDirectPlayMethods(MediaSourceInfo item, MediaStream audioStream, AudioOptions options)
{ {
var transcodeReasons = new List<TranscodeReason>(); DirectPlayProfile directPlayProfile = options.Profile.DirectPlayProfiles
.FirstOrDefault(x => x.Type == DlnaProfileType.Audio && IsAudioDirectPlaySupported(x, item, audioStream));
DirectPlayProfile directPlayProfile = null; if (directPlayProfile == null)
foreach (var i in options.Profile.DirectPlayProfiles)
{ {
if (i.Type == DlnaProfileType.Audio && IsAudioDirectPlaySupported(i, item, audioStream)) _logger.LogInformation("Profile: {0}, No direct play profiles found for Path: {1}",
{ options.Profile.Name ?? "Unknown Profile",
directPlayProfile = i; item.Path ?? "Unknown path");
break;
} return (Enumerable.Empty<PlayMethod>(), GetTranscodeReasonsFromDirectPlayProfile(item, null, audioStream, options.Profile.DirectPlayProfiles));
} }
var playMethods = new List<PlayMethod>(); var playMethods = new List<PlayMethod>();
var transcodeReasons = new List<TranscodeReason>();
if (directPlayProfile != null) // While options takes the network and other factors into account. Only applies to direct stream
if (item.SupportsDirectStream)
{ {
// While options takes the network and other factors into account. Only applies to direct stream if (IsAudioEligibleForDirectPlay(item, options.GetMaxBitrate(true) ?? 0, PlayMethod.DirectStream))
if (item.SupportsDirectStream)
{ {
if (IsAudioEligibleForDirectPlay(item, options.GetMaxBitrate(true) ?? 0, PlayMethod.DirectStream)) if (options.EnableDirectStream)
{
if (options.EnableDirectStream)
{
playMethods.Add(PlayMethod.DirectStream);
}
}
else
{ {
transcodeReasons.Add(TranscodeReason.ContainerBitrateExceedsLimit); playMethods.Add(PlayMethod.DirectStream);
} }
} }
else
{
transcodeReasons.Add(TranscodeReason.ContainerBitrateExceedsLimit);
}
}
// The profile describes what the device supports // The profile describes what the device supports
// If device requirements are satisfied then allow both direct stream and direct play // If device requirements are satisfied then allow both direct stream and direct play
if (item.SupportsDirectPlay) if (item.SupportsDirectPlay)
{
if (IsAudioEligibleForDirectPlay(item, GetBitrateForDirectPlayCheck(item, options, true) ?? 0, PlayMethod.DirectPlay))
{ {
if (IsAudioEligibleForDirectPlay(item, GetBitrateForDirectPlayCheck(item, options, true) ?? 0, PlayMethod.DirectPlay)) if (options.EnableDirectPlay)
{
if (options.EnableDirectPlay)
{
playMethods.Add(PlayMethod.DirectPlay);
}
}
else
{ {
transcodeReasons.Add(TranscodeReason.ContainerBitrateExceedsLimit); playMethods.Add(PlayMethod.DirectPlay);
} }
} }
else
{
transcodeReasons.Add(TranscodeReason.ContainerBitrateExceedsLimit);
}
} }
else
{
transcodeReasons.InsertRange(0, GetTranscodeReasonsFromDirectPlayProfile(item, null, audioStream, options.Profile.DirectPlayProfiles));
_logger.LogInformation("Profile: {0}, No direct play profiles found for Path: {1}",
options.Profile.Name ?? "Unknown Profile",
item.Path ?? "Unknown path");
}
if (playMethods.Count > 0) if (playMethods.Count > 0)
{ {
@ -542,41 +530,25 @@ namespace MediaBrowser.Model.Dlna
transcodeReasons = transcodeReasons.Distinct().ToList(); transcodeReasons = transcodeReasons.Distinct().ToList();
} }
return new Tuple<List<PlayMethod>, List<TranscodeReason>>(playMethods, transcodeReasons); return (playMethods, transcodeReasons);
} }
private List<TranscodeReason> GetTranscodeReasonsFromDirectPlayProfile(MediaSourceInfo item, MediaStream videoStream, MediaStream audioStream, IEnumerable<DirectPlayProfile> directPlayProfiles) private List<TranscodeReason> GetTranscodeReasonsFromDirectPlayProfile(MediaSourceInfo item, MediaStream videoStream, MediaStream audioStream, IEnumerable<DirectPlayProfile> directPlayProfiles)
{ {
var list = new List<TranscodeReason>();
var containerSupported = false; var containerSupported = false;
var audioSupported = false; var audioSupported = false;
var videoSupported = false; var videoSupported = false;
foreach (var profile in directPlayProfiles) foreach (var profile in directPlayProfiles)
{ {
audioSupported = false;
videoSupported = false;
// Check container type // Check container type
if (profile.SupportsContainer(item.Container)) if (profile.SupportsContainer(item.Container))
{ {
containerSupported = true; containerSupported = true;
if (videoStream != null) videoSupported = videoStream != null && profile.SupportsVideoCodec(videoStream.Codec);
{
if (profile.SupportsVideoCodec(videoStream.Codec))
{
videoSupported = true;
}
}
if (audioStream != null) audioSupported = audioStream != null && profile.SupportsAudioCodec(audioStream.Codec);
{
if (profile.SupportsAudioCodec(audioStream.Codec))
{
audioSupported = true;
}
}
if (videoSupported && audioSupported) if (videoSupported && audioSupported)
{ {
@ -585,6 +557,7 @@ namespace MediaBrowser.Model.Dlna
} }
} }
var list = new List<TranscodeReason>();
if (!containerSupported) if (!containerSupported)
{ {
list.Add(TranscodeReason.ContainerNotSupported); list.Add(TranscodeReason.ContainerNotSupported);
@ -1197,7 +1170,7 @@ namespace MediaBrowser.Model.Dlna
mediaSource.Path ?? "Unknown path"); mediaSource.Path ?? "Unknown path");
} }
private ValueTuple<bool, TranscodeReason?> IsEligibleForDirectPlay(MediaSourceInfo item, private (bool directPlay, TranscodeReason? reason) IsEligibleForDirectPlay(MediaSourceInfo item,
long maxBitrate, long maxBitrate,
MediaStream subtitleStream, MediaStream subtitleStream,
VideoOptions options, VideoOptions options,
@ -1210,18 +1183,13 @@ namespace MediaBrowser.Model.Dlna
if (subtitleProfile.Method != SubtitleDeliveryMethod.External && subtitleProfile.Method != SubtitleDeliveryMethod.Embed) if (subtitleProfile.Method != SubtitleDeliveryMethod.External && subtitleProfile.Method != SubtitleDeliveryMethod.Embed)
{ {
_logger.LogInformation("Not eligible for {0} due to unsupported subtitles", playMethod); _logger.LogInformation("Not eligible for {0} due to unsupported subtitles", playMethod);
return new ValueTuple<bool, TranscodeReason?>(false, TranscodeReason.SubtitleCodecNotSupported); return (false, TranscodeReason.SubtitleCodecNotSupported);
} }
} }
var result = IsAudioEligibleForDirectPlay(item, maxBitrate, playMethod); bool result = IsAudioEligibleForDirectPlay(item, maxBitrate, playMethod);
if (result)
{
return new ValueTuple<bool, TranscodeReason?>(result, null);
}
return new ValueTuple<bool, TranscodeReason?>(result, TranscodeReason.ContainerBitrateExceedsLimit); return (result, result ? (TranscodeReason?)null : TranscodeReason.ContainerBitrateExceedsLimit);
} }
public static SubtitleProfile GetSubtitleProfile(MediaSourceInfo mediaSource, MediaStream subtitleStream, SubtitleProfile[] subtitleProfiles, PlayMethod playMethod, ITranscoderSupport transcoderSupport, string outputContainer, string transcodingSubProtocol) public static SubtitleProfile GetSubtitleProfile(MediaSourceInfo mediaSource, MediaStream subtitleStream, SubtitleProfile[] subtitleProfiles, PlayMethod playMethod, ITranscoderSupport transcoderSupport, string outputContainer, string transcodingSubProtocol)
@ -1391,12 +1359,12 @@ namespace MediaBrowser.Model.Dlna
var requestedMaxBitrate = maxBitrate > 0 ? maxBitrate : 1000000; var requestedMaxBitrate = maxBitrate > 0 ? maxBitrate : 1000000;
// If we don't know the bitrate, then force a transcode if requested max bitrate is under 40 mbps // If we don't know the bitrate, then force a transcode if requested max bitrate is under 40 mbps
var itemBitrate = item.Bitrate ?? var itemBitrate = item.Bitrate ?? 40000000;
40000000;
if (itemBitrate > requestedMaxBitrate) if (itemBitrate > requestedMaxBitrate)
{ {
_logger.LogInformation("Bitrate exceeds " + playMethod + " limit: media bitrate: {0}, max bitrate: {1}", itemBitrate.ToString(CultureInfo.InvariantCulture), requestedMaxBitrate.ToString(CultureInfo.InvariantCulture)); _logger.LogInformation("Bitrate exceeds {PlayBackMethod} limit: media bitrate: {MediaBitrate}, max bitrate: {MaxBitrate}",
playMethod, itemBitrate, requestedMaxBitrate);
return false; return false;
} }

Write Preview
Loading…
Cancel
Save