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

Update EncoderValidator.cs

Browse Source
This commit is contained in:
artiume 2020-05-25 17:58:29 -04:00 committed by Vasily
parent 62e47d056d
commit 1ff95289ef
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs
View File

@ -46,6 +46,12 @@ namespace MediaBrowser.MediaEncoding.Encoder
"mpeg4_mediacodec", "mpeg4_mediacodec",
"vp8_mediacodec", "vp8_mediacodec",
"vp9_mediacodec" "vp9_mediacodec"
"h264_videotoolbox",
"hevc_videotoolbox",
"mpeg2_videotoolbox",
"mpeg4_videotoolbox",
"vp8_videotoolbox",
"vp9_videotoolbox"
}; };
private static readonly string[] requiredEncoders = new[] private static readonly string[] requiredEncoders = new[]
@ -74,6 +80,8 @@ namespace MediaBrowser.MediaEncoding.Encoder
"h264_omx", "h264_omx",
"hevc_omx", "hevc_omx",
"h264_v4l2m2m" "h264_v4l2m2m"
"h264_videotoolbox"
"hevc_videotoolbox"
}; };
// Try and use the individual library versions to determine a FFmpeg version // Try and use the individual library versions to determine a FFmpeg version
@ -252,7 +260,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
return Enumerable.Empty<string>(); return Enumerable.Empty<string>();
} }
var found = output.Split(new char[] {'\r','\n'},StringSplitOptions.RemoveEmptyEntries).Distinct().ToList(); var found = output.Split(new char[] {'\r','\n'}, StringSplitOptions.RemoveEmptyEntries).Distinct().ToList();
found.RemoveAt(0); found.RemoveAt(0);