Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-05-24 02:02:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: don't do empty hwupload for VT (#11235)

Browse Source
This commit is contained in:
gnattu 2024-03-30 23:25:22 +08:00 committed by GitHub
parent 7cfe0009e5
commit fe88a484d1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5119,11 +5119,6 @@ namespace MediaBrowser.Controller.MediaEncoding
/* Make main filters for video stream */ /* Make main filters for video stream */
var mainFilters = new List<string>(); var mainFilters = new List<string>();
// INPUT videotoolbox/memory surface(vram/uma)
// this will pass-through automatically if in/out format matches.
mainFilters.Add("format=nv12|p010le|videotoolbox_vld");
mainFilters.Add("hwupload=derive_device=videotoolbox");
// hw deint // hw deint
if (doDeintH2645) if (doDeintH2645)
{ {
@ -5179,6 +5174,21 @@ namespace MediaBrowser.Controller.MediaEncoding
overlayFilters.Add("overlay_videotoolbox=eof_action=pass:repeatlast=0"); overlayFilters.Add("overlay_videotoolbox=eof_action=pass:repeatlast=0");
} }
var needFiltering = mainFilters.Any(f => !string.IsNullOrEmpty(f)) ||
subFilters.Any(f => !string.IsNullOrEmpty(f)) ||
overlayFilters.Any(f => !string.IsNullOrEmpty(f));
// This is a workaround for ffmpeg's hwupload implementation
// For VideoToolbox encoders, a hwupload without a valid filter actually consuming its frame
// will cause the encoder to produce incorrect frames.
if (needFiltering)
{
// INPUT videotoolbox/memory surface(vram/uma)
// this will pass-through automatically if in/out format matches.
mainFilters.Insert(0, "format=nv12|p010le|videotoolbox_vld");
mainFilters.Insert(0, "hwupload=derive_device=videotoolbox");
}
return (mainFilters, subFilters, overlayFilters); return (mainFilters, subFilters, overlayFilters);
} }