alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-02-12 23:52:25 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix image extractor with more strict ffmpeg requirement (#14013)
Some checks failed
Merge Conflict Labeler / Labeling (push) Has been cancelled
Details
CodeQL / Analyze (csharp) (push) Has been cancelled
Details
OpenAPI / OpenAPI - HEAD (push) Has been cancelled
Details
OpenAPI / OpenAPI - BASE (push) Has been cancelled
Details
Tests / run-tests (macos-latest) (push) Has been cancelled
Details
Tests / run-tests (ubuntu-latest) (push) Has been cancelled
Details
Tests / run-tests (windows-latest) (push) Has been cancelled
Details
Project Automation / Project board (push) Has been cancelled
Details
OpenAPI / OpenAPI - Difference (push) Has been cancelled
Details
OpenAPI / OpenAPI - Publish Unstable Spec (push) Has been cancelled
Details
OpenAPI / OpenAPI - Publish Stable Spec (push) Has been cancelled
Details

Browse Source 
* Correctly handle retry when I frame only failed

* Use full range output for image

* Don't trim image extractor option
This commit is contained in:
Bond-009
2025-04-29 14:10:24 +02:00
committed by GitHub
parent 0a0fcd3b19 f436743f9f
commit aa24d08d33
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
View File

@@ -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;
}