[vlc-commits] demux:mkv: find chapter timestamps are in vlc_tick_t
Steve Lhomme
git at videolan.org
Tue Sep 18 13:53:05 CEST 2018
vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Fri Jun 8 09:27:30 2018 +0200| [a5a45b99a39ae67210b342b693b5cf39f84be87e] | committer: Steve Lhomme
demux:mkv: find chapter timestamps are in vlc_tick_t
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a5a45b99a39ae67210b342b693b5cf39f84be87e
---
modules/demux/mkv/virtual_segment.cpp | 6 +++---
modules/demux/mkv/virtual_segment.hpp | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/modules/demux/mkv/virtual_segment.cpp b/modules/demux/mkv/virtual_segment.cpp
index 82c5978e43..ce68147b80 100644
--- a/modules/demux/mkv/virtual_segment.cpp
+++ b/modules/demux/mkv/virtual_segment.cpp
@@ -379,13 +379,13 @@ virtual_chapter_c * virtual_chapter_c::BrowseCodecPrivate( unsigned int codec_id
return NULL;
}
-bool virtual_chapter_c::ContainsTimestamp( int64_t time )
+bool virtual_chapter_c::ContainsTimestamp( vlc_tick_t time )
{
/*with the current implementation only the last chapter can have a negative virtual_stop_time*/
return ( time >= i_mk_virtual_start_time && time < i_mk_virtual_stop_time );
}
-virtual_chapter_c* virtual_chapter_c::getSubChapterbyTimecode( int64_t time )
+virtual_chapter_c* virtual_chapter_c::getSubChapterbyTimecode( vlc_tick_t time )
{
for( size_t i = 0; i < sub_vchapters.size(); i++ )
{
@@ -396,7 +396,7 @@ virtual_chapter_c* virtual_chapter_c::getSubChapterbyTimecode( int64_t time )
return this;
}
-virtual_chapter_c* virtual_edition_c::getChapterbyTimecode( int64_t time )
+virtual_chapter_c* virtual_edition_c::getChapterbyTimecode( vlc_tick_t time )
{
for( size_t i = 0; i < vchapters.size(); i++ )
{
diff --git a/modules/demux/mkv/virtual_segment.hpp b/modules/demux/mkv/virtual_segment.hpp
index e5ac74977a..5c14840463 100644
--- a/modules/demux/mkv/virtual_segment.hpp
+++ b/modules/demux/mkv/virtual_segment.hpp
@@ -50,7 +50,7 @@ public:
std::vector<matroska_segment_c*> & segments,
vlc_tick_t & usertime_offset, bool b_ordered );
- virtual_chapter_c* getSubChapterbyTimecode( int64_t time );
+ virtual_chapter_c* getSubChapterbyTimecode( vlc_tick_t time );
bool Leave( );
bool EnterAndLeave( virtual_chapter_c *p_leaving_vchapter, bool b_enter = true );
virtual_chapter_c * FindChapter( int64_t i_find_uid );
@@ -90,7 +90,7 @@ public:
~virtual_edition_c();
std::vector<virtual_chapter_c*> vchapters;
- virtual_chapter_c* getChapterbyTimecode( int64_t time );
+ virtual_chapter_c* getChapterbyTimecode( vlc_tick_t time );
std::string GetMainName();
int PublishChapters( input_title_t & title, int & i_user_chapters, int i_level );
virtual_chapter_c * BrowseCodecPrivate( unsigned int codec_id,
More information about the vlc-commits
mailing list