Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Fix pixel format in HEVC RExt SDR transcoding

Original-merge: aa08d3f2bf155d55f748bff1f0a0c7f071f79ae7

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:24 -05:00 committed by Joshua M. Boniface
parent 547d393af0
commit 87a3c5d11c
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4131,7 +4131,7 @@ namespace MediaBrowser.Controller.MediaEncoding
else if (isD3d11vaDecoder || isQsvDecoder) else if (isD3d11vaDecoder || isQsvDecoder)
{ {
var isRext = IsVideoStreamHevcRext(state); var isRext = IsVideoStreamHevcRext(state);
var twoPassVppTonemap = isRext; var twoPassVppTonemap = false;
var doVppFullRangeOut = isMjpegEncoder var doVppFullRangeOut = isMjpegEncoder
&& _mediaEncoder.EncoderVersion >= _minFFmpegQsvVppOutRangeOption; && _mediaEncoder.EncoderVersion >= _minFFmpegQsvVppOutRangeOption;
var doVppScaleModeHq = isMjpegEncoder var doVppScaleModeHq = isMjpegEncoder
@ -4140,6 +4140,12 @@ namespace MediaBrowser.Controller.MediaEncoding
var procampParams = string.Empty; var procampParams = string.Empty;
if (doVppTonemap) if (doVppTonemap)
{ {
if (isRext)
{
// VPP tonemap requires p010 input
twoPassVppTonemap = true;
}
if (options.VppTonemappingBrightness != 0 if (options.VppTonemappingBrightness != 0
&& options.VppTonemappingBrightness >= -100 && options.VppTonemappingBrightness >= -100
&& options.VppTonemappingBrightness <= 100) && options.VppTonemappingBrightness <= 100)