pt
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: use hardware filter option name explicitly 

Signed-off-by: gnattu <gnattuoc@me.com>
This commit is contained in:
gnattu 2024-02-16 01:30:12 +08:00
parent 2f3e5cfa06
commit 0a8560f64a
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2970,14 +2970,6 @@ namespace MediaBrowser.Controller.MediaEncoding
arg2 = (isSizeFixed ? ':' : '=') + arg2;
}
if (string.Equals(hwScaleSuffix, "vt", StringComparison.OrdinalIgnoreCase))
{
// VideoToolBox scaling filter requires different syntax
arg1 = isSizeFixed ? ("=" + outWidth.Value + ":" + outHeight.Value) : string.Empty;
// VideoToolBox does format conversion automatically
arg2 = string.Empty;
}
if (!string.IsNullOrEmpty(hwScaleSuffix) && (isSizeFixed || isFormatFixed))
{
return string.Format(
@ -5026,11 +5018,13 @@ namespace MediaBrowser.Controller.MediaEncoding
newfilters.Add("hwupload");
if (supportsHwScale)
{
var hwScaleFilter = GetHwScaleFilter("vt", string.Empty, inW, inH, reqW, reqH, reqMaxW, reqMaxH);
if (true)
var hwScaleFilter = GetHwScaleFilter("vt", null, inW, inH, reqW, reqH, reqMaxW, reqMaxH);
if (useHwToneMapping)
{
hwScaleFilter = string.IsNullOrEmpty(hwScaleFilter) ? "scale_vt=0:0:bt709:bt709:bt709"
: string.Format(CultureInfo.InvariantCulture, hwScaleFilter, ":bt709:bt709:bt709");
var tonemapArgs = "color_matrix=bt709:color_primaries=bt709:color_transfer=bt709";
hwScaleFilter = string.IsNullOrEmpty(hwScaleFilter)
? "scale_vt=" + tonemapArgs
: hwScaleFilter + ":" + tonemapArgs;
}
newfilters.Add(hwScaleFilter);