From de8bb15c7854858e4391982e72fe6eb686a6fd87 Mon Sep 17 00:00:00 2001 From: gnattu Date: Fri, 13 Sep 2024 18:19:05 +0800 Subject: [PATCH] Return more precise transcoding reasons MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Using the first profile's reason is somewhat arbitrary, as many clients' first profile may not be the most compatible one. For instance, browsers often set WebM as the first profile, which doesn’t support common codecs like H.264 and AAC by design. This causes `VideoCodecNotSupported` and `AudioCodecNotSupported` to be returned, even if the browser supports those codecs. Only use those reasons when all profiles indicate that the codec is not supported. Signed-off-by: gnattu --- MediaBrowser.Model/Dlna/StreamBuilder.cs | 41 +++++++++++++++++++++--- 1 file changed, 37 insertions(+), 4 deletions(-) diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs index e4492ac79b..3354838c47 100644 --- a/MediaBrowser.Model/Dlna/StreamBuilder.cs +++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs @@ -1415,16 +1415,49 @@ namespace MediaBrowser.Model.Dlna return profileMatch; } + TranscodeReason inferredReason = 0; + var failureReasons = analyzedProfiles[false] .Select(analysis => analysis.Result) .Where(result => !containerSupported || (result.TranscodeReason & TranscodeReason.ContainerNotSupported) == 0) - .FirstOrDefault().TranscodeReason; - if (failureReasons == 0) + .Select(result => result.TranscodeReason) + .ToList(); + + if (failureReasons.FirstOrDefault() == 0) { - failureReasons = TranscodeReason.DirectPlayError; + inferredReason = TranscodeReason.DirectPlayError; + } + else + { + var videoCodecNotSupportedCount = failureReasons.Count(r => (r & TranscodeReason.VideoCodecNotSupported) != 0); + var audioCodecNotSupportedCount = failureReasons.Count(r => (r & TranscodeReason.AudioCodecNotSupported) != 0); + + if (!containerSupported) + { + inferredReason |= TranscodeReason.ContainerNotSupported; + } + + if (videoCodecNotSupportedCount == failureReasons.Count) + { + inferredReason |= TranscodeReason.VideoCodecNotSupported; + } + + if (audioCodecNotSupportedCount == failureReasons.Count) + { + inferredReason |= TranscodeReason.AudioCodecNotSupported; + } + + foreach (var transcodeReason in failureReasons) + { + var temp = transcodeReason; + temp &= ~TranscodeReason.ContainerNotSupported; + temp &= ~TranscodeReason.VideoCodecNotSupported; + temp &= ~TranscodeReason.AudioCodecNotSupported; + inferredReason |= temp; + } } - return (Profile: null, PlayMethod: null, AudioStreamIndex: null, TranscodeReasons: failureReasons); + return (Profile: null, PlayMethod: null, AudioStreamIndex: null, TranscodeReasons: inferredReason); } private TranscodeReason CheckVideoAudioStreamDirectPlay(MediaOptions options, MediaSourceInfo mediaSource, string container, MediaStream audioStream)