The Free Software Media System - Server Backend & API
Backport pull request #18025 from jellyfin/release-12.z
nyanmisaka57d19b185cc6
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.csindex a0f4087395..6f010c0242 100644--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs@@ -3807,6 +3807,11 @@ namespace MediaBrowser.Controller.MediaEncodingvar formatArg = isFormatFixed ? (":format=" + videoFormat) : string.Empty;var tonemapArg = string.Empty;+ // libplacebo only support full range RGB+ forceFullRange = forceFullRange+ || (videoFormat ?? string.Empty).Contains("rgb", StringComparison.OrdinalIgnoreCase)+ || (videoFormat ?? string.Empty).Contains("bgr", StringComparison.OrdinalIgnoreCase);+if (doTonemap){var algorithm = options.TonemappingAlgorithm;@@ -3830,6 +3835,10 @@ namespace MediaBrowser.Controller.MediaEncodingtonemapArg += ":range=" + range.ToString().ToLowerInvariant();}}+ else if (forceFullRange)+ {+ formatArg += ":range=pc";+ }return string.Format(CultureInfo.InvariantCulture,@@ -5470,7 +5479,14 @@ namespace MediaBrowser.Controller.MediaEncodingmainFilters.Add("format=vaapi");// clear the surf->meta_offset and output nv12- mainFilters.Add("scale_vaapi=format=nv12");+ var hwCscFilter = "scale_vaapi=format=nv12";++ if (!isMjpegEncoder && options.TonemappingRange != TonemappingRange.pc)+ {+ hwCscFilter += ":out_range=tv";+ }++ mainFilters.Add(hwCscFilter);// hw deintif (doDeintH2645)@@ -5540,7 +5556,14 @@ namespace MediaBrowser.Controller.MediaEncodingoverlayFilters.Add("format=vaapi");// clear the surf->meta_offset and output nv12- overlayFilters.Add("scale_vaapi=format=nv12");+ var hwCscFilter = "scale_vaapi=format=nv12";++ if (!doVkTonemap || (doVkTonemap && options.TonemappingRange != TonemappingRange.pc))+ {+ hwCscFilter += ":out_range=tv";+ }++ overlayFilters.Add(hwCscFilter);// hw deintif (doDeintH2645)