demux: dash: track segment/periods outside of adaptation logic

Multimedia / VLC - Francois Cartegnie [free.fr] - 30 December 2014 09:21 UTC

Allows switching logic, and fixes startSegment handling.

4e6acd5 demux: dash: track segment/periods outside of adaptation logic
modules/demux/Makefile.am | 3 +-
modules/demux/dash/DASHManager.cpp | 25 ++++-
modules/demux/dash/DASHManager.h | 6 +-
modules/demux/dash/SegmentTracker.cpp | 99 ++++++++++++++++++++
modules/demux/dash/SegmentTracker.hpp | 70 ++++++++++++++
modules/demux/dash/Streams.cpp | 12 ++-
modules/demux/dash/Streams.hpp | 9 +-
.../adaptationlogic/AbstractAdaptationLogic.cpp | 64 +------------
.../dash/adaptationlogic/AbstractAdaptationLogic.h | 34 ++++---
.../adaptationlogic/AdaptationLogicFactory.cpp | 20 ++--
.../dash/adaptationlogic/AdaptationLogicFactory.h | 10 +-
.../adaptationlogic/AlwaysBestAdaptationLogic.cpp | 4 +-
.../adaptationlogic/AlwaysBestAdaptationLogic.h | 2 +-
.../AlwaysLowestAdaptationLogic.cpp | 4 +-
.../AlwaysLowestAdaptationLogic.hpp | 2 +-
.../demux/dash/adaptationlogic/IAdaptationLogic.h | 57 -----------
.../dash/adaptationlogic/IDownloadRateObserver.h | 6 +-
.../adaptationlogic/RateBasedAdaptationLogic.cpp | 17 ++--
.../adaptationlogic/RateBasedAdaptationLogic.h | 4 +-
modules/demux/dash/dash.cpp | 12 +--
modules/demux/dash/mpd/SegmentInformation.cpp | 62 +++++++++---
modules/demux/dash/mpd/SegmentInformation.hpp | 2 +
modules/demux/dash/mpd/Url.cpp | 3 +-
23 files changed, 332 insertions(+), 195 deletions(-)

Upstream: git.videolan.org

  • Share