starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-20 07:45:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix the transparency issue of ASS subtitle rendering in HWA (#14024)

Browse Source
This commit is contained in:
Nyanmisaka
2025-05-03 14:21:08 +00:00
committed by GitHub
parent 70dbf837c5
commit 4199f7acc2
4 changed files with 38 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -150,15 +150,17 @@ namespace MediaBrowser.MediaEncoding.Encoder
"overlay_rkrga"
];
private static readonly Dictionary<int, string[]> _filterOptionsDict = new Dictionary<int, string[]>
private static readonly Dictionary<FilterOptionType, (string, string)> _filterOptionsDict = new Dictionary<FilterOptionType, (string, string)>
{
{ 0, new string[] { "scale_cuda", "format" } },
{ 1, new string[] { "tonemap_cuda", "GPU accelerated HDR to SDR tonemapping" } },
{ 2, new string[] { "tonemap_opencl", "bt2390" } },
{ 3, new string[] { "overlay_opencl", "Action to take when encountering EOF from secondary input" } },
{ 4, new string[] { "overlay_vaapi", "Action to take when encountering EOF from secondary input" } },
{ 5, new string[] { "overlay_vulkan", "Action to take when encountering EOF from secondary input" } },
{ 6, new string[] { "transpose_opencl", "rotate by half-turn" } }
{ FilterOptionType.ScaleCudaFormat, ("scale_cuda", "format") },
{ FilterOptionType.TonemapCudaName, ("tonemap_cuda", "GPU accelerated HDR to SDR tonemapping") },
{ FilterOptionType.TonemapOpenclBt2390, ("tonemap_opencl", "bt2390") },
{ FilterOptionType.OverlayOpenclFrameSync, ("overlay_opencl", "Action to take when encountering EOF from secondary input") },
{ FilterOptionType.OverlayVaapiFrameSync, ("overlay_vaapi", "Action to take when encountering EOF from secondary input") },
{ FilterOptionType.OverlayVulkanFrameSync, ("overlay_vulkan", "Action to take when encountering EOF from secondary input") },
{ FilterOptionType.TransposeOpenclReversal, ("transpose_opencl", "rotate by half-turn") },
{ FilterOptionType.OverlayOpenclAlphaFormat, ("overlay_opencl", "alpha_format") },
{ FilterOptionType.OverlayCudaAlphaFormat, ("overlay_cuda", "alpha_format") }
};
private static readonly Dictionary<BitStreamFilterOptionType, (string, string)> _bsfOptionsDict = new Dictionary<BitStreamFilterOptionType, (string, string)>
@@ -294,7 +296,8 @@ namespace MediaBrowser.MediaEncoding.Encoder
public IEnumerable<string> GetFilters() => GetFFmpegFilters();
public IDictionary<int, bool> GetFiltersWithOption() => GetFFmpegFiltersWithOption();
public IDictionary<FilterOptionType, bool> GetFiltersWithOption() => _filterOptionsDict
.ToDictionary(item => item.Key, item => CheckFilterWithOption(item.Value.Item1, item.Value.Item2));
public IDictionary<BitStreamFilterOptionType, bool> GetBitStreamFiltersWithOption() => _bsfOptionsDict
.ToDictionary(item => item.Key, item => CheckBitStreamFilterWithOption(item.Value.Item1, item.Value.Item2));
@@ -628,20 +631,6 @@ namespace MediaBrowser.MediaEncoding.Encoder
return found;
}
private Dictionary<int, bool> GetFFmpegFiltersWithOption()
{
Dictionary<int, bool> dict = new Dictionary<int, bool>();
for (int i = 0; i < _filterOptionsDict.Count; i++)
{
if (_filterOptionsDict.TryGetValue(i, out var val) && val.Length == 2)
{
dict.Add(i, CheckFilterWithOption(val[0], val[1]));
}
}
return dict;
}
private string GetProcessOutput(string path, string arguments, bool readStdErr, string? testKey)
{
var redirectStandardIn = !string.IsNullOrEmpty(testKey);