starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-17 14:33:06 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix distinction queries (#14007)

Browse Source
This commit is contained in:
Tim Eisele
2025-04-27 02:49:30 +02:00
committed by GitHub
parent 67110b512a
commit f576783ae1
15 changed files with 54 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,8 +14,8 @@ namespace MediaBrowser.MediaEncoding.Encoder
{
public partial class EncoderValidator
{
private static readonly string[] _requiredDecoders = new[]
{
private static readonly string[] _requiredDecoders =
[
"h264",
"hevc",
"vp8",
@@ -57,10 +57,10 @@ namespace MediaBrowser.MediaEncoding.Encoder
"vp8_rkmpp",
"vp9_rkmpp",
"av1_rkmpp"
};
];
private static readonly string[] _requiredEncoders = new[]
{
private static readonly string[] _requiredEncoders =
[
"libx264",
"libx265",
"libsvtav1",
@@ -97,10 +97,10 @@ namespace MediaBrowser.MediaEncoding.Encoder
"h264_rkmpp",
"hevc_rkmpp",
"mjpeg_rkmpp"
};
];
private static readonly string[] _requiredFilters = new[]
{
private static readonly string[] _requiredFilters =
[
// sw
"alphasrc",
"zscale",
@@ -148,7 +148,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
"scale_rkrga",
"vpp_rkrga",
"overlay_rkrga"
};
];
private static readonly Dictionary<int, string[]> _filterOptionsDict = new Dictionary<int, string[]>
{
@@ -471,10 +471,10 @@ namespace MediaBrowser.MediaEncoding.Encoder
if (string.IsNullOrWhiteSpace(output))
{
return Enumerable.Empty<string>();
return [];
}
var found = output.Split(new char[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries).Skip(1).Distinct().ToList();
var found = output.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries).Skip(1).Distinct().ToList();
_logger.LogInformation("Available hwaccel types: {Types}", found);
return found;
@@ -580,12 +580,12 @@ namespace MediaBrowser.MediaEncoding.Encoder
catch (Exception ex)
{
_logger.LogError(ex, "Error detecting available {Codec}", codecstr);
return Enumerable.Empty<string>();
return [];
}
if (string.IsNullOrWhiteSpace(output))
{
return Enumerable.Empty<string>();
return [];
}
var required = codec == Codec.Encoder ? _requiredEncoders : _requiredDecoders;
@@ -610,12 +610,12 @@ namespace MediaBrowser.MediaEncoding.Encoder
catch (Exception ex)
{
_logger.LogError(ex, "Error detecting available filters");
return Enumerable.Empty<string>();
return [];
}
if (string.IsNullOrWhiteSpace(output))
{
return Enumerable.Empty<string>();
return [];
}
var found = FilterRegex()