Skip to content

V
vlc
Commit 064c2f72 authored by Francois Cartegnie's avatar Francois Cartegnie
Browse files
Options

demux: adaptative: disable alternate streams after demuxing stage

parent 51f2e969
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 6 deletions
modules/demux/adaptative/Streams.cpp
View file @ 064c2f72
...@@ -139,12 +139,6 @@ SegmentChunk * AbstractStream::getChunk() ...@@ -139,12 +139,6 @@ SegmentChunk * AbstractStream::getChunk()
{ {
if (currentChunk == NULL && !eof) if (currentChunk == NULL && !eof)
{ {
if(esCount() && !isSelected())
{
disabled = true;
segmentTracker->reset();
return NULL;
}
currentChunk = segmentTracker->getNextChunk(!fakeesout->restarting(), connManager); currentChunk = segmentTracker->getNextChunk(!fakeesout->restarting(), connManager);
if (currentChunk == NULL) if (currentChunk == NULL)
eof = true; eof = true;
...@@ -286,6 +280,13 @@ AbstractStream::status AbstractStream::demux(mtime_t nz_deadline, bool send) ...@@ -286,6 +280,13 @@ AbstractStream::status AbstractStream::demux(mtime_t nz_deadline, bool send)
if(send) if(send)
pcr = fakeesout->commandsqueue.Process( p_realdemux->out, VLC_TS_0 + nz_deadline ); pcr = fakeesout->commandsqueue.Process( p_realdemux->out, VLC_TS_0 + nz_deadline );
/* Disable streams that are not selected (alternate streams) */
if(esCount() && !isSelected() && !fakeesout->restarting())
{
disabled = true;
segmentTracker->reset();
}
return AbstractStream::status_demuxed; return AbstractStream::status_demuxed;
} }
......
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