Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-06-01 04:34:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Backport pull request #12989 from jellyfin/release-10.10.z

Browse Source 
Fix InvariantCulture in VPP tonemap options

Original-merge: 25321d7f80a3b065a8d3061a93adb78d701b7412

Merged-by: crobibero <cody@robibe.ro>

Backported-by: Joshua M. Boniface <joshua@boniface.me>
This commit is contained in:
nyanmisaka 2024-11-19 15:43:26 -05:00 committed by Joshua M. Boniface
parent 87a3c5d11c
commit 661caa62e2
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3321,24 +3321,25 @@ namespace MediaBrowser.Controller.MediaEncoding
&& options.VppTonemappingBrightness >= -100 && options.VppTonemappingBrightness >= -100
&& options.VppTonemappingBrightness <= 100) && options.VppTonemappingBrightness <= 100)
{ {
procampParams += $"=b={options.VppTonemappingBrightness}"; procampParams += "procamp_vaapi=b={0}";
doVaVppProcamp = true; doVaVppProcamp = true;
} }
if (options.VppTonemappingContrast > 1 if (options.VppTonemappingContrast > 1
&& options.VppTonemappingContrast <= 10) && options.VppTonemappingContrast <= 10)
{ {
procampParams += doVaVppProcamp ? ":" : "="; procampParams += doVaVppProcamp ? ":c={1}" : "procamp_vaapi=c={1}";
procampParams += $"c={options.VppTonemappingContrast}";
doVaVppProcamp = true; doVaVppProcamp = true;
} }
args = "{0}tonemap_vaapi=format={1}:p=bt709:t=bt709:m=bt709:extra_hw_frames=32"; args = "{2}tonemap_vaapi=format={3}:p=bt709:t=bt709:m=bt709:extra_hw_frames=32";
return string.Format( return string.Format(
CultureInfo.InvariantCulture, CultureInfo.InvariantCulture,
args, args,
doVaVppProcamp ? $"procamp_vaapi{procampParams}," : string.Empty, options.VppTonemappingBrightness,
options.VppTonemappingContrast,
doVaVppProcamp ? "," : string.Empty,
videoFormat ?? "nv12"); videoFormat ?? "nv12");
} }
else else
@ -4138,6 +4139,7 @@ namespace MediaBrowser.Controller.MediaEncoding
&& _mediaEncoder.EncoderVersion >= _minFFmpegQsvVppScaleModeOption; && _mediaEncoder.EncoderVersion >= _minFFmpegQsvVppScaleModeOption;
var doVppProcamp = false; var doVppProcamp = false;
var procampParams = string.Empty; var procampParams = string.Empty;
var procampParamsString = string.Empty;
if (doVppTonemap) if (doVppTonemap)
{ {
if (isRext) if (isRext)
@ -4150,18 +4152,26 @@ namespace MediaBrowser.Controller.MediaEncoding
&& options.VppTonemappingBrightness >= -100 && options.VppTonemappingBrightness >= -100
&& options.VppTonemappingBrightness <= 100) && options.VppTonemappingBrightness <= 100)
{ {
procampParams += $":brightness={options.VppTonemappingBrightness}"; procampParamsString += ":brightness={0}";
twoPassVppTonemap = doVppProcamp = true; twoPassVppTonemap = doVppProcamp = true;
} }
if (options.VppTonemappingContrast > 1 if (options.VppTonemappingContrast > 1
&& options.VppTonemappingContrast <= 10) && options.VppTonemappingContrast <= 10)
{ {
procampParams += $":contrast={options.VppTonemappingContrast}"; procampParamsString += ":contrast={1}";
twoPassVppTonemap = doVppProcamp = true; twoPassVppTonemap = doVppProcamp = true;
} }
procampParams += doVppProcamp ? ":procamp=1:async_depth=2" : string.Empty; if (doVppProcamp)
{
procampParamsString += ":procamp=1:async_depth=2";
procampParams = string.Format(
CultureInfo.InvariantCulture,
procampParamsString,
options.VppTonemappingBrightness,
options.VppTonemappingContrast);
}
} }
var outFormat = doOclTonemap ? ((doVppTranspose || isRext) ? "p010" : string.Empty) : "nv12"; var outFormat = doOclTonemap ? ((doVppTranspose || isRext) ? "p010" : string.Empty) : "nv12";