maintain source fps when using qsv (#2558)

This commit is contained in:
Jason Dove
2025-10-22 14:27:01 -05:00
committed by GitHub
parent f7c699248c
commit 82e0fcaec8
3 changed files with 19 additions and 8 deletions
@@ -248,7 +248,7 @@ public class PrepareTroubleshootingPlaybackHandler(
inPoint,
channelStartTime: DateTimeOffset.Now,
TimeSpan.Zero,
None,
Option<int>.None,
FileSystemLayout.TranscodeTroubleshootingFolder,
_ => { },
cancellationToken);
+2 -2
View File
@@ -1,8 +1,8 @@
namespace ErsatzTV.FFmpeg.Filter;
public class ResetPtsFilter : BaseFilter
public class ResetPtsFilter(string fps) : BaseFilter
{
public override string Filter => "setpts=PTS-STARTPTS";
public override string Filter => $"setpts=PTS-STARTPTS,fps={fps}";
public override FrameState NextState(FrameState currentState) => currentState;
}
+16 -5
View File
@@ -1,3 +1,4 @@
using System.Globalization;
using ErsatzTV.FFmpeg.Capabilities;
using ErsatzTV.FFmpeg.Decoder;
using ErsatzTV.FFmpeg.Decoder.Qsv;
@@ -170,8 +171,6 @@ public class QsvPipelineBuilder : SoftwarePipelineBuilder
currentState = decoder.NextState(currentState);
}
videoInputFile.FilterSteps.Add(new ResetPtsFilter());
// easier to use nv12 for overlay
if (context.HasSubtitleOverlay || context.HasWatermark || context.HasGraphicsEngine)
{
@@ -194,15 +193,27 @@ public class QsvPipelineBuilder : SoftwarePipelineBuilder
currentState = SetCrop(videoInputFile, desiredState, currentState);
SetStillImageLoop(videoInputFile, videoStream, ffmpegState, desiredState, pipelineSteps);
// need to download for any sort of overlay
if (currentState.FrameDataLocation == FrameDataLocation.Hardware &&
(context.HasSubtitleOverlay || context.HasWatermark || context.HasGraphicsEngine))
// need to download for any sort of overlay (and always for setpts)
if (currentState.FrameDataLocation == FrameDataLocation.Hardware) //&&
//(context.HasSubtitleOverlay || context.HasWatermark || context.HasGraphicsEngine))
{
var hardwareDownload = new HardwareDownloadFilter(currentState);
currentState = hardwareDownload.NextState(currentState);
videoInputFile.FilterSteps.Add(hardwareDownload);
}
// use normalized fps, or source fps
string fps = desiredState.FrameRate.Match(
r => r.ToString(NumberFormatInfo.InvariantInfo),
() => videoStream.FrameRate.IfNone("24"));
videoInputFile.FilterSteps.Add(new ResetPtsFilter(fps));
// since fps will set frame rate, remove the output option
foreach (var frameRate in pipelineSteps.OfType<FrameRateOutputOption>().HeadOrNone())
{
pipelineSteps.Remove(frameRate);
}
currentState = SetSubtitle(
videoInputFile,
subtitleInputFile,