[vlc-commits] demux: dash: split dash and adaptative specific code

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Fri Apr 24 14:30:29 2015 +0200| [5ada7fd60f216b3f34b8239183a00ddb48ad67b7] | committer: Francois Cartegnie

demux: dash: split dash and adaptative specific code

also fixes includes, forward declarations

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

 modules/demux/Makefile.am                          |  118 ++++++-----
 modules/demux/adaptative/PlaylistManager.cpp       |  224 ++++++++++++++++++++
 modules/demux/adaptative/PlaylistManager.h         |   74 +++++++
 .../demux/{dash => adaptative}/SegmentTracker.cpp  |   25 +--
 .../demux/{dash => adaptative}/SegmentTracker.hpp  |   35 +--
 modules/demux/{dash => adaptative}/Streams.cpp     |   21 +-
 modules/demux/{dash => adaptative}/Streams.hpp     |   27 ++-
 modules/demux/{dash => adaptative}/StreamsType.hpp |    2 +-
 modules/demux/{dash => adaptative}/http/Chunk.cpp  |    5 +-
 modules/demux/{dash => adaptative}/http/Chunk.h    |   13 +-
 .../{dash => adaptative}/http/HTTPConnection.cpp   |    2 +-
 .../{dash => adaptative}/http/HTTPConnection.h     |    6 +-
 .../http/HTTPConnectionManager.cpp                 |    7 +-
 .../http/HTTPConnectionManager.h                   |    9 +-
 .../{dash => adaptative}/http/IHTTPConnection.cpp  |    5 +-
 .../{dash => adaptative}/http/IHTTPConnection.h    |    2 +-
 .../http/PersistentConnection.cpp                  |    2 +-
 .../http/PersistentConnection.h                    |    2 +-
 .../logic}/AbstractAdaptationLogic.cpp             |    6 +-
 .../logic}/AbstractAdaptationLogic.h               |   24 +--
 .../logic}/AlwaysBestAdaptationLogic.cpp           |   10 +-
 .../logic}/AlwaysBestAdaptationLogic.h             |    8 +-
 .../logic}/AlwaysLowestAdaptationLogic.cpp         |   10 +-
 .../logic}/AlwaysLowestAdaptationLogic.hpp         |    6 +-
 .../logic}/IDownloadRateObserver.h                 |    2 +-
 .../logic}/RateBasedAdaptationLogic.cpp            |   30 ++-
 .../logic}/RateBasedAdaptationLogic.h              |   13 +-
 .../logic}/Representationselectors.cpp             |   37 ++--
 .../logic}/Representationselectors.hpp             |   22 +-
 .../demux/adaptative/playlist/AbstractPlaylist.cpp |  156 ++++++++++++++
 .../demux/adaptative/playlist/AbstractPlaylist.hpp |   76 +++++++
 .../adaptative/playlist/BaseAdaptationSet.cpp      |  100 +++++++++
 .../demux/adaptative/playlist/BaseAdaptationSet.h  |   63 ++++++
 modules/demux/adaptative/playlist/BasePeriod.cpp   |  116 ++++++++++
 modules/demux/adaptative/playlist/BasePeriod.h     |   64 ++++++
 .../adaptative/playlist/BaseRepresentation.cpp     |   97 +++++++++
 .../demux/adaptative/playlist/BaseRepresentation.h |   77 +++++++
 .../{dash/mpd => adaptative/playlist}/BaseUrl.h    |    4 +-
 .../playlist/CommonAttributesElements.cpp          |   86 ++++++++
 .../adaptative/playlist/CommonAttributesElements.h |   57 +++++
 .../mpd => adaptative/playlist}/ICanonicalUrl.hpp  |    4 +-
 .../{dash/mpd => adaptative/playlist}/Segment.cpp  |   62 ++----
 .../{dash/mpd => adaptative/playlist}/Segment.h    |   44 ++--
 .../mpd => adaptative/playlist}/SegmentBase.cpp    |    6 +-
 .../mpd => adaptative/playlist}/SegmentBase.h      |    8 +-
 .../playlist}/SegmentInfoCommon.cpp                |    2 +-
 .../playlist}/SegmentInfoCommon.h                  |    8 +-
 .../playlist}/SegmentInformation.cpp               |    6 +-
 .../playlist}/SegmentInformation.hpp               |   25 +--
 .../mpd => adaptative/playlist}/SegmentList.cpp    |    6 +-
 .../mpd => adaptative/playlist}/SegmentList.h      |   11 +-
 .../playlist}/SegmentTemplate.cpp                  |    5 +-
 .../mpd => adaptative/playlist}/SegmentTemplate.h  |    9 +-
 .../playlist}/SegmentTimeline.cpp                  |    6 +-
 .../mpd => adaptative/playlist}/SegmentTimeline.h  |    8 +-
 modules/demux/adaptative/playlist/Url.cpp          |   89 ++++++++
 .../{dash/mpd => adaptative/playlist}/Url.hpp      |   11 +-
 .../demux/{dash => adaptative/tools}/Helper.cpp    |    2 +-
 modules/demux/{dash => adaptative/tools}/Helper.h  |    2 +-
 .../{dash => adaptative/tools}/Properties.hpp      |   32 ++-
 modules/demux/dash/DASHManager.cpp                 |  200 ++++-------------
 modules/demux/dash/DASHManager.h                   |   30 +--
 .../adaptationlogic/AdaptationLogicFactory.cpp     |   55 -----
 modules/demux/dash/dash.cpp                        |   32 +--
 modules/demux/dash/mp4/AtomsReader.cpp             |    2 +-
 modules/demux/dash/mp4/AtomsReader.hpp             |   12 +-
 modules/demux/dash/mpd/AdaptationSet.cpp           |   85 ++------
 modules/demux/dash/mpd/AdaptationSet.h             |   20 +-
 ...ements.cpp => DASHCommonAttributesElements.cpp} |   89 ++------
 ...esElements.h => DASHCommonAttributesElements.h} |   24 +--
 modules/demux/dash/mpd/DASHSegment.cpp             |   59 ++++++
 .../AdaptationLogicFactory.h => mpd/DASHSegment.h} |   28 +--
 modules/demux/dash/mpd/IMPDParser.cpp              |    1 +
 modules/demux/dash/mpd/IMPDParser.h                |    3 +
 modules/demux/dash/mpd/IsoffMainParser.cpp         |   17 +-
 modules/demux/dash/mpd/IsoffMainParser.h           |   28 ++-
 modules/demux/dash/mpd/MPD.cpp                     |  124 +----------
 modules/demux/dash/mpd/MPD.h                       |   46 +---
 modules/demux/dash/mpd/Period.cpp                  |   80 +------
 modules/demux/dash/mpd/Period.h                    |   30 +--
 modules/demux/dash/mpd/Representation.cpp          |  179 ++++++++++------
 modules/demux/dash/mpd/Representation.h            |   53 ++---
 modules/demux/dash/mpd/TrickModeType.h             |    3 -
 modules/demux/dash/mpd/Url.cpp                     |  197 -----------------
 modules/demux/dash/xml/DOMParser.cpp               |    4 +-
 modules/demux/dash/xml/Node.h                      |    1 -
 86 files changed, 2004 insertions(+), 1387 deletions(-)

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