[vlc-commits] demux: adaptative: fix live pruning

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Fri Nov 27 22:45:46 2015 +0100| [414de08eda3f2e4c99aecd5eb948b24dc7b0b392] | committer: Francois Cartegnie

demux: adaptative: fix live pruning

Pruning by time was removed a while ago, but
pruning by segment number only can't work for pruning the whole
playlist as that number can be inconsistent across representations
and streams/adaptation sets.

Pruning by number should only occur merging/at representations level.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=414de08eda3f2e4c99aecd5eb948b24dc7b0b392
---

 modules/demux/adaptative/PlaylistManager.cpp       |   18 ++++++
 modules/demux/adaptative/PlaylistManager.h         |    1 +
 modules/demux/adaptative/SegmentTracker.cpp        |   13 +---
 modules/demux/adaptative/SegmentTracker.hpp        |    3 +-
 modules/demux/adaptative/Streams.cpp               |    9 +--
 modules/demux/adaptative/Streams.hpp               |    3 +-
 .../demux/adaptative/playlist/AbstractPlaylist.cpp |   12 +---
 .../demux/adaptative/playlist/AbstractPlaylist.hpp |    3 +-
 .../adaptative/playlist/BaseRepresentation.cpp     |    7 +++
 .../demux/adaptative/playlist/BaseRepresentation.h |    1 +
 .../adaptative/playlist/SegmentInformation.cpp     |   62 ++++++--------------
 .../adaptative/playlist/SegmentInformation.hpp     |    2 +-
 modules/demux/adaptative/playlist/SegmentList.cpp  |    8 +++
 modules/demux/adaptative/playlist/SegmentList.h    |    1 +
 .../demux/adaptative/playlist/SegmentTemplate.cpp  |    6 ++
 .../demux/adaptative/playlist/SegmentTemplate.h    |    1 +
 .../demux/adaptative/playlist/SegmentTimeline.cpp  |    7 +++
 .../demux/adaptative/playlist/SegmentTimeline.h    |    1 +
 modules/demux/dash/DASHManager.cpp                 |    2 +-
 modules/demux/hls/playlist/Representation.cpp      |    7 ---
 modules/demux/hls/playlist/Representation.hpp      |    1 -
 modules/demux/smooth/SmoothManager.cpp             |    9 +--
 22 files changed, 84 insertions(+), 93 deletions(-)

Diff:   http://git.videolan.org/gitweb.cgi/vlc.git/?a=commitdiff;h=414de08eda3f2e4c99aecd5eb948b24dc7b0b392