vlc | branch: master | Francois Cartegnie <[email protected]> | Sun Aug 30 13:55:49 2015 +0200| [673cd4dbc006facf580daf5feb99ac9dd29ecc4c] | committer: Francois Cartegnie
demux: adaptative: fix time units and update times Since we're dealing with 3 different units (time, mtime and scaled time) things have gone wrong when merging hls and dash code. Should fix the crazy manifest/playlist updates > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=673cd4dbc006facf580daf5feb99ac9dd29ecc4c --- modules/demux/Makefile.am | 1 + modules/demux/adaptative/PlaylistManager.h | 2 +- modules/demux/adaptative/Time.hpp | 27 +++++++++++++++++++ .../demux/adaptative/playlist/AbstractPlaylist.cpp | 2 +- .../demux/adaptative/playlist/AbstractPlaylist.hpp | 6 ++--- modules/demux/adaptative/playlist/Segment.cpp | 2 +- modules/demux/adaptative/playlist/Segment.h | 5 ++-- .../adaptative/playlist/SegmentInfoCommon.cpp | 4 +-- .../demux/adaptative/playlist/SegmentInfoCommon.h | 6 ++--- .../adaptative/playlist/SegmentInformation.cpp | 15 ++++++----- modules/demux/adaptative/playlist/SegmentList.cpp | 10 +++---- modules/demux/adaptative/playlist/SegmentList.h | 2 +- .../demux/adaptative/playlist/SegmentTimeline.cpp | 22 +++++++-------- .../demux/adaptative/playlist/SegmentTimeline.h | 12 ++++----- modules/demux/dash/DASHManager.cpp | 25 ++++++++--------- modules/demux/dash/mpd/IsoffMainParser.cpp | 28 ++++++++++---------- modules/demux/dash/mpd/IsoffMainParser.h | 8 +++--- modules/demux/dash/mpd/Representation.cpp | 12 ++++----- modules/demux/hls/HLSManager.cpp | 20 +++++++------- modules/demux/hls/playlist/M3U8.cpp | 2 +- modules/demux/hls/playlist/Parser.cpp | 8 +++--- 21 files changed, 126 insertions(+), 93 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc.git/?a=commitdiff;h=673cd4dbc006facf580daf5feb99ac9dd29ecc4c _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
