starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-16 22:13:06 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6425 from boolemancer/boolemancer/fix_image_extractor

Browse Source 
Fix explicit stream selection in MediaEncoder.ExtractImageInternal
This commit is contained in:
Bond-009
2021-09-01 18:24:29 +02:00
committed by GitHub
parent 5ca88a835e 2345646ff1
commit 855f9c4a8e
2 changed files with 3 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -491,15 +491,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
{
var inputArgument = GetInputArgument(inputFile, mediaSource);
if (isAudio)
{
if (imageStreamIndex.HasValue && imageStreamIndex.Value > 0)
{
// It seems for audio files we need to subtract 1 (for the audio stream??)
imageStreamIndex = imageStreamIndex.Value - 1;
}
}
else
if (!isAudio)
{
// The failure of HDR extraction usually occurs when using custom ffmpeg that does not contain the zscale filter.
try
@@ -570,7 +562,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
_ => string.Empty
};
var mapArg = imageStreamIndex.HasValue ? (" -map 0:v:" + imageStreamIndex.Value.ToString(CultureInfo.InvariantCulture)) : string.Empty;
var mapArg = imageStreamIndex.HasValue ? (" -map 0:" + imageStreamIndex.Value.ToString(CultureInfo.InvariantCulture)) : string.Empty;
var enableHdrExtraction = allowTonemap && string.Equals(videoStream?.VideoRange, "HDR", StringComparison.OrdinalIgnoreCase);
if (enableHdrExtraction)