vlc | branch: master | Steve Lhomme <[email protected]> | Sat May 5 14:51:19 2018 +0200| [7ad1327a8c6ce94e26bc6e425c91015152f65e9d] | committer: Rémi Denis-Courmont
use mtime_t for DEMUX_SET_NEXT_DEMUX_TIME Signed-off-by: Rémi Denis-Courmont <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7ad1327a8c6ce94e26bc6e425c91015152f65e9d --- include/vlc_demux.h | 2 +- modules/access/imem.c | 2 +- modules/access/oss.c | 4 ++-- modules/access/timecode.c | 2 +- modules/demux/image.c | 2 +- modules/demux/stl.c | 2 +- modules/demux/subtitle.c | 4 ++-- modules/demux/ttml.c | 3 +-- modules/demux/vobsub.c | 10 +++++----- modules/demux/webvtt.c | 2 +- 10 files changed, 16 insertions(+), 17 deletions(-) diff --git a/include/vlc_demux.h b/include/vlc_demux.h index 570234fe78..3888ac57ce 100644 --- a/include/vlc_demux.h +++ b/include/vlc_demux.h @@ -203,7 +203,7 @@ enum demux_query_e * XXX: not mandatory (except for subtitle demux) but will help a lot * for multi-input */ - DEMUX_SET_NEXT_DEMUX_TIME, /* arg1= int64_t can fail */ + DEMUX_SET_NEXT_DEMUX_TIME, /* arg1= mtime_t can fail */ /* FPS for correct subtitles handling */ DEMUX_GET_FPS, /* arg1= double * res=can fail */ diff --git a/modules/access/imem.c b/modules/access/imem.c index 8a1a584271..552ecb6773 100644 --- a/modules/access/imem.c +++ b/modules/access/imem.c @@ -549,7 +549,7 @@ static int ControlDemux(demux_t *demux, int i_query, va_list args) return VLC_SUCCESS; } case DEMUX_SET_NEXT_DEMUX_TIME: - sys->deadline = va_arg(args, int64_t); + sys->deadline = va_arg(args, mtime_t); return VLC_SUCCESS; /* */ diff --git a/modules/access/oss.c b/modules/access/oss.c index bc9fab0d43..0551a67b38 100644 --- a/modules/access/oss.c +++ b/modules/access/oss.c @@ -121,7 +121,7 @@ typedef struct block_t *p_block; es_out_id_t *p_es; - int64_t i_next_demux_date; /* Used to handle oss:// as input-slave properly */ + mtime_t i_next_demux_date; /* Used to handle oss:// as input-slave properly */ } demux_sys_t; static int FindMainDevice( demux_t *p_demux ) @@ -228,7 +228,7 @@ static int DemuxControl( demux_t *p_demux, int i_query, va_list args ) return VLC_SUCCESS; case DEMUX_SET_NEXT_DEMUX_TIME: - p_sys->i_next_demux_date = va_arg( args, int64_t ); + p_sys->i_next_demux_date = va_arg( args, mtime_t ); return VLC_SUCCESS; /* TODO implement others */ diff --git a/modules/access/timecode.c b/modules/access/timecode.c index a319b75d2c..adbd0f50e9 100644 --- a/modules/access/timecode.c +++ b/modules/access/timecode.c @@ -134,7 +134,7 @@ static int Control (demux_t *demux, int query, va_list args) case DEMUX_SET_NEXT_DEMUX_TIME: { - const mtime_t pts = va_arg (args, int64_t ); + const mtime_t pts = va_arg (args, mtime_t ); if (sys->next_time == VLC_TS_INVALID) /* first invocation? */ { diff --git a/modules/demux/image.c b/modules/demux/image.c index 6c9bbb7f4a..b2befd1a31 100644 --- a/modules/demux/image.c +++ b/modules/demux/image.c @@ -267,7 +267,7 @@ static int Control(demux_t *demux, int query, va_list args) return VLC_SUCCESS; } case DEMUX_SET_NEXT_DEMUX_TIME: { - int64_t pts_next = VLC_TS_0 + va_arg(args, int64_t); + mtime_t pts_next = VLC_TS_0 + va_arg(args, mtime_t); if (sys->pts_next == VLC_TS_INVALID) sys->pts_origin = pts_next; sys->pts_next = pts_next; diff --git a/modules/demux/stl.c b/modules/demux/stl.c index 463dc73436..6d46bd38fc 100644 --- a/modules/demux/stl.c +++ b/modules/demux/stl.c @@ -115,7 +115,7 @@ static int Control(demux_t *demux, int query, va_list args) } case DEMUX_SET_NEXT_DEMUX_TIME: { sys->b_slave = true; - sys->next_date = va_arg(args, int64_t); + sys->next_date = va_arg(args, mtime_t); return VLC_SUCCESS; } case DEMUX_SET_TIME: { diff --git a/modules/demux/subtitle.c b/modules/demux/subtitle.c index 90b2c57eff..ff206a981e 100644 --- a/modules/demux/subtitle.c +++ b/modules/demux/subtitle.c @@ -172,7 +172,7 @@ typedef struct bool b_slave; bool b_first_time; - int64_t i_next_demux_date; + mtime_t i_next_demux_date; struct { @@ -822,7 +822,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) case DEMUX_SET_NEXT_DEMUX_TIME: p_sys->b_slave = true; - p_sys->i_next_demux_date = va_arg( args, int64_t ) - VLC_TS_0; + p_sys->i_next_demux_date = va_arg( args, mtime_t ) - VLC_TS_0; return VLC_SUCCESS; case DEMUX_CAN_PAUSE: diff --git a/modules/demux/ttml.c b/modules/demux/ttml.c index 76a38a02cc..b04936342e 100644 --- a/modules/demux/ttml.c +++ b/modules/demux/ttml.c @@ -233,8 +233,7 @@ static int Control( demux_t* p_demux, int i_query, va_list args ) } break; case DEMUX_SET_NEXT_DEMUX_TIME: - i64 = va_arg( args, int64_t ); - p_sys->i_next_demux_time = i64; + p_sys->i_next_demux_time = va_arg( args, mtime_t ); p_sys->b_slave = true; return VLC_SUCCESS; case DEMUX_GET_LENGTH: diff --git a/modules/demux/vobsub.c b/modules/demux/vobsub.c index 22d1ae2fb8..75034014b5 100644 --- a/modules/demux/vobsub.c +++ b/modules/demux/vobsub.c @@ -71,7 +71,7 @@ typedef struct typedef struct { - int64_t i_start; + mtime_t i_start; int i_vobsub_location; } subtitle_t; @@ -89,8 +89,8 @@ typedef struct typedef struct { - int64_t i_next_demux_date; - int64_t i_length; + mtime_t i_next_demux_date; + mtime_t i_length; text_t txt; stream_t *p_vobsub_stream; @@ -327,7 +327,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) return VLC_SUCCESS; case DEMUX_SET_NEXT_DEMUX_TIME: - p_sys->i_next_demux_date = va_arg( args, int64_t ); + p_sys->i_next_demux_date = va_arg( args, mtime_t ); return VLC_SUCCESS; case DEMUX_CAN_PAUSE: @@ -356,7 +356,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) static int Demux( demux_t *p_demux ) { demux_sys_t *p_sys = p_demux->p_sys; - int64_t i_maxdate; + mtime_t i_maxdate; int i_read; for( int i = 0; i < p_sys->i_tracks; i++ ) diff --git a/modules/demux/webvtt.c b/modules/demux/webvtt.c index 4dcdec2e4f..c11a060640 100644 --- a/modules/demux/webvtt.c +++ b/modules/demux/webvtt.c @@ -483,7 +483,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) case DEMUX_SET_NEXT_DEMUX_TIME: p_sys->b_slave = true; - p_sys->i_next_demux_time = va_arg( args, int64_t ) - VLC_TS_0; + p_sys->i_next_demux_time = va_arg( args, mtime_t ) - VLC_TS_0; return VLC_SUCCESS; case DEMUX_CAN_PAUSE: _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
