mirror of
https://github.com/jellyfin/jellyfin.git
synced 2026-11-21 23:32:19 +00:00
Increased ffmpeg runtime key detection duration to at max 5 seconds
The previous duration was too short on faster systems for ffmpeg to print its runtime keybinds
This commit is contained in:
parent
6c073e19dd
commit
35c3d7dde2
2 changed files with 4 additions and 5 deletions
|
|
@ -193,8 +193,6 @@ namespace MediaBrowser.MediaEncoding.Encoder
|
|||
|
||||
private readonly string _encoderPath;
|
||||
|
||||
private readonly Version _minFFmpegMultiThreadedCli = new Version(7, 0);
|
||||
|
||||
public EncoderValidator(ILogger logger, string encoderPath)
|
||||
{
|
||||
_logger = logger;
|
||||
|
|
@ -552,9 +550,9 @@ namespace MediaBrowser.MediaEncoding.Encoder
|
|||
string output;
|
||||
try
|
||||
{
|
||||
// With multi-threaded cli support, FFmpeg 7 is less sensitive to keyboard input
|
||||
var duration = ffmpegVersion >= _minFFmpegMultiThreadedCli ? 10000 : 1000;
|
||||
output = GetProcessOutput(_encoderPath, $"-hide_banner -f lavfi -i nullsrc=s=1x1:d={duration} -f null -", true, "?");
|
||||
// Start a dummy encode of 1x1@1fps. Send '?' to stdin to get the help/keybind text, followed by 'q' to stop the job immediately
|
||||
// As a safeguard in case 'q' doesn't stop the job, the dummy input has a max duration of 5 (realtime) seconds
|
||||
output = GetProcessOutput(_encoderPath, $"-hide_banner -re -f lavfi -i nullsrc=s=1x1:r=1:d=5 -f null -", true, "?q");
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue