vlc | branch: master | Steve Lhomme <[email protected]> | Thu Jun 7 16:39:52 2018 +0200| [40eadf4c1e8832de8ec39c67c8c7884ea685ce0e] | committer: Steve Lhomme
demux:mkv: virtual chapter timestamps are in vlc_tick_t > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=40eadf4c1e8832de8ec39c67c8c7884ea685ce0e --- modules/demux/mkv/virtual_segment.cpp | 12 ++++++------ modules/demux/mkv/virtual_segment.hpp | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/demux/mkv/virtual_segment.cpp b/modules/demux/mkv/virtual_segment.cpp index 080248d933..82c5978e43 100644 --- a/modules/demux/mkv/virtual_segment.cpp +++ b/modules/demux/mkv/virtual_segment.cpp @@ -44,7 +44,7 @@ matroska_segment_c * getSegmentbyUID( KaxSegmentUID * p_uid, std::vector<matrosk virtual_chapter_c * virtual_chapter_c::CreateVirtualChapter( chapter_item_c * p_chap, matroska_segment_c & main_segment, std::vector<matroska_segment_c*> & segments, - int64_t & usertime_offset, bool b_ordered) + vlc_tick_t & usertime_offset, bool b_ordered) { std::vector<virtual_chapter_c *> sub_chapters; if( !p_chap ) @@ -65,8 +65,8 @@ virtual_chapter_c * virtual_chapter_c::CreateVirtualChapter( chapter_item_c * p_ p_segment->Preload(); - int64_t start = ( b_ordered )? usertime_offset : p_chap->i_start_time; - int64_t tmp = usertime_offset; + vlc_tick_t start = ( b_ordered )? usertime_offset : p_chap->i_start_time; + vlc_tick_t tmp = usertime_offset; for( size_t i = 0; i < p_chap->sub_chapters.size(); i++ ) { @@ -75,7 +75,7 @@ virtual_chapter_c * virtual_chapter_c::CreateVirtualChapter( chapter_item_c * p_ if( p_vsubchap ) sub_chapters.push_back( p_vsubchap ); } - int64_t stop = ( b_ordered )? + vlc_tick_t stop = ( b_ordered )? (((p_chap->i_end_time == -1 || (p_chap->i_end_time - p_chap->i_start_time) < (tmp - usertime_offset) )) ? tmp : p_chap->i_end_time - p_chap->i_start_time + usertime_offset ) @@ -114,7 +114,7 @@ virtual_edition_c::virtual_edition_c( chapter_edition_c * p_edit, matroska_segme p_edition = p_edit; b_ordered = false; - int64_t usertime_offset = 0; // microseconds + vlc_tick_t usertime_offset = 0; // microseconds /* ordered chapters */ if( p_edition && p_edition->b_ordered ) @@ -137,7 +137,7 @@ virtual_edition_c::virtual_edition_c( chapter_edition_c * p_edit, matroska_segme { matroska_segment_c * p_cur = &main_segment; virtual_chapter_c * p_vchap = NULL; - int64_t tmp = 0; + vlc_tick_t tmp = 0; /* check for prev linked segments */ /* FIXME to avoid infinite recursion we limit to 10 prev should be better as parameter */ diff --git a/modules/demux/mkv/virtual_segment.hpp b/modules/demux/mkv/virtual_segment.hpp index 45086bcd65..4c420ef623 100644 --- a/modules/demux/mkv/virtual_segment.hpp +++ b/modules/demux/mkv/virtual_segment.hpp @@ -38,7 +38,7 @@ namespace mkv { class virtual_chapter_c { public: - virtual_chapter_c( matroska_segment_c &seg, chapter_item_c *p_chap, int64_t start, int64_t stop, std::vector<virtual_chapter_c *> & sub_chaps ): + virtual_chapter_c( matroska_segment_c &seg, chapter_item_c *p_chap, vlc_tick_t start, vlc_tick_t stop, std::vector<virtual_chapter_c *> & sub_chaps ): segment(seg), p_chapter(p_chap), i_mk_virtual_start_time(start), i_mk_virtual_stop_time(stop), sub_vchapters(sub_chaps) @@ -48,7 +48,7 @@ public: static virtual_chapter_c * CreateVirtualChapter( chapter_item_c * p_chap, matroska_segment_c & main_segment, std::vector<matroska_segment_c*> & segments, - int64_t & usertime_offset, bool b_ordered ); + vlc_tick_t & usertime_offset, bool b_ordered ); virtual_chapter_c* getSubChapterbyTimecode( int64_t time ); bool Leave( ); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
