|
@@ -737,12 +737,12 @@ namespace MediaBrowser.MediaEncoding.Encoder
|
|
|
{
|
|
|
var peak = videoStream.VideoRangeType == VideoRangeType.DOVI ? "400" : "100";
|
|
|
enableHdrExtraction = true;
|
|
|
- filters.Add($"tonemapx=tonemap=bt2390:desat=0:peak={peak}:t=bt709:m=bt709:p=bt709:format=yuv420p");
|
|
|
+ filters.Add($"tonemapx=tonemap=bt2390:desat=0:peak={peak}:t=bt709:m=bt709:p=bt709:format=yuv420p:range=full");
|
|
|
}
|
|
|
else if (SupportsFilter("zscale") && videoStream.VideoRangeType != VideoRangeType.DOVI)
|
|
|
{
|
|
|
enableHdrExtraction = true;
|
|
|
- filters.Add("zscale=t=linear:npl=100,format=gbrpf32le,zscale=p=bt709,tonemap=tonemap=hable:desat=0:peak=100,zscale=t=bt709:m=bt709,format=yuv420p");
|
|
|
+ filters.Add("zscale=t=linear:npl=100,format=gbrpf32le,zscale=p=bt709,tonemap=tonemap=hable:desat=0:peak=100,zscale=t=bt709:m=bt709:out_range=full,format=yuv420p");
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -756,7 +756,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
|
|
|
_threads,
|
|
|
vf,
|
|
|
isAudio ? string.Empty : GetImageResolutionParameter(),
|
|
|
- EncodingHelper.GetVideoSyncOption("-1", EncoderVersion).Trim(), // auto decide fps mode
|
|
|
+ EncodingHelper.GetVideoSyncOption("-1", EncoderVersion), // auto decide fps mode
|
|
|
tempExtractPath);
|
|
|
|
|
|
if (offset.HasValue)
|
|
@@ -767,7 +767,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
|
|
|
// The mpegts demuxer cannot seek to keyframes, so we have to let the
|
|
|
// decoder discard non-keyframes, which may contain corrupted images.
|
|
|
var seekMpegTs = offset.HasValue && string.Equals("mpegts", container, StringComparison.OrdinalIgnoreCase);
|
|
|
- if ((useIFrame && useTradeoff) || seekMpegTs)
|
|
|
+ if (useIFrame && (useTradeoff || seekMpegTs))
|
|
|
{
|
|
|
args = "-skip_frame nokey " + args;
|
|
|
}
|