aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNyanmisaka <nst799610810@gmail.com>2024-09-28 09:36:33 +0000
committerGitHub <noreply@github.com>2024-09-28 03:36:33 -0600
commitf52f5290b2e387edd9520197a75eda9c63fde7e8 (patch)
tree9e53e64782ab7edda37b6025171a16a04ef708e5
parente5f5f7c3843d8de0fd212d77332e9d20f614db59 (diff)
Fix vpp tonemap pixfmt regression (#12733)
-rw-r--r--MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs4
1 files changed, 1 insertions, 3 deletions
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index e5b9ad167..c8deca609 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -4422,9 +4422,7 @@ namespace MediaBrowser.Controller.MediaEncoding
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);