Commit f28eab72 authored by François Cartegnie's avatar François Cartegnie 🤞

demux: adaptative: pass demux target time to demuxer call

parent df5bb189
......@@ -281,7 +281,7 @@ AbstractStream::status AbstractStream::demux(mtime_t nz_deadline, bool send)
if(nz_deadline + VLC_TS_0 > getBufferingLevel()) /* not already demuxed */
{
/* need to read, demuxer still buffering, ... */
if(demuxer->demux() != VLC_DEMUXER_SUCCESS)
if(demuxer->demux(nz_deadline) != VLC_DEMUXER_SUCCESS)
{
if(restarting_output || discontinuity)
{
......
......@@ -107,7 +107,7 @@ void Demuxer::drain()
while(p_demux && demux_Demux(p_demux) == VLC_DEMUXER_SUCCESS);
}
int Demuxer::demux()
int Demuxer::demux(mtime_t)
{
if(b_eof)
return VLC_DEMUXER_EOF;
......
......@@ -37,7 +37,7 @@ namespace adaptative
public:
AbstractDemuxer();
virtual ~AbstractDemuxer();
virtual int demux() = 0;
virtual int demux(mtime_t) = 0;
virtual void drain() = 0;
virtual bool create() = 0;
virtual bool restart(CommandsQueue &) = 0;
......@@ -54,7 +54,7 @@ namespace adaptative
public:
Demuxer(demux_t *, const std::string &, es_out_t *, AbstractSourceStream *);
virtual ~Demuxer();
virtual int demux(); /* impl */
virtual int demux(mtime_t); /* impl */
virtual void drain(); /* impl */
virtual bool create(); /* impl */
virtual bool restart(CommandsQueue &); /* impl */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment