Skip to content

Commit

Permalink
Fix vpp tonemap pixfmt regression (jellyfin#12733)
Browse files Browse the repository at this point in the history
  • Loading branch information
nyanmisaka authored Sep 28, 2024
1 parent e5f5f7c commit f52f529
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4422,9 +4422,7 @@ public string GetVideoTransposeDirection(EncodingJobInfo state)
mainFilters.Add($"transpose_vaapi=dir={tranposeDir}");
}

var outFormat = doOclTonemap ? ((isQsvDecoder && doVppTranspose) ? "p010" : string.Empty) : "nv12";
outFormat = (doTonemap && isRext) ? "p010" : outFormat;

var outFormat = doTonemap ? (((isQsvDecoder && doVppTranspose) || isRext) ? "p010" : string.Empty) : "nv12";
var swapOutputWandH = isQsvDecoder && doVppTranspose && swapWAndH;
var hwScalePrefix = (isQsvDecoder && (doVppTranspose || doVppFullRangeOut)) ? "vpp" : "scale";
var hwScaleFilter = GetHwScaleFilter(hwScalePrefix, hwFilterSuffix, outFormat, swapOutputWandH, swpInW, swpInH, reqW, reqH, reqMaxW, reqMaxH);
Expand Down

0 comments on commit f52f529

Please sign in to comment.