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

Merge pull request #4607 from nyanmisaka/fix-image-extraction

Browse Source 
Fix the I-frame image extraction filter string
This commit is contained in:
Bond-009 2020-11-30 17:47:03 +01:00 committed by GitHub
commit 78fef80696
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,7 +36,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
/// <summary> /// <summary>
/// The default image extraction timeout in milliseconds. /// The default image extraction timeout in milliseconds.
/// </summary> /// </summary>
internal const int DefaultImageExtractionTimeout = 5000; internal const int DefaultImageExtractionTimeout = 10000;
/// <summary> /// <summary>
/// The us culture. /// The us culture.
@ -553,12 +553,21 @@ namespace MediaBrowser.MediaEncoding.Encoder
var mapArg = imageStreamIndex.HasValue ? (" -map 0:v:" + imageStreamIndex.Value.ToString(CultureInfo.InvariantCulture)) : string.Empty; var mapArg = imageStreamIndex.HasValue ? (" -map 0:v:" + imageStreamIndex.Value.ToString(CultureInfo.InvariantCulture)) : string.Empty;
var enableThumbnail = !new List<string> { "wtv" }.Contains(container ?? string.Empty, StringComparer.OrdinalIgnoreCase);
// 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 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.
var thumbnail = enableThumbnail ? ",thumbnail=24" : string.Empty; var enableThumbnail = useIFrame && !string.Equals("wtv", container, StringComparison.OrdinalIgnoreCase);
if (enableThumbnail)
{
if (string.IsNullOrEmpty(vf))
{
vf = "-vf thumbnail=24";
}
else
{
vf += ",thumbnail=24";
}
}
var args = useIFrame ? string.Format(CultureInfo.InvariantCulture, "-i {0}{3} -threads {5} -v quiet -vframes 1 {2}{4} -f image2 \"{1}\"", inputPath, tempExtractPath, vf, mapArg, thumbnail, threads) : var args = string.Format(CultureInfo.InvariantCulture, "-i {0}{3} -threads {4} -v quiet -vframes 1 {2} -f image2 \"{1}\"", inputPath, tempExtractPath, vf, mapArg, threads);
string.Format(CultureInfo.InvariantCulture, "-i {0}{3} -threads {4} -v quiet -vframes 1 {2} -f image2 \"{1}\"", inputPath, tempExtractPath, vf, mapArg, threads);
var probeSizeArgument = EncodingHelper.GetProbeSizeArgument(1); var probeSizeArgument = EncodingHelper.GetProbeSizeArgument(1);
var analyzeDurationArgument = EncodingHelper.GetAnalyzeDurationArgument(1); var analyzeDurationArgument = EncodingHelper.GetAnalyzeDurationArgument(1);

6
MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
View File

@ -778,7 +778,11 @@ namespace MediaBrowser.MediaEncoding.Probing
} }
} }
if (bitrate == 0 && formatInfo != null && !string.IsNullOrEmpty(formatInfo.BitRate) && stream.Type == MediaStreamType.Video) // The bitrate info of FLAC musics and some videos is included in formatInfo.
if (bitrate == 0
&& formatInfo != null
&& !string.IsNullOrEmpty(formatInfo.BitRate)
&& (stream.Type == MediaStreamType.Video || stream.Type == MediaStreamType.Audio))
{ {
// If the stream info doesn't have a bitrate get the value from the media format info // If the stream info doesn't have a bitrate get the value from the media format info
if (int.TryParse(formatInfo.BitRate, NumberStyles.Any, _usCulture, out var value)) if (int.TryParse(formatInfo.BitRate, NumberStyles.Any, _usCulture, out var value))