Skip to content

Consider hidden frames in FrameFromPTS/Pos when seeking #457

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
arch1t3cht wants to merge 2 commits into from
Closed

Consider hidden frames in FrameFromPTS/Pos when seeking #457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d7d447
Consider hidden frames in FrameFromPTS/Pos when seeking
arch1t3cht Aug 28, 2025
22750af
Remove workaround for h264 decoder bug
arch1t3cht Aug 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/core/track.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,12 +177,12 @@ int FFMS_Track::FrameFromPos(int64_t Pos, bool AllowHidden) const {
return -1;
}

int FFMS_Track::ClosestFrameFromPTS(int64_t PTS) const {
int FFMS_Track::ClosestFrameFromPTS(int64_t PTS, bool AllowHidden) const {
FrameInfo F;
F.PTS = PTS;

auto Pos = std::lower_bound(begin(), end(), F, PTSComparison);
while (Pos != end() && Pos->Skipped() && Pos->PTS == PTS)
while (Pos != end() && (!AllowHidden && Pos->Skipped()) && Pos->PTS == PTS)
Pos++;

if (Pos == end())
Expand Down
6 changes: 3 additions & 3 deletions src/core/track.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,9 @@ struct FFMS_Track {
void FillAudioGaps();

int FindClosestVideoKeyFrame(int Frame) const;
int FrameFromPTS(int64_t PTS, bool AllowHidden = false) const;
int FrameFromPos(int64_t Pos, bool AllowHidden = false) const;
int ClosestFrameFromPTS(int64_t PTS) const;
int FrameFromPTS(int64_t PTS, bool AllowHidden = true) const;
int FrameFromPos(int64_t Pos, bool AllowHidden = true) const;
int ClosestFrameFromPTS(int64_t PTS, bool AllowHidden = true) const;
int RealFrameNumber(int Frame) const;
int VisibleFrameCount() const;

Expand Down
9 changes: 2 additions & 7 deletions src/core/videosource.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,7 @@ FFMS_VideoSource::~FFMS_VideoSource() {
FFMS_Frame *FFMS_VideoSource::GetFrameByTime(double Time) {
// The final 1/1000th of a PTS is added to avoid frame duplication due to floating point math inexactness
// Basically only a problem when the fps is externally set to the same or a multiple of the input clip fps
int Frame = Frames.ClosestFrameFromPTS(static_cast<int64_t>(((Time * 1000 * Frames.TB.Den) / Frames.TB.Num) + .001));
int Frame = Frames.ClosestFrameFromPTS(static_cast<int64_t>(((Time * 1000 * Frames.TB.Den) / Frames.TB.Num) + .001), false);
return GetFrame(Frame);
}

Expand Down Expand Up @@ -743,7 +743,7 @@ bool FFMS_VideoSource::DecodePacket(AVPacket *Packet) {
std::swap(DecodeFrame, LastDecodedFrame);
ResendPacket = false;

int PacketNum = Frames.FrameFromPTS(Frames.UseDTS ? Packet->dts : Packet->pts, true);
int PacketNum = Frames.FrameFromPTS(Frames.UseDTS ? Packet->dts : Packet->pts);
bool PacketHidden = !!(Packet->flags & AV_PKT_FLAG_DISCARD) || (PacketNum != -1 && Frames[PacketNum].MarkedHidden);
bool SecondField = PacketNum != -1 && Frames[PacketNum].SecondField;

Expand Down Expand Up @@ -918,11 +918,6 @@ bool FFMS_VideoSource::SeekTo(int n, int SeekOffset) {
// Is the +1 necessary here? Not sure, but let's keep it to be safe.
int EndOfStreamDist = CodecContext->has_b_frames + 1;

if (CodecContext->codec_id == AV_CODEC_ID_H264)
// Work around a bug in ffmpeg's h264 decoder where frames are skipped when seeking too
// close to the end in open-gop files: https://trac.ffmpeg.org/ticket/10936
EndOfStreamDist *= 2;

TargetFrame = std::min(TargetFrame, Frames.RealFrameNumber(std::max(0, VP.NumFrames - 1 - EndOfStreamDist)));

if (SeekMode < 3)
Expand Down
Loading