Skip to content

Fix catchup stream backward skip on EOF near live edge #374

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

Open
kontell wants to merge 4 commits into
base: Piers
Choose a base branch
from
Open

Fix catchup stream backward skip on EOF near live edge #374

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
20439f8
Fix catchup stream backward skip on EOF near live edge
kontell Apr 26, 2026
3a32969
Merge branch 'xbmc:Piers' into fix/catchup-eof-backward-skip
kontell May 8, 2026
bfe331d
Update changelog.txt
kontell May 8, 2026
401cde6
Update addon.xml.in
kontell May 8, 2026
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
5 changes: 3 additions & 2 deletions src/stream/FFmpegCatchupStream.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,10 +122,11 @@ DEMUX_PACKET* FFmpegCatchupStream::DemuxRead()
{
if (!m_lastPacketWasAvoidedEOF)
{
Log(LOGLEVEL_INFO, "%s - EOF detected on terminating catchup stream, starting continuing stream at offset: %lld, ending offset approx %lld", __FUNCTION__, m_previousLiveBufferOffset, static_cast<long long>(std::time(nullptr) - m_catchupBufferStartTime));
long long currentDemuxSecs = static_cast<long long>(m_currentDemuxTime) / 1000;
Log(LOGLEVEL_INFO, "%s - EOF detected on terminating catchup stream, starting continuing stream at offset: %lld, ending offset approx %lld", __FUNCTION__, currentDemuxSecs, static_cast<long long>(std::time(nullptr) - m_catchupBufferStartTime));

m_seekCorrectsEOF = true;
DemuxSeekTime(m_previousLiveBufferOffset * 1000);
DemuxSeekTime(m_currentDemuxTime);
m_seekCorrectsEOF = false;
}
m_lastPacketWasAvoidedEOF = true;
Expand Down
4 changes: 2 additions & 2 deletions src/stream/FFmpegCatchupStream.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ class FFmpegCatchupStream : public FFmpegStream

bool m_isOpeningStream;
double m_seekOffset;
double m_pauseStartTime;
double m_currentDemuxTime;
double m_pauseStartTime = 0;
double m_currentDemuxTime = 0;

long long m_previousLiveBufferOffset = 0;
bool m_lastSeekWasLive = false;
Expand Down
Loading