alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-02-04 03:32:25 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Merge changes

Browse Source
This commit is contained in:
Mark Cilia Vincenti
2024-02-03 08:45:14 +01:00
parent e47144e7c7 e4f715bbee
commit f26fc7dfb2
161 changed files with 2771 additions and 2390 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,7 +45,15 @@ namespace MediaBrowser.MediaEncoding.Encoder
"mpeg4_cuvid",
"vp8_cuvid",
"vp9_cuvid",
"av1_cuvid"
"av1_cuvid",
"h264_rkmpp",
"hevc_rkmpp",
"mpeg1_rkmpp",
"mpeg2_rkmpp",
"mpeg4_rkmpp",
"vp8_rkmpp",
"vp9_rkmpp",
"av1_rkmpp"
};
private static readonly string[] _requiredEncoders = new[]
@@ -82,7 +90,9 @@ namespace MediaBrowser.MediaEncoding.Encoder
"av1_vaapi",
"h264_v4l2m2m",
"h264_videotoolbox",
"hevc_videotoolbox"
"hevc_videotoolbox",
"h264_rkmpp",
"hevc_rkmpp"
};
private static readonly string[] _requiredFilters = new[]
@@ -116,9 +126,12 @@ namespace MediaBrowser.MediaEncoding.Encoder
"libplacebo",
"scale_vulkan",
"overlay_vulkan",
"hwupload_vaapi",
// videotoolbox
"yadif_videotoolbox"
"yadif_videotoolbox",
// rkrga
"scale_rkrga",
"vpp_rkrga",
"overlay_rkrga"
};
private static readonly Dictionary<int, string[]> _filterOptionsDict = new Dictionary<int, string[]>

7
MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
View File

@@ -904,8 +904,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
{
bool ranToCompletion = false;
await _thumbnailResourcePool.WaitAsync(cancellationToken).ConfigureAwait(false);
try
using (await _thumbnailResourcePool.LockAsync(cancellationToken).ConfigureAwait(false))
{
StartProcess(processWrapper);
@@ -959,10 +958,6 @@ namespace MediaBrowser.MediaEncoding.Encoder
StopProcess(processWrapper, 1000);
}
}
finally
{
_thumbnailResourcePool.Release();
}
var exitCode = ranToCompletion ? processWrapper.ExitCode ?? 0 : -1;