conco/OpenMaidEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Fix MPEG opening preroll synchronization

Browse Source
This commit is contained in:
gamer147
2026-08-11 16:39:30 -04:00
parent 650c10bc7a
commit d38e698b91
9 changed files with 128 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
engine/Age.Engine.Frontend/FfmpegMovieDecoder.cs
View File

@@ -260,11 +260,10 @@ internal sealed class FfmpegMovieDecoder : IMovieDecoder
{
if (decodedFrames == 0)
throw new InvalidDataException("FFmpeg stream ended before producing a video frame");
long completionTime = _presentationDurationMs
?? PresentationDeadline(
Math.Max(_source.Info.StopTimeMs,
lastTimestamp + FrameIntervalMilliseconds(_source.Info)),
firstTimestamp);
long sourceEndpoint = Math.Max(
_source.Info.StopTimeMs,
lastTimestamp + FrameIntervalMilliseconds(_source.Info));
long completionTime = CompletionDeadline(sourceEndpoint, firstTimestamp);
if (_clock.WaitUntil(completionTime, _cancel))
{
_videoTimelineCompleted = true;
@@ -446,6 +445,19 @@ internal sealed class FfmpegMovieDecoder : IMovieDecoder
return checked(sourceElapsed * duration / _source.Info.StopTimeMs);
}
private long CompletionDeadline(long sourceEndpoint, long firstVideoTimestamp)
{
if (_presentationDurationMs is { } duration) return duration;
if (AudioInfo != null)
{
// The audio pin begins at the common mux origin even when the video stream declares
// a later start. Keep the terminal image while the audio-master clock drains through
// the full graph endpoint rather than completing at the last video sample.
return Math.Max(0, sourceEndpoint - _initialPositionMs);
}
return PresentationDeadline(sourceEndpoint, firstVideoTimestamp);
}
public void Dispose()
{
if (Interlocked.Exchange(ref _disposed, 1) != 0) return;