alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-05-24 01:28:27 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Fix transcode video matching and add tests for Transcode and Safari

Browse Source
This commit is contained in:
Isaac Gordezky
2022-02-19 17:02:41 +00:00
committed by Cody Robibero
parent 5e779f20ee
commit 84a3db6f84
6 changed files with 233 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
MediaBrowser.Model/Dlna/StreamBuilder.cs
View File

@@ -749,13 +749,20 @@ namespace MediaBrowser.Model.Dlna
transcodingProfiles = transcodingProfiles.ToLookup(transcodingProfile =>
{
var videoCodecs = ContainerProfile.SplitValue(transcodingProfile.VideoCodec);
var match = ContainerProfile.ContainsContainer(videoCodecs, item.VideoStream.Codec) &&
options.Profile.CodecProfiles
.Any(i => i.Type == CodecType.Video &&
i.ContainsAnyCodec(transcodingProfile.VideoCodec, transcodingProfile.Container) &&
i.ApplyConditions.Any(applyCondition => !ConditionProcessor.IsVideoConditionSatisfied(applyCondition, videoStream?.Width, videoStream?.Height, videoStream?.BitDepth, videoStream?.BitRate, videoStream?.Profile, videoStream?.Level, videoFramerate, videoStream?.PacketLength, timestamp, videoStream?.IsAnamorphic, videoStream?.IsInterlaced, videoStream?.RefFrames, numVideoStreams, numAudioStreams, videoStream?.CodecTag, videoStream?.IsAVC)));
return match ? 1 : 2;
if (ContainerProfile.ContainsContainer(videoCodecs, item.VideoStream.Codec)) {
var videoCodec = transcodingProfile.VideoCodec;
var container = transcodingProfile.Container;
var appliedVideoConditions = options.Profile.CodecProfiles
.Where(i => i.Type == CodecType.Video &&
i.ContainsAnyCodec(videoCodec, container))
.Select(i =>
i.ApplyConditions.Any(applyCondition => ConditionProcessor.IsVideoConditionSatisfied(applyCondition, videoStream?.Width, videoStream?.Height, videoStream?.BitDepth, videoStream?.BitRate, videoStream?.Profile, videoStream?.Level, videoFramerate, videoStream?.PacketLength, timestamp, videoStream?.IsAnamorphic, videoStream?.IsInterlaced, videoStream?.RefFrames, numVideoStreams, numAudioStreams, videoStream?.CodecTag, videoStream?.IsAVC)));
var conditionsSatisfied = !appliedVideoConditions.Any() || !appliedVideoConditions.Any(satisfied => !satisfied);
return conditionsSatisfied ? 1 : 2;
}
return 3;
})
.OrderBy(lookup => lookup.Key)
.SelectMany(lookup => lookup);