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

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

Browse Source 
Use invariant culture for tonemap options

Original-merge: d292fde9e29609b58278e46e4edb155698b2fe1c

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

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

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

@ -3527,20 +3527,29 @@ namespace MediaBrowser.Controller.MediaEncoding
{ {
// tonemapx requires yuv420p10 input for dovi reshaping, let ffmpeg convert the frame when necessary // tonemapx requires yuv420p10 input for dovi reshaping, let ffmpeg convert the frame when necessary
var tonemapFormat = requireDoviReshaping ? "yuv420p" : outFormat; var tonemapFormat = requireDoviReshaping ? "yuv420p" : outFormat;
var tonemapArgString = "tonemapx=tonemap={0}:desat={1}:peak={2}:t=bt709:m=bt709:p=bt709:format={3}";
var tonemapArgs = $"tonemapx=tonemap={options.TonemappingAlgorithm}:desat={options.TonemappingDesat}:peak={options.TonemappingPeak}:t=bt709:m=bt709:p=bt709:format={tonemapFormat}";
if (options.TonemappingParam != 0) if (options.TonemappingParam != 0)
{ {
tonemapArgs += $":param={options.TonemappingParam}"; tonemapArgString += ":param={4}";
} }
var range = options.TonemappingRange; var range = options.TonemappingRange;
if (range == TonemappingRange.tv || range == TonemappingRange.pc) if (range == TonemappingRange.tv || range == TonemappingRange.pc)
{ {
tonemapArgs += $":range={options.TonemappingRange}"; tonemapArgString += ":range={5}";
} }
var tonemapArgs = string.Format(
CultureInfo.InvariantCulture,
tonemapArgString,
options.TonemappingAlgorithm,
options.TonemappingDesat,
options.TonemappingPeak,
tonemapFormat,
options.TonemappingParam,
options.TonemappingRange);
mainFilters.Add(tonemapArgs); mainFilters.Add(tonemapArgs);
} }
else else