mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-06 11:34:57 +02:00
Brighter VPP tone-mapping on Intel
This commit is contained in:
parent
6749313249
commit
f7813803c2
3 changed files with 20 additions and 1 deletions
|
@ -125,6 +125,7 @@ namespace MediaBrowser.Controller.MediaEncoding
|
||||||
&& _mediaEncoder.SupportsFilter("scale_vaapi")
|
&& _mediaEncoder.SupportsFilter("scale_vaapi")
|
||||||
&& _mediaEncoder.SupportsFilter("deinterlace_vaapi")
|
&& _mediaEncoder.SupportsFilter("deinterlace_vaapi")
|
||||||
&& _mediaEncoder.SupportsFilter("tonemap_vaapi")
|
&& _mediaEncoder.SupportsFilter("tonemap_vaapi")
|
||||||
|
&& _mediaEncoder.SupportsFilter("procamp_vaapi")
|
||||||
&& _mediaEncoder.SupportsFilterWithOption(FilterOptionType.OverlayVaapiFrameSync)
|
&& _mediaEncoder.SupportsFilterWithOption(FilterOptionType.OverlayVaapiFrameSync)
|
||||||
&& _mediaEncoder.SupportsFilter("hwupload_vaapi");
|
&& _mediaEncoder.SupportsFilter("hwupload_vaapi");
|
||||||
}
|
}
|
||||||
|
@ -2704,7 +2705,18 @@ namespace MediaBrowser.Controller.MediaEncoding
|
||||||
|
|
||||||
var args = "tonemap_{0}=format={1}:p=bt709:t=bt709:m=bt709";
|
var args = "tonemap_{0}=format={1}:p=bt709:t=bt709:m=bt709";
|
||||||
|
|
||||||
if (!hwTonemapSuffix.Contains("vaapi", StringComparison.OrdinalIgnoreCase))
|
if (hwTonemapSuffix.Contains("vaapi", StringComparison.OrdinalIgnoreCase))
|
||||||
|
{
|
||||||
|
args += ",procamp_vaapi=b={2}:c={3}:extra_hw_frames=16";
|
||||||
|
return string.Format(
|
||||||
|
CultureInfo.InvariantCulture,
|
||||||
|
args,
|
||||||
|
hwTonemapSuffix,
|
||||||
|
videoFormat ?? "nv12",
|
||||||
|
options.VppTonemappingBrightness,
|
||||||
|
options.VppTonemappingContrast);
|
||||||
|
}
|
||||||
|
else
|
||||||
{
|
{
|
||||||
args += ":tonemap={2}:peak={3}:desat={4}";
|
args += ":tonemap={2}:peak={3}:desat={4}";
|
||||||
|
|
||||||
|
|
|
@ -100,6 +100,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
|
||||||
"scale_vaapi",
|
"scale_vaapi",
|
||||||
"deinterlace_vaapi",
|
"deinterlace_vaapi",
|
||||||
"tonemap_vaapi",
|
"tonemap_vaapi",
|
||||||
|
"procamp_vaapi",
|
||||||
"overlay_vaapi",
|
"overlay_vaapi",
|
||||||
"hwupload_vaapi"
|
"hwupload_vaapi"
|
||||||
};
|
};
|
||||||
|
|
|
@ -26,6 +26,8 @@ namespace MediaBrowser.Model.Configuration
|
||||||
TonemappingThreshold = 0.8;
|
TonemappingThreshold = 0.8;
|
||||||
TonemappingPeak = 100;
|
TonemappingPeak = 100;
|
||||||
TonemappingParam = 0;
|
TonemappingParam = 0;
|
||||||
|
VppTonemappingBrightness = 0;
|
||||||
|
VppTonemappingContrast = 1.2;
|
||||||
H264Crf = 23;
|
H264Crf = 23;
|
||||||
H265Crf = 28;
|
H265Crf = 28;
|
||||||
DeinterlaceDoubleRate = false;
|
DeinterlaceDoubleRate = false;
|
||||||
|
@ -89,6 +91,10 @@ namespace MediaBrowser.Model.Configuration
|
||||||
|
|
||||||
public double TonemappingParam { get; set; }
|
public double TonemappingParam { get; set; }
|
||||||
|
|
||||||
|
public double VppTonemappingBrightness { get; set; }
|
||||||
|
|
||||||
|
public double VppTonemappingContrast { get; set; }
|
||||||
|
|
||||||
public int H264Crf { get; set; }
|
public int H264Crf { get; set; }
|
||||||
|
|
||||||
public int H265Crf { get; set; }
|
public int H265Crf { get; set; }
|
||||||
|
|
Loading…
Reference in a new issue