cotugno/jellyfin
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-11-15 09:59:06 -07:00
Code Issues Packages Projects Releases Wiki Activity

Allow SW encoders to use VideoToolbox HW filters (#12576)

Browse Source
This commit is contained in:
gnattu 2024-09-04 21:36:20 +08:00 committed by GitHub
parent 6995e747c2
commit e68755a6c1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
View File

@ -5136,13 +5136,15 @@ namespace MediaBrowser.Controller.MediaEncoding
return (null, null, null);
}
// ReSharper disable once InconsistentNaming
var isMacOS = OperatingSystem.IsMacOS();
var vidDecoder = GetHardwareVideoDecoder(state, options) ?? string.Empty;
var isVtDecoder = vidDecoder.Contains("videotoolbox", StringComparison.OrdinalIgnoreCase);
var isVtEncoder = vidEncoder.Contains("videotoolbox", StringComparison.OrdinalIgnoreCase);
var isVtFullSupported = isMacOS && IsVideoToolboxFullSupported();
// legacy videotoolbox pipeline (disable hw filters)
if (!isVtEncoder
if (!(isVtEncoder || isVtDecoder)
|| !isVtFullSupported
|| !_mediaEncoder.SupportsFilter("alphasrc"))
{
@ -5162,12 +5164,6 @@ namespace MediaBrowser.Controller.MediaEncoding
var isVtEncoder = vidEncoder.Contains("videotoolbox", StringComparison.OrdinalIgnoreCase);
var isVtDecoder = vidDecoder.Contains("videotoolbox", StringComparison.OrdinalIgnoreCase);
if (!isVtEncoder)
{
// should not happen.
return (null, null, null);
}
var inW = state.VideoStream?.Width;
var inH = state.VideoStream?.Height;
var reqW = state.BaseRequest.Width;
@ -5282,6 +5278,12 @@ namespace MediaBrowser.Controller.MediaEncoding
if (usingHwSurface)
{
if (!isVtEncoder)
{
mainFilters.Add("hwdownload");
mainFilters.Add("format=nv12");
}
return (mainFilters, subFilters, overlayFilters);
}
@ -5295,6 +5297,12 @@ namespace MediaBrowser.Controller.MediaEncoding
// this will pass-through automatically if in/out format matches.
mainFilters.Insert(0, "hwupload");
mainFilters.Insert(0, "format=nv12|p010le|videotoolbox_vld");
if (!isVtEncoder)
{
mainFilters.Add("hwdownload");
mainFilters.Add("format=nv12");
}
}
return (mainFilters, subFilters, overlayFilters);