Commit d3ba198c authored by Francois Cartegnie's avatar Francois Cartegnie

demux: adaptative: fix eof detection

parent 835c81d0
...@@ -116,7 +116,7 @@ bool PlaylistManager::start(demux_t *demux) ...@@ -116,7 +116,7 @@ bool PlaylistManager::start(demux_t *demux)
Stream::status PlaylistManager::demux(mtime_t nzdeadline) Stream::status PlaylistManager::demux(mtime_t nzdeadline)
{ {
Stream::status i_return = Stream::status_demuxed; Stream::status i_return = Stream::status_eof;
for(int type=0; type<StreamTypeCount; type++) for(int type=0; type<StreamTypeCount; type++)
{ {
...@@ -126,10 +126,15 @@ Stream::status PlaylistManager::demux(mtime_t nzdeadline) ...@@ -126,10 +126,15 @@ Stream::status PlaylistManager::demux(mtime_t nzdeadline)
Stream::status i_ret = Stream::status i_ret =
streams[type]->demux(conManager, nzdeadline); streams[type]->demux(conManager, nzdeadline);
if(i_ret < Stream::status_eof) if(i_ret == Stream::status_buffering)
return i_ret; {
else if (i_ret == Stream::status_buffering)
i_return = Stream::status_buffering; i_return = Stream::status_buffering;
}
else if(i_ret == Stream::status_demuxed &&
i_return != Stream::status_buffering)
{
i_return = Stream::status_demuxed;
}
} }
return i_return; return i_return;
......
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