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

Fix thumbnail extraction of mpegts videos in FFmpeg 7.1+ (#13942)

Browse Source
This commit is contained in:
Nyanmisaka 2025-04-19 16:41:30 +00:00 committed by GitHub
parent 86b81c912d
commit e84826297d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -720,13 +720,11 @@ namespace MediaBrowser.MediaEncoding.Encoder
filters.Add(scaler); filters.Add(scaler);
// Use ffmpeg to sample 100 (we can drop this if required using thumbnail=50 for 50 frames) frames and pick the best thumbnail. Have a fall back just in case. // Use ffmpeg to sample N frames and pick the best thumbnail. Have a fall back just in case.
// mpegts need larger batch size otherwise the corrupted thumbnail will be created. Larger batch size will lower the processing speed.
var enableThumbnail = !useTradeoff && useIFrame && !string.Equals("wtv", container, StringComparison.OrdinalIgnoreCase); var enableThumbnail = !useTradeoff && useIFrame && !string.Equals("wtv", container, StringComparison.OrdinalIgnoreCase);
if (enableThumbnail) if (enableThumbnail)
{ {
var useLargerBatchSize = string.Equals("mpegts", container, StringComparison.OrdinalIgnoreCase); filters.Add("thumbnail=n=24");
filters.Add("thumbnail=n=" + (useLargerBatchSize ? "50" : "24"));
} }
// Use SW tonemap on HDR video stream only when the zscale or tonemapx filter is available. // Use SW tonemap on HDR video stream only when the zscale or tonemapx filter is available.
@ -750,14 +748,26 @@ namespace MediaBrowser.MediaEncoding.Encoder
var vf = string.Join(',', filters); var vf = string.Join(',', filters);
var mapArg = imageStreamIndex.HasValue ? (" -map 0:" + imageStreamIndex.Value.ToString(CultureInfo.InvariantCulture)) : string.Empty; var mapArg = imageStreamIndex.HasValue ? (" -map 0:" + imageStreamIndex.Value.ToString(CultureInfo.InvariantCulture)) : string.Empty;
var args = string.Format(CultureInfo.InvariantCulture, "-i {0}{3} -threads {4} -v quiet -vframes 1 -vf {2}{5} -f image2 \"{1}\"", inputPath, tempExtractPath, vf, mapArg, _threads, isAudio ? string.Empty : GetImageResolutionParameter()); var args = string.Format(
CultureInfo.InvariantCulture,
"-i {0}{1} -threads {2} -v quiet -vframes 1 -vf {3}{4}{5} -f image2 \"{6}\"",
inputPath,
mapArg,
_threads,
vf,
isAudio ? string.Empty : GetImageResolutionParameter(),
EncodingHelper.GetVideoSyncOption("0", EncoderVersion).Trim(), // passthrough timestamp
tempExtractPath);
if (offset.HasValue) if (offset.HasValue)
{ {
args = string.Format(CultureInfo.InvariantCulture, "-ss {0} ", GetTimeParameter(offset.Value)) + args; args = string.Format(CultureInfo.InvariantCulture, "-ss {0} ", GetTimeParameter(offset.Value)) + args;
} }
if (useIFrame && useTradeoff) // 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)
{ {
args = "-skip_frame nokey " + args; args = "-skip_frame nokey " + args;
} }