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

Clean up deprecated -vsync option (#12765)

Browse Source
This commit is contained in:
Nyanmisaka
2024-10-03 14:18:40 +00:00
committed by GitHub
parent 9604088e3c
commit b496f979f0
4 changed files with 34 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6857,7 +6857,7 @@ namespace MediaBrowser.Controller.MediaEncoding
if (!string.IsNullOrEmpty(state.InputVideoSync))
{
inputModifier += " -vsync " + state.InputVideoSync;
inputModifier += GetVideoSyncOption(state.InputVideoSync, _mediaEncoder.EncoderVersion);
}
if (state.ReadInputAtNativeFramerate && state.InputProtocol != MediaProtocol.Rtsp)
@@ -7280,7 +7280,7 @@ namespace MediaBrowser.Controller.MediaEncoding
if (!string.IsNullOrEmpty(state.OutputVideoSync))
{
args += " -vsync " + state.OutputVideoSync;
args += GetVideoSyncOption(state.OutputVideoSync, _mediaEncoder.EncoderVersion);
}
args += GetOutputFFlags(state);
@@ -7453,5 +7453,33 @@ namespace MediaBrowser.Controller.MediaEncoding
return state.SubtitleDeliveryMethod == SubtitleDeliveryMethod.Encode
|| (state.BaseRequest.AlwaysBurnInSubtitleWhenTranscoding && !IsCopyCodec(state.OutputVideoCodec));
}
public static string GetVideoSyncOption(string videoSync, Version encoderVersion)
{
if (string.IsNullOrEmpty(videoSync))
{
return string.Empty;
}
if (encoderVersion >= new Version(5, 1))
{
if (int.TryParse(videoSync, CultureInfo.InvariantCulture, out var vsync))
{
return vsync switch
{
-1 => " -fps_mode auto",
0 => " -fps_mode passthrough",
1 => " -fps_mode cfr",
2 => " -fps_mode vfr",
_ => string.Empty
};
}
return string.Empty;
}
// -vsync is deprecated in FFmpeg 5.1 and will be removed in the future.
return $" -vsync {videoSync}";
}
}
}