michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: also check if we are doing scaling

Browse Source 
Signed-off-by: gnattu <gnattuoc@me.com>
This commit is contained in:
gnattu 2024-03-08 23:37:27 +08:00
parent f31549cc0d
commit 2f66871040
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
View File

@ -5011,6 +5011,7 @@ namespace MediaBrowser.Controller.MediaEncoding
var threeDFormat = state.MediaSource.Video3DFormat; var threeDFormat = state.MediaSource.Video3DFormat;
var isVtEncoder = vidEncoder.Contains("videotoolbox", StringComparison.OrdinalIgnoreCase); var isVtEncoder = vidEncoder.Contains("videotoolbox", StringComparison.OrdinalIgnoreCase);
var hwScaleFilter = GetHwScaleFilter("vt", null, inW, inH, reqW, reqH, reqMaxW, reqMaxH);
var doDeintH264 = state.DeInterlace("h264", true) || state.DeInterlace("avc", true); var doDeintH264 = state.DeInterlace("h264", true) || state.DeInterlace("avc", true);
var doDeintHevc = state.DeInterlace("h265", true) || state.DeInterlace("hevc", true); var doDeintHevc = state.DeInterlace("h265", true) || state.DeInterlace("hevc", true);
@ -5019,6 +5020,7 @@ namespace MediaBrowser.Controller.MediaEncoding
var doOclTonemap = !doVtTonemap && IsHwTonemapAvailable(state, options); var doOclTonemap = !doVtTonemap && IsHwTonemapAvailable(state, options);
var doTonemap = doVtTonemap || doOclTonemap; var doTonemap = doVtTonemap || doOclTonemap;
var doScale = !string.IsNullOrEmpty(hwScaleFilter);
var hasSubs = state.SubtitleStream is not null && state.SubtitleDeliveryMethod == SubtitleDeliveryMethod.Encode; var hasSubs = state.SubtitleStream is not null && state.SubtitleDeliveryMethod == SubtitleDeliveryMethod.Encode;
var hasTextSubs = hasSubs && state.SubtitleStream.IsTextSubtitleStream; var hasTextSubs = hasSubs && state.SubtitleStream.IsTextSubtitleStream;
var hasGraphicalSubs = hasSubs && !state.SubtitleStream.IsTextSubtitleStream; var hasGraphicalSubs = hasSubs && !state.SubtitleStream.IsTextSubtitleStream;
@ -5037,7 +5039,7 @@ namespace MediaBrowser.Controller.MediaEncoding
/* Make main filters for video stream */ /* Make main filters for video stream */
var mainFilters = new List<string>(); var mainFilters = new List<string>();
if (!(doTonemap || hasSubs || doDeintH2645)) if (!(doTonemap || doScale || hasSubs || doDeintH2645))
{ {
// Dummy action to return empty filters when nothing to do. // Dummy action to return empty filters when nothing to do.
return (mainFilters, mainFilters, mainFilters); return (mainFilters, mainFilters, mainFilters);
@ -5061,7 +5063,6 @@ namespace MediaBrowser.Controller.MediaEncoding
mainFilters.Add(deintFilter); mainFilters.Add(deintFilter);
} }
var hwScaleFilter = GetHwScaleFilter("vt", null, inW, inH, reqW, reqH, reqMaxW, reqMaxH);
if (doVtTonemap) if (doVtTonemap)
{ {
const string VtTonemapArgs = "color_matrix=bt709:color_primaries=bt709:color_transfer=bt709"; const string VtTonemapArgs = "color_matrix=bt709:color_primaries=bt709:color_transfer=bt709";