vlc | branch: master | Steve Lhomme <rob...@ycbcr.xyz> | Fri Jul 6 10:28:54 2018 +0200| [26fef56c52e12142735b980e0e8f49e15debd307] | committer: Steve Lhomme
core: make DEMUX/STREAM_GET_PTS_DELAY officially a vlc_tick_t > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=26fef56c52e12142735b980e0e8f49e15debd307 --- include/vlc_demux.h | 2 +- include/vlc_stream.h | 2 +- modules/access/alsa.c | 2 +- modules/access/attachment.c | 2 +- modules/access/avcapture.m | 4 ++-- modules/access/avio.c | 8 ++++---- modules/access/bluray.c | 5 ++--- modules/access/cdda.c | 2 +- modules/access/concat.c | 6 +++--- modules/access/dc1394.c | 2 +- modules/access/dcp/dcp.cpp | 3 +-- modules/access/decklink.cpp | 4 ++-- modules/access/dshow/dshow.cpp | 7 ++----- modules/access/dsm/access.c | 2 +- modules/access/dtv/access.c | 4 ++-- modules/access/dv.c | 2 +- modules/access/dvb/access.c | 3 +-- modules/access/dvdnav.c | 2 +- modules/access/dvdread.c | 3 +-- modules/access/file.c | 4 ++-- modules/access/ftp.c | 6 ++---- modules/access/http.c | 6 ++---- modules/access/http/access.c | 4 ++-- modules/access/idummy.c | 3 +-- modules/access/imem-access.c | 2 +- modules/access/imem.c | 10 ++++------ modules/access/jack.c | 4 ++-- modules/access/linsys/linsys_hdsdi.c | 5 ++--- modules/access/linsys/linsys_sdi.c | 5 ++--- modules/access/live555.cpp | 5 ++--- modules/access/mms/mmsh.c | 6 ++---- modules/access/mms/mmstu.c | 6 ++---- modules/access/mtp.c | 6 ++---- modules/access/nfs.c | 2 +- modules/access/oss.c | 5 ++--- modules/access/pulse.c | 2 +- modules/access/qtsound.m | 5 ++--- modules/access/rdp.c | 5 ++--- modules/access/rtp/rtp.c | 4 ++-- modules/access/rtsp/access.c | 2 +- modules/access/samba.c | 2 +- modules/access/satip.c | 5 ++--- modules/access/screen/screen.c | 5 ++--- modules/access/screen/wayland.c | 2 +- modules/access/screen/xcb.c | 4 ++-- modules/access/sdp.c | 5 +---- modules/access/sftp.c | 6 ++---- modules/access/shm.c | 4 ++-- modules/access/srt.c | 2 +- modules/access/tcp.c | 6 ++---- modules/access/timecode.c | 4 ++-- modules/access/udp.c | 6 ++---- modules/access/unc.c | 2 +- modules/access/v4l2/access.c | 2 +- modules/access/v4l2/demux.c | 2 +- modules/access/v4l2/radio.c | 2 +- modules/access/vcd/vcd.c | 2 +- modules/access/vdr.c | 6 ++---- modules/access/vnc.c | 5 ++--- modules/access/wasapi.c | 2 +- modules/demux/adaptive/PlaylistManager.cpp | 2 +- modules/demux/adaptive/plumbing/SourceStream.cpp | 2 +- modules/demux/aiff.c | 3 +-- modules/demux/mp4/mp4.c | 2 +- modules/stream_filter/decomp.c | 4 ++-- modules/stream_filter/hds/hds.c | 2 +- modules/stream_filter/prefetch.c | 4 ++-- src/input/access.c | 2 +- src/input/stream_fifo.c | 2 +- src/input/stream_memory.c | 2 +- test/src/input/stream_fifo.c | 2 +- 71 files changed, 111 insertions(+), 152 deletions(-) diff --git a/include/vlc_demux.h b/include/vlc_demux.h index 3c4a4551b1..26328c7268 100644 --- a/include/vlc_demux.h +++ b/include/vlc_demux.h @@ -105,7 +105,7 @@ enum demux_query_e * Can fail only if synchronous and <b>not</b> an access-demuxer. The * underlying input stream then determines the PTS delay. * - * arg1= int64_t * */ + * arg1= vlc_tick_t * */ DEMUX_GET_PTS_DELAY = 0x101, /** Retrieves stream meta-data. diff --git a/include/vlc_stream.h b/include/vlc_stream.h index b66f15966c..ff894280a0 100644 --- a/include/vlc_stream.h +++ b/include/vlc_stream.h @@ -163,7 +163,7 @@ enum stream_query_e STREAM_GET_SIZE=6, /**< arg1= uint64_t * res=can fail */ /* */ - STREAM_GET_PTS_DELAY = 0x101,/**< arg1= int64_t* res=cannot fail */ + STREAM_GET_PTS_DELAY = 0x101,/**< arg1= vlc_tick_t* res=cannot fail */ STREAM_GET_TITLE_INFO, /**< arg1=input_title_t*** arg2=int* res=can fail */ STREAM_GET_TITLE, /**< arg1=unsigned * res=can fail */ STREAM_GET_SEEKPOINT, /**< arg1=unsigned * res=can fail */ diff --git a/modules/access/alsa.c b/modules/access/alsa.c index 52b331ae46..c54fd57aed 100644 --- a/modules/access/alsa.c +++ b/modules/access/alsa.c @@ -246,7 +246,7 @@ static int Control (demux_t *demux, int query, va_list ap) break; case DEMUX_GET_PTS_DELAY: - *va_arg (ap, int64_t *) = sys->caching; + *va_arg (ap, vlc_tick_t *) = sys->caching; break; //case DEMUX_SET_NEXT_DEMUX_TIME: still needed? diff --git a/modules/access/attachment.c b/modules/access/attachment.c index 06791b2db8..cb63bb3aa5 100644 --- a/modules/access/attachment.c +++ b/modules/access/attachment.c @@ -152,7 +152,7 @@ static int Control(stream_t *access, int query, va_list args) *va_arg(args, uint64_t *) = sys->attachment->i_data; break; case STREAM_GET_PTS_DELAY: - *va_arg(args, int64_t *) = DEFAULT_PTS_DELAY; + *va_arg(args, vlc_tick_t *) = DEFAULT_PTS_DELAY; break; case STREAM_SET_PAUSE_STATE: return VLC_SUCCESS; diff --git a/modules/access/avcapture.m b/modules/access/avcapture.m index 034a2a56be..8e070b7c07 100644 --- a/modules/access/avcapture.m +++ b/modules/access/avcapture.m @@ -450,8 +450,8 @@ static int Control(demux_t *p_demux, int i_query, va_list args) return VLC_SUCCESS; case DEMUX_GET_PTS_DELAY: - pi64 = va_arg(args, int64_t *); - *pi64 = VLC_TICK_FROM_MS(var_InheritInteger(p_demux, "live-caching")); + *va_arg(args, vlc_tick_t *) = + VLC_TICK_FROM_MS(var_InheritInteger(p_demux, "live-caching")); return VLC_SUCCESS; case DEMUX_GET_TIME: diff --git a/modules/access/avio.c b/modules/access/avio.c index c43aeb20d6..c6d212716f 100644 --- a/modules/access/avio.c +++ b/modules/access/avio.c @@ -332,11 +332,11 @@ static int Control(stream_t *access, int query, va_list args) return VLC_EGENERIC; *va_arg(args, uint64_t *) = sys->size; return VLC_SUCCESS; - case STREAM_GET_PTS_DELAY: { - int64_t *delay = va_arg(args, int64_t *); - *delay = VLC_TICK_FROM_MS(var_InheritInteger(access, "network-caching")); + case STREAM_GET_PTS_DELAY: + *va_arg(args, vlc_tick_t *) = + VLC_TICK_FROM_MS(var_InheritInteger(access, "network-caching")); return VLC_SUCCESS; - } + case STREAM_SET_PAUSE_STATE: { bool is_paused = va_arg(args, int); if (avio_pause(sys->context, is_paused)< 0) diff --git a/modules/access/bluray.c b/modules/access/bluray.c index e8fc3a451a..5639963e6d 100644 --- a/modules/access/bluray.c +++ b/modules/access/bluray.c @@ -1820,7 +1820,6 @@ static int blurayControl(demux_t *p_demux, int query, va_list args) { demux_sys_t *p_sys = p_demux->p_sys; bool *pb_bool; - int64_t *pi_64; switch (query) { case DEMUX_CAN_SEEK: @@ -1831,8 +1830,8 @@ static int blurayControl(demux_t *p_demux, int query, va_list args) break; case DEMUX_GET_PTS_DELAY: - pi_64 = va_arg(args, int64_t *); - *pi_64 = VLC_TICK_FROM_MS(var_InheritInteger(p_demux, "disc-caching")); + *va_arg(args, vlc_tick_t *) = + VLC_TICK_FROM_MS(var_InheritInteger(p_demux, "disc-caching")); break; case DEMUX_SET_PAUSE_STATE: diff --git a/modules/access/cdda.c b/modules/access/cdda.c index f663c62bbb..5320de086a 100644 --- a/modules/access/cdda.c +++ b/modules/access/cdda.c @@ -180,7 +180,7 @@ static int DemuxControl(demux_t *demux, int query, va_list args) *va_arg(args, bool*) = true; break; case DEMUX_GET_PTS_DELAY: - *va_arg(args, int64_t *) = + *va_arg(args, vlc_tick_t *) = VLC_TICK_FROM_MS( var_InheritInteger(demux, "disc-caching") ); break; diff --git a/modules/access/concat.c b/modules/access/concat.c index d8a94c465d..f8b5c13b02 100644 --- a/modules/access/concat.c +++ b/modules/access/concat.c @@ -45,7 +45,7 @@ typedef struct bool can_pause; bool can_control_pace; uint64_t size; - int64_t caching; + vlc_tick_t caching; } access_sys_t; static stream_t *GetAccess(stream_t *access) @@ -167,7 +167,7 @@ static int Control(stream_t *access, int query, va_list args) *va_arg(args, uint64_t *) = sys->size; break; case STREAM_GET_PTS_DELAY: - *va_arg(args, int64_t *) = sys->caching; + *va_arg(args, vlc_tick_t *) = sys->caching; break; case STREAM_GET_SIGNAL: @@ -261,7 +261,7 @@ static int Open(vlc_object_t *obj) sys->size += size; } - int64_t caching; + vlc_tick_t caching; vlc_stream_Control(a, STREAM_GET_PTS_DELAY, &caching); if (caching > sys->caching) sys->caching = caching; diff --git a/modules/access/dc1394.c b/modules/access/dc1394.c index 9952fe9681..82c2debd31 100644 --- a/modules/access/dc1394.c +++ b/modules/access/dc1394.c @@ -498,7 +498,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) return VLC_SUCCESS; case DEMUX_GET_PTS_DELAY: - *va_arg( args, int64_t * ) = (int64_t)DEFAULT_PTS_DELAY; + *va_arg( args, vlc_tick_t * ) = DEFAULT_PTS_DELAY; return VLC_SUCCESS; case DEMUX_GET_TIME: diff --git a/modules/access/dcp/dcp.cpp b/modules/access/dcp/dcp.cpp index 7fdd3f3526..66614fab22 100644 --- a/modules/access/dcp/dcp.cpp +++ b/modules/access/dcp/dcp.cpp @@ -829,8 +829,7 @@ static int Control( demux_t *p_demux, int query, va_list args ) es_out_Control( p_demux->out, ES_OUT_SET_NEXT_DISPLAY_TIME, ( vlc_tick_t ) i64 ); break; case DEMUX_GET_PTS_DELAY: - pi64 = va_arg( args, int64_t * ); - *pi64 = + *va_arg( args, vlc_tick_t * ) = VLC_TICK_FROM_MS(var_InheritInteger( p_demux, "file-caching" )); return VLC_SUCCESS; diff --git a/modules/access/decklink.cpp b/modules/access/decklink.cpp index 4c71b8cbda..48497ef425 100644 --- a/modules/access/decklink.cpp +++ b/modules/access/decklink.cpp @@ -741,8 +741,8 @@ static int Control(demux_t *demux, int query, va_list args) return VLC_SUCCESS; case DEMUX_GET_PTS_DELAY: - pi64 = va_arg(args, int64_t *); - *pi64 = VLC_TICK_FROM_MS(var_InheritInteger(demux, "live-caching")); + *va_arg(args, vlc_tick_t *) = + VLC_TICK_FROM_MS(var_InheritInteger(demux, "live-caching")); return VLC_SUCCESS; case DEMUX_GET_TIME: diff --git a/modules/access/dshow/dshow.cpp b/modules/access/dshow/dshow.cpp index 41721e7bce..adbb6bf3a5 100644 --- a/modules/access/dshow/dshow.cpp +++ b/modules/access/dshow/dshow.cpp @@ -1918,7 +1918,6 @@ static int AccessControl( stream_t *p_access, int i_query, va_list args ) { access_sys_t *sys = (access_sys_t *)p_access->p_sys; bool *pb_bool; - int64_t *pi_64; switch( i_query ) { @@ -1931,8 +1930,7 @@ static int AccessControl( stream_t *p_access, int i_query, va_list args ) break; case STREAM_GET_PTS_DELAY: - pi_64 = va_arg( args, int64_t * ); - *pi_64 = + *va_arg( args, vlc_tick_t * ) = VLC_TICK_FROM_MS( var_InheritInteger( p_access, "live-caching" ) ); break; @@ -1980,8 +1978,7 @@ static int DemuxControl( demux_t *p_demux, int i_query, va_list args ) return VLC_SUCCESS; case DEMUX_GET_PTS_DELAY: - pi64 = va_arg( args, int64_t * ); - *pi64 = + *va_arg( args, vlc_tick_t * ) = VLC_TICK_FROM_MS( var_InheritInteger( p_demux, "live-caching" ) ); return VLC_SUCCESS; diff --git a/modules/access/dsm/access.c b/modules/access/dsm/access.c index 39682750e1..a7252350d0 100644 --- a/modules/access/dsm/access.c +++ b/modules/access/dsm/access.c @@ -491,7 +491,7 @@ static int Control( stream_t *p_access, int i_query, va_list args ) break; } case STREAM_GET_PTS_DELAY: - *va_arg( args, int64_t * ) = VLC_TICK_FROM_MS( + *va_arg( args, vlc_tick_t * ) = VLC_TICK_FROM_MS( var_InheritInteger( p_access, "network-caching" ) ); break; diff --git a/modules/access/dtv/access.c b/modules/access/dtv/access.c index c050c35c9e..5c341420ae 100644 --- a/modules/access/dtv/access.c +++ b/modules/access/dtv/access.c @@ -540,8 +540,8 @@ static int Control (stream_t *access, int query, va_list args) case STREAM_GET_PTS_DELAY: { - int64_t *v = va_arg (args, int64_t *); - *v = VLC_TICK_FROM_MS( var_InheritInteger (access, "live-caching") ); + *va_arg (args, vlc_tick_t *) = + VLC_TICK_FROM_MS( var_InheritInteger (access, "live-caching") ); break; } diff --git a/modules/access/dv.c b/modules/access/dv.c index ddc52e6a20..e8a3ac7fd8 100644 --- a/modules/access/dv.c +++ b/modules/access/dv.c @@ -282,7 +282,7 @@ static int Control( stream_t *p_access, int i_query, va_list args ) break; case STREAM_GET_PTS_DELAY: - *va_arg( args, int64_t * ) = + *va_arg( args, vlc_tick_t * ) = VLC_TICK_FROM_MS( var_InheritInteger( p_access, "live-caching" ) ); break; diff --git a/modules/access/dvb/access.c b/modules/access/dvb/access.c index 80d8e072b6..683e14d7d5 100644 --- a/modules/access/dvb/access.c +++ b/modules/access/dvb/access.c @@ -404,8 +404,7 @@ static int Control( stream_t *p_access, int i_query, va_list args ) return VLC_SUCCESS; case STREAM_GET_PTS_DELAY: - pi_64 = va_arg( args, int64_t * ); - *pi_64 = DEFAULT_PTS_DELAY; + *va_arg( args, vlc_tick_t * ) = DEFAULT_PTS_DELAY; break; case STREAM_GET_SIGNAL: diff --git a/modules/access/dvdnav.c b/modules/access/dvdnav.c index ce6ba356a3..162462174e 100644 --- a/modules/access/dvdnav.c +++ b/modules/access/dvdnav.c @@ -699,7 +699,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) break; case DEMUX_GET_PTS_DELAY: - *va_arg( args, int64_t * ) = + *va_arg( args, vlc_tick_t * ) = VLC_TICK_FROM_MS( var_InheritInteger( p_demux, "disc-caching" ) ); return VLC_SUCCESS; diff --git a/modules/access/dvdread.c b/modules/access/dvdread.c index 3b42c1eee9..beddd331e1 100644 --- a/modules/access/dvdread.c +++ b/modules/access/dvdread.c @@ -450,8 +450,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) return VLC_SUCCESS; case DEMUX_GET_PTS_DELAY: - pi64 = va_arg( args, int64_t * ); - *pi64 = + *va_arg( args, vlc_tick_t * ) = VLC_TICK_FROM_MS(var_InheritInteger( p_demux, "disc-caching" )); return VLC_SUCCESS; diff --git a/modules/access/file.c b/modules/access/file.c index 74660cf19d..bb9eb6afce 100644 --- a/modules/access/file.c +++ b/modules/access/file.c @@ -313,7 +313,7 @@ static int FileControl( stream_t *p_access, int i_query, va_list args ) { access_sys_t *p_sys = p_access->p_sys; bool *pb_bool; - int64_t *pi_64; + vlc_tick_t *pi_64; switch( i_query ) { @@ -340,7 +340,7 @@ static int FileControl( stream_t *p_access, int i_query, va_list args ) } case STREAM_GET_PTS_DELAY: - pi_64 = va_arg( args, int64_t * ); + pi_64 = va_arg( args, vlc_tick_t * ); if (IsRemote (p_sys->fd, p_access->psz_filepath)) *pi_64 = VLC_TICK_FROM_MS( var_InheritInteger (p_access, "network-caching") ); diff --git a/modules/access/ftp.c b/modules/access/ftp.c index c963b5c65a..0edd5c1537 100644 --- a/modules/access/ftp.c +++ b/modules/access/ftp.c @@ -1021,7 +1021,6 @@ static int Control( stream_t *p_access, int i_query, va_list args ) { access_sys_t *sys = p_access->p_sys; bool *pb_bool; - int64_t *pi_64; switch( i_query ) { @@ -1048,9 +1047,8 @@ static int Control( stream_t *p_access, int i_query, va_list args ) break; case STREAM_GET_PTS_DELAY: - pi_64 = va_arg( args, int64_t * ); - *pi_64 = VLC_TICK_FROM_MS( - var_InheritInteger( p_access, "network-caching" ) ); + *va_arg( args, vlc_tick_t * ) = + VLC_TICK_FROM_MS(var_InheritInteger( p_access, "network-caching" )); break; case STREAM_SET_PAUSE_STATE: diff --git a/modules/access/http.c b/modules/access/http.c index 9bcd2e2450..c2bedba461 100644 --- a/modules/access/http.c +++ b/modules/access/http.c @@ -551,7 +551,6 @@ static int Control( stream_t *p_access, int i_query, va_list args ) { access_sys_t *p_sys = p_access->p_sys; bool *pb_bool; - int64_t *pi_64; switch( i_query ) { @@ -569,9 +568,8 @@ static int Control( stream_t *p_access, int i_query, va_list args ) /* */ case STREAM_GET_PTS_DELAY: - pi_64 = va_arg( args, int64_t * ); - *pi_64 = VLC_TICK_FROM_MS( - var_InheritInteger( p_access, "network-caching" ) ); + *va_arg( args, vlc_tick_t * ) = + VLC_TICK_FROM_MS(var_InheritInteger( p_access, "network-caching" )); break; case STREAM_GET_SIZE: diff --git a/modules/access/http/access.c b/modules/access/http/access.c index 8ac638e62b..b6d57a7837 100644 --- a/modules/access/http/access.c +++ b/modules/access/http/access.c @@ -93,7 +93,7 @@ static int FileControl(stream_t *access, int query, va_list args) } case STREAM_GET_PTS_DELAY: - *va_arg(args, int64_t *) = VLC_TICK_FROM_MS( + *va_arg(args, vlc_tick_t *) = VLC_TICK_FROM_MS( var_InheritInteger(access, "network-caching") ); break; @@ -141,7 +141,7 @@ static int LiveControl(stream_t *access, int query, va_list args) break; case STREAM_GET_PTS_DELAY: - *va_arg(args, int64_t *) = VLC_TICK_FROM_MS( + *va_arg(args, vlc_tick_t *) = VLC_TICK_FROM_MS( var_InheritInteger(access, "network-caching") ); break; diff --git a/modules/access/idummy.c b/modules/access/idummy.c index 2e3ce9a96a..f4c37b73f9 100644 --- a/modules/access/idummy.c +++ b/modules/access/idummy.c @@ -208,8 +208,7 @@ static int DemuxControl( demux_t *p_demux, int i_query, va_list args ) { case DEMUX_GET_PTS_DELAY: { - int64_t *pi_pts_delay = va_arg( args, int64_t * ); - *pi_pts_delay = DEFAULT_PTS_DELAY; + *va_arg( args, vlc_tick_t * ) = DEFAULT_PTS_DELAY; return VLC_SUCCESS; } default: diff --git a/modules/access/imem-access.c b/modules/access/imem-access.c index 7856c041c0..3e902822ac 100644 --- a/modules/access/imem-access.c +++ b/modules/access/imem-access.c @@ -88,7 +88,7 @@ static int Control(stream_t *access, int query, va_list args) break; case STREAM_GET_PTS_DELAY: - *va_arg(args, int64_t *) = DEFAULT_PTS_DELAY; + *va_arg(args, vlc_tick_t *) = DEFAULT_PTS_DELAY; break; case STREAM_SET_PAUSE_STATE: diff --git a/modules/access/imem.c b/modules/access/imem.c index ae0182d7d9..3b42a65bd0 100644 --- a/modules/access/imem.c +++ b/modules/access/imem.c @@ -346,11 +346,10 @@ static int ControlAccess(stream_t *access, int i_query, va_list args) *s = var_InheritInteger(access, "imem-size"); return *s ? VLC_SUCCESS : VLC_EGENERIC; } - case STREAM_GET_PTS_DELAY: { - int64_t *delay = va_arg(args, int64_t *); - *delay = DEFAULT_PTS_DELAY; /* FIXME? */ + case STREAM_GET_PTS_DELAY: + *va_arg(args, vlc_tick_t *) = DEFAULT_PTS_DELAY; /* FIXME? */ return VLC_SUCCESS; - } + case STREAM_SET_PAUSE_STATE: return VLC_SUCCESS; @@ -529,8 +528,7 @@ static int ControlDemux(demux_t *demux, int i_query, va_list args) return VLC_SUCCESS; case DEMUX_GET_PTS_DELAY: { - int64_t *delay = va_arg(args, int64_t *); - *delay = DEFAULT_PTS_DELAY; /* FIXME? */ + *va_arg(args, vlc_tick_t *) = DEFAULT_PTS_DELAY; /* FIXME? */ return VLC_SUCCESS; } case DEMUX_GET_POSITION: { diff --git a/modules/access/jack.c b/modules/access/jack.c index f3a8482b2c..1a91210757 100644 --- a/modules/access/jack.c +++ b/modules/access/jack.c @@ -340,8 +340,8 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) return VLC_SUCCESS; case DEMUX_GET_PTS_DELAY: - pi64 = va_arg( args, int64_t * ); - *pi64 = VLC_TICK_FROM_MS( var_InheritInteger( p_demux, "live-caching" ) ); + *va_arg( args, vlc_tick_t * ) = + VLC_TICK_FROM_MS( var_InheritInteger( p_demux, "live-caching" ) ); return VLC_SUCCESS; case DEMUX_GET_TIME: diff --git a/modules/access/linsys/linsys_hdsdi.c b/modules/access/linsys/linsys_hdsdi.c index 7cf6c4bc6c..22c2007f39 100644 --- a/modules/access/linsys/linsys_hdsdi.c +++ b/modules/access/linsys/linsys_hdsdi.c @@ -309,9 +309,8 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) return VLC_SUCCESS; case DEMUX_GET_PTS_DELAY: - pi64 = va_arg( args, int64_t * ); - *pi64 = VLC_TICK_FROM_MS( - var_InheritInteger( p_demux, "live-caching" ) ); + *va_arg( args, vlc_tick_t * ) = + VLC_TICK_FROM_MS(var_InheritInteger( p_demux, "live-caching" )); return VLC_SUCCESS; /* TODO implement others */ diff --git a/modules/access/linsys/linsys_sdi.c b/modules/access/linsys/linsys_sdi.c index 1af25eae60..4c78fbb9ab 100644 --- a/modules/access/linsys/linsys_sdi.c +++ b/modules/access/linsys/linsys_sdi.c @@ -378,9 +378,8 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) return VLC_SUCCESS; case DEMUX_GET_PTS_DELAY: - pi64 = va_arg( args, int64_t * ); - *pi64 = VLC_TICK_FROM_MS( - var_InheritInteger( p_demux, "live-caching" ) ); + *va_arg( args, vlc_tick_t * ) = + VLC_TICK_FROM_MS(var_InheritInteger( p_demux, "live-caching" )); return VLC_SUCCESS; /* TODO implement others */ diff --git a/modules/access/live555.cpp b/modules/access/live555.cpp index 1931c7420b..186505b8aa 100644 --- a/modules/access/live555.cpp +++ b/modules/access/live555.cpp @@ -1754,9 +1754,8 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) return VLC_EGENERIC; case DEMUX_GET_PTS_DELAY: - pi64 = va_arg( args, int64_t * ); - *pi64 = VLC_TICK_FROM_MS( - var_InheritInteger( p_demux, "network-caching" ) ); + *va_arg( args, vlc_tick_t * ) = + VLC_TICK_FROM_MS(var_InheritInteger( p_demux, "network-caching" )); return VLC_SUCCESS; default: diff --git a/modules/access/mms/mmsh.c b/modules/access/mms/mmsh.c index 477e4a4d7d..c134680960 100644 --- a/modules/access/mms/mmsh.c +++ b/modules/access/mms/mmsh.c @@ -183,7 +183,6 @@ static int Control( stream_t *p_access, int i_query, va_list args ) access_sys_t *p_sys = p_access->p_sys; bool *pb_bool; bool b_bool; - int64_t *pi_64; int i_int; switch( i_query ) @@ -214,9 +213,8 @@ static int Control( stream_t *p_access, int i_query, va_list args ) } case STREAM_GET_PTS_DELAY: - pi_64 = va_arg( args, int64_t * ); - *pi_64 = VLC_TICK_FROM_MS( - var_InheritInteger( p_access, "network-caching" ) ); + *va_arg( args, vlc_tick_t * ) = + VLC_TICK_FROM_MS(var_InheritInteger( p_access, "network-caching" )); break; case STREAM_GET_PRIVATE_ID_STATE: diff --git a/modules/access/mms/mmstu.c b/modules/access/mms/mmstu.c index 24c2227474..d29dc827ad 100644 --- a/modules/access/mms/mmstu.c +++ b/modules/access/mms/mmstu.c @@ -214,7 +214,6 @@ static int Control( stream_t *p_access, int i_query, va_list args ) access_sys_t *p_sys = p_access->p_sys; bool *pb_bool; bool b_bool; - int64_t *pi_64; int i_int; switch( i_query ) @@ -251,9 +250,8 @@ static int Control( stream_t *p_access, int i_query, va_list args ) break; case STREAM_GET_PTS_DELAY: - pi_64 = va_arg( args, int64_t * ); - *pi_64 = VLC_TICK_FROM_MS( - var_InheritInteger( p_access, "network-caching" ) ); + *va_arg( args, vlc_tick_t * ) = + VLC_TICK_FROM_MS(var_InheritInteger( p_access, "network-caching" )); break; case STREAM_GET_PRIVATE_ID_STATE: diff --git a/modules/access/mtp.c b/modules/access/mtp.c index bdecd7ce2c..2c4976f919 100644 --- a/modules/access/mtp.c +++ b/modules/access/mtp.c @@ -194,7 +194,6 @@ static int Control( stream_t *p_access, int i_query, va_list args ) { int fd = (intptr_t)p_access->p_sys; bool *pb_bool; - int64_t *pi_64; switch( i_query ) { @@ -224,9 +223,8 @@ static int Control( stream_t *p_access, int i_query, va_list args ) } case STREAM_GET_PTS_DELAY: - pi_64 = va_arg( args, int64_t * ); - *pi_64 = VLC_TICK_FROM_MS( - var_InheritInteger( p_access, "file-caching" ) ); + *va_arg( args, vlc_tick_t * ) = + VLC_TICK_FROM_MS(var_InheritInteger( p_access, "file-caching" )); break; case STREAM_SET_PAUSE_STATE: diff --git a/modules/access/nfs.c b/modules/access/nfs.c index d94dd6fc7f..5f215aa177 100644 --- a/modules/access/nfs.c +++ b/modules/access/nfs.c @@ -293,7 +293,7 @@ FileControl(stream_t *p_access, int i_query, va_list args) } case STREAM_GET_PTS_DELAY: - *va_arg(args, int64_t *) = VLC_TICK_FROM_MS( + *va_arg(args, vlc_tick_t *) = VLC_TICK_FROM_MS( var_InheritInteger(p_access, "network-caching") ); break; diff --git a/modules/access/oss.c b/modules/access/oss.c index 282ff502c4..28644481b7 100644 --- a/modules/access/oss.c +++ b/modules/access/oss.c @@ -217,9 +217,8 @@ static int DemuxControl( demux_t *p_demux, int i_query, va_list args ) return VLC_SUCCESS; case DEMUX_GET_PTS_DELAY: - pi64 = va_arg( args, int64_t * ); - *pi64 = VLC_TICK_FROM_MS( - var_InheritInteger( p_demux, "live-caching" ) ); + *va_arg( args, vlc_tick_t * ) = + VLC_TICK_FROM_MS(var_InheritInteger( p_demux, "live-caching" )); return VLC_SUCCESS; case DEMUX_GET_TIME: diff --git a/modules/access/pulse.c b/modules/access/pulse.c index e6f7bffdb5..f0d2773ee5 100644 --- a/modules/access/pulse.c +++ b/modules/access/pulse.c @@ -215,7 +215,7 @@ static int Control(demux_t *demux, int query, va_list ap) //case DEMUX_GET_META TODO case DEMUX_GET_PTS_DELAY: - *(va_arg(ap, int64_t *)) = sys->caching; + *(va_arg(ap, vlc_tick_t *)) = sys->caching; break; case DEMUX_HAS_UNSUPPORTED_META: diff --git a/modules/access/qtsound.m b/modules/access/qtsound.m index 47c96d7ffd..e4ac1bc34c 100644 --- a/modules/access/qtsound.m +++ b/modules/access/qtsound.m @@ -534,7 +534,6 @@ static int Demux(demux_t *p_demux) static int Control(demux_t *p_demux, int i_query, va_list args) { bool *pb; - int64_t *pi64; switch(i_query) { /* Special for access_demux */ @@ -547,8 +546,8 @@ static int Control(demux_t *p_demux, int i_query, va_list args) return VLC_SUCCESS; case DEMUX_GET_PTS_DELAY: - pi64 = (int64_t*)va_arg(args, int64_t *); - *pi64 = VLC_TICK_FROM_MS(var_InheritInteger(p_demux, "live-caching")); + *va_arg(args, vlc_tick_t *) = + VLC_TICK_FROM_MS(var_InheritInteger(p_demux, "live-caching")); return VLC_SUCCESS; default: diff --git a/modules/access/rdp.c b/modules/access/rdp.c index 96613bc801..fb173ff258 100644 --- a/modules/access/rdp.c +++ b/modules/access/rdp.c @@ -302,9 +302,8 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) return VLC_SUCCESS; case DEMUX_GET_PTS_DELAY: - pi64 = va_arg( args, int64_t * ); - *pi64 = VLC_TICK_FROM_MS( - var_InheritInteger( p_demux, "live-caching" ) ); + *va_arg( args, vlc_tick_t * ) = + VLC_TICK_FROM_MS(var_InheritInteger( p_demux, "live-caching" )); return VLC_SUCCESS; case DEMUX_GET_TIME: diff --git a/modules/access/rtp/rtp.c b/modules/access/rtp/rtp.c index 37d2dd165a..f4921d4acb 100644 --- a/modules/access/rtp/rtp.c +++ b/modules/access/rtp/rtp.c @@ -383,8 +383,8 @@ static int Control (demux_t *demux, int query, va_list args) { case DEMUX_GET_PTS_DELAY: { - int64_t *v = va_arg (args, int64_t *); - *v = VLC_TICK_FROM_MS( var_InheritInteger (demux, "network-caching") ); + *va_arg (args, vlc_tick_t *) = + VLC_TICK_FROM_MS( var_InheritInteger (demux, "network-caching") ); return VLC_SUCCESS; } diff --git a/modules/access/rtsp/access.c b/modules/access/rtsp/access.c index 09da697ed8..e3e78d03ae 100644 --- a/modules/access/rtsp/access.c +++ b/modules/access/rtsp/access.c @@ -316,7 +316,7 @@ static int Control( stream_t *p_access, int i_query, va_list args ) break; case STREAM_GET_PTS_DELAY: - *va_arg( args, int64_t * ) = VLC_TICK_FROM_MS( + *va_arg( args, vlc_tick_t * ) = VLC_TICK_FROM_MS( var_InheritInteger(p_access, "network-caching") ); break; diff --git a/modules/access/samba.c b/modules/access/samba.c index b1beb5cbc9..1db553c9ab 100644 --- a/modules/access/samba.c +++ b/modules/access/samba.c @@ -203,7 +203,7 @@ static int Control( stream_t *p_access, int i_query, va_list args ) break; case STREAM_GET_PTS_DELAY: - *va_arg( args, int64_t * ) = VLC_TICK_FROM_MS( + *va_arg( args, vlc_tick_t * ) = VLC_TICK_FROM_MS( var_InheritInteger( p_access, "network-caching" ) ); break; diff --git a/modules/access/satip.c b/modules/access/satip.c index a195ffb840..778deb16e9 100644 --- a/modules/access/satip.c +++ b/modules/access/satip.c @@ -557,7 +557,6 @@ static block_t* satip_block(stream_t *access, bool *restrict eof) { static int satip_control(stream_t *access, int i_query, va_list args) { bool *pb_bool; - int64_t *pi_64; switch(i_query) { @@ -569,8 +568,8 @@ static int satip_control(stream_t *access, int i_query, va_list args) { break; case STREAM_GET_PTS_DELAY: - pi_64 = va_arg(args, int64_t *); - *pi_64 = VLC_TICK_FROM_MS(var_InheritInteger(access, "live-caching")); + *va_arg(args, vlc_tick_t *) = + VLC_TICK_FROM_MS(var_InheritInteger(access, "live-caching")); break; default: diff --git a/modules/access/screen/screen.c b/modules/access/screen/screen.c index 7e00ac014a..6d7bbec588 100644 --- a/modules/access/screen/screen.c +++ b/modules/access/screen/screen.c @@ -320,9 +320,8 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) return VLC_SUCCESS; case DEMUX_GET_PTS_DELAY: - pi64 = va_arg( args, int64_t * ); - *pi64 = VLC_TICK_FROM_MS( - var_InheritInteger( p_demux, "live-caching" ) ); + *va_arg( args, vlc_tick_t * ) = + VLC_TICK_FROM_MS(var_InheritInteger( p_demux, "live-caching" )); return VLC_SUCCESS; case DEMUX_GET_TIME: diff --git a/modules/access/screen/wayland.c b/modules/access/screen/wayland.c index 07da0bde36..478d5a2cd1 100644 --- a/modules/access/screen/wayland.c +++ b/modules/access/screen/wayland.c @@ -303,7 +303,7 @@ static int Control(demux_t *demux, int query, va_list args) // break; case DEMUX_GET_PTS_DELAY: - *va_arg(args, int64_t *) = VLC_TICK_FROM_MS( + *va_arg(args, vlc_tick_t *) = VLC_TICK_FROM_MS( var_InheritInteger(demux, "live-caching") ); break; diff --git a/modules/access/screen/xcb.c b/modules/access/screen/xcb.c index cf7f986182..27712d0ec2 100644 --- a/modules/access/screen/xcb.c +++ b/modules/access/screen/xcb.c @@ -301,8 +301,8 @@ static int Control (demux_t *demux, int query, va_list args) case DEMUX_GET_PTS_DELAY: { - int64_t *v = va_arg (args, int64_t *); - *v = VLC_TICK_FROM_MS(var_InheritInteger (demux, "live-caching")); + *va_arg (args, vlc_tick_t *) = + VLC_TICK_FROM_MS(var_InheritInteger (demux, "live-caching")); return VLC_SUCCESS; } diff --git a/modules/access/sdp.c b/modules/access/sdp.c index fc7efa3fc4..2600411e18 100644 --- a/modules/access/sdp.c +++ b/modules/access/sdp.c @@ -101,11 +101,8 @@ static int Control (stream_t *access, int query, va_list args) return VLC_SUCCESS; case STREAM_GET_PTS_DELAY: - { - int64_t *dp = va_arg(args, int64_t *); - *dp = DEFAULT_PTS_DELAY; + *va_arg(args, vlc_tick_t *) = DEFAULT_PTS_DELAY; return VLC_SUCCESS; - } case STREAM_SET_PAUSE_STATE: return VLC_SUCCESS; diff --git a/modules/access/sftp.c b/modules/access/sftp.c index 2d9a0cb3b7..8baa320eb7 100644 --- a/modules/access/sftp.c +++ b/modules/access/sftp.c @@ -566,7 +566,6 @@ static int Control( stream_t* p_access, int i_query, va_list args ) { access_sys_t *sys = p_access->p_sys; bool* pb_bool; - int64_t* pi_64; switch( i_query ) { @@ -593,9 +592,8 @@ static int Control( stream_t* p_access, int i_query, va_list args ) break; case STREAM_GET_PTS_DELAY: - pi_64 = va_arg( args, int64_t * ); - *pi_64 = VLC_TICK_FROM_MS( - var_InheritInteger( p_access, "network-caching" ) ); + *va_arg( args, vlc_tick_t * ) = + VLC_TICK_FROM_MS(var_InheritInteger( p_access, "network-caching" )); break; case STREAM_SET_PAUSE_STATE: diff --git a/modules/access/shm.c b/modules/access/shm.c index 1f09fff2a7..70c3f781f8 100644 --- a/modules/access/shm.c +++ b/modules/access/shm.c @@ -294,8 +294,8 @@ static int Control (demux_t *demux, int query, va_list args) case DEMUX_GET_PTS_DELAY: { - int64_t *v = va_arg (args, int64_t *); - *v = VLC_TICK_FROM_MS( var_InheritInteger (demux, "live-caching") ); + *va_arg (args, vlc_tick_t *) = + VLC_TICK_FROM_MS( var_InheritInteger (demux, "live-caching") ); return VLC_SUCCESS; } diff --git a/modules/access/srt.c b/modules/access/srt.c index f196e38c63..a1c9acca50 100644 --- a/modules/access/srt.c +++ b/modules/access/srt.c @@ -98,7 +98,7 @@ static int Control(stream_t *p_stream, int i_query, va_list args) *va_arg( args, bool * ) = false; break; case STREAM_GET_PTS_DELAY: - *va_arg( args, int64_t * ) = VLC_TICK_FROM_MS( + *va_arg( args, vlc_tick_t * ) = VLC_TICK_FROM_MS( var_InheritInteger(p_stream, "network-caching") ); break; default: diff --git a/modules/access/tcp.c b/modules/access/tcp.c index ca4b00d20d..a2b4b1d51b 100644 --- a/modules/access/tcp.c +++ b/modules/access/tcp.c @@ -41,7 +41,6 @@ static ssize_t Read(stream_t *access, void *buf, size_t len) static int Control( stream_t *p_access, int i_query, va_list args ) { bool *pb_bool; - int64_t *pi_64; switch( i_query ) { @@ -60,9 +59,8 @@ static int Control( stream_t *p_access, int i_query, va_list args ) break; case STREAM_GET_PTS_DELAY: - pi_64 = va_arg( args, int64_t * ); - *pi_64 = VLC_TICK_FROM_MS( - var_InheritInteger( p_access, "network-caching" ) ); + *va_arg( args, vlc_tick_t * ) = + VLC_TICK_FROM_MS(var_InheritInteger( p_access, "network-caching" )); break; case STREAM_SET_PAUSE_STATE: diff --git a/modules/access/timecode.c b/modules/access/timecode.c index 43ab3a4210..751c357beb 100644 --- a/modules/access/timecode.c +++ b/modules/access/timecode.c @@ -147,8 +147,8 @@ static int Control (demux_t *demux, int query, va_list args) case DEMUX_GET_PTS_DELAY: { - int64_t *v = va_arg (args, int64_t *); - *v = VLC_TICK_FROM_MS( var_InheritInteger (demux, "live-caching") ); + *va_arg (args, vlc_tick_t *) = + VLC_TICK_FROM_MS( var_InheritInteger (demux, "live-caching") ); break; } diff --git a/modules/access/udp.c b/modules/access/udp.c index 5fb8ca65aa..d84cb7b99a 100644 --- a/modules/access/udp.c +++ b/modules/access/udp.c @@ -194,7 +194,6 @@ static void Close( vlc_object_t *p_this ) static int Control( stream_t *p_access, int i_query, va_list args ) { bool *pb_bool; - int64_t *pi_64; switch( i_query ) { @@ -207,9 +206,8 @@ static int Control( stream_t *p_access, int i_query, va_list args ) break; case STREAM_GET_PTS_DELAY: - pi_64 = va_arg( args, int64_t * ); - *pi_64 = VLC_TICK_FROM_MS( - var_InheritInteger(p_access, "network-caching") ); + *va_arg( args, vlc_tick_t * ) = + VLC_TICK_FROM_MS(var_InheritInteger(p_access, "network-caching")); break; default: diff --git a/modules/access/unc.c b/modules/access/unc.c index abdbb8f3f6..cddf9c25af 100644 --- a/modules/access/unc.c +++ b/modules/access/unc.c @@ -241,7 +241,7 @@ static int Control( stream_t *p_access, int i_query, va_list args ) break; case STREAM_GET_PTS_DELAY: - *va_arg( args, int64_t * ) = VLC_TICK_FROM_MS( + *va_arg( args, vlc_tick_t * ) = VLC_TICK_FROM_MS( var_InheritInteger( p_access, "network-caching" ) ); break; diff --git a/modules/access/v4l2/access.c b/modules/access/v4l2/access.c index cf45a68e90..488838d627 100644 --- a/modules/access/v4l2/access.c +++ b/modules/access/v4l2/access.c @@ -263,7 +263,7 @@ static int AccessControl( stream_t *access, int query, va_list args ) break; case STREAM_GET_PTS_DELAY: - *va_arg(args,int64_t *) = VLC_TICK_FROM_MS( + *va_arg(args,vlc_tick_t *) = VLC_TICK_FROM_MS( var_InheritInteger( access, "live-caching" ) ); break; diff --git a/modules/access/v4l2/demux.c b/modules/access/v4l2/demux.c index a8453a6a3e..add82c30fb 100644 --- a/modules/access/v4l2/demux.c +++ b/modules/access/v4l2/demux.c @@ -848,7 +848,7 @@ static int DemuxControl( demux_t *demux, int query, va_list args ) return VLC_SUCCESS; case DEMUX_GET_PTS_DELAY: - *va_arg(args,int64_t *) = VLC_TICK_FROM_MS( + *va_arg(args,vlc_tick_t *) = VLC_TICK_FROM_MS( var_InheritInteger( demux, "live-caching" ) ); return VLC_SUCCESS; diff --git a/modules/access/v4l2/radio.c b/modules/access/v4l2/radio.c index ce872a2a81..1f45fe5a33 100644 --- a/modules/access/v4l2/radio.c +++ b/modules/access/v4l2/radio.c @@ -50,7 +50,7 @@ static int RadioControl (demux_t *demux, int query, va_list args) break; case DEMUX_GET_PTS_DELAY: - *va_arg (args,int64_t *) = VLC_TICK_FROM_MS( + *va_arg (args,vlc_tick_t *) = VLC_TICK_FROM_MS( var_InheritInteger (demux, "live-caching") ); break; diff --git a/modules/access/vcd/vcd.c b/modules/access/vcd/vcd.c index e4bb0335cc..a4d3204d02 100644 --- a/modules/access/vcd/vcd.c +++ b/modules/access/vcd/vcd.c @@ -255,7 +255,7 @@ static int Control( stream_t *p_access, int i_query, va_list args ) /* */ case STREAM_GET_PTS_DELAY: - *va_arg( args, int64_t * ) = VLC_TICK_FROM_MS( + *va_arg( args, vlc_tick_t * ) = VLC_TICK_FROM_MS( var_InheritInteger(p_access, "disc-caching") ); break; diff --git a/modules/access/vdr.c b/modules/access/vdr.c index e485b8e3d2..0f20a679b3 100644 --- a/modules/access/vdr.c +++ b/modules/access/vdr.c @@ -267,7 +267,6 @@ static int Control( stream_t *p_access, int i_query, va_list args ) access_sys_t *p_sys = p_access->p_sys; input_title_t ***ppp_title; int i; - int64_t *pi64; vlc_meta_t *p_meta; switch( i_query ) @@ -284,9 +283,8 @@ static int Control( stream_t *p_access, int i_query, va_list args ) break; case STREAM_GET_PTS_DELAY: - pi64 = va_arg( args, int64_t * ); - *pi64 = VLC_TICK_FROM_MS( - var_InheritInteger( p_access, "file-caching" ) ); + *va_arg( args, vlc_tick_t * ) = + VLC_TICK_FROM_MS(var_InheritInteger( p_access, "file-caching" )); break; case STREAM_SET_PAUSE_STATE: diff --git a/modules/access/vnc.c b/modules/access/vnc.c index b49f8224cf..6bf98ec62e 100644 --- a/modules/access/vnc.c +++ b/modules/access/vnc.c @@ -299,9 +299,8 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) return VLC_SUCCESS; case DEMUX_GET_PTS_DELAY: - pi64 = va_arg( args, int64_t * ); - *pi64 = VLC_TICK_FROM_MS( - var_InheritInteger( p_demux, "network-caching" ) ); + *va_arg( args, vlc_tick_t * ) = + VLC_TICK_FROM_MS(var_InheritInteger( p_demux, "network-caching" )); return VLC_SUCCESS; case DEMUX_GET_TIME: diff --git a/modules/access/wasapi.c b/modules/access/wasapi.c index 2ea997efb9..fbe8271259 100644 --- a/modules/access/wasapi.c +++ b/modules/access/wasapi.c @@ -360,7 +360,7 @@ static int Control(demux_t *demux, int query, va_list ap) break; case DEMUX_GET_PTS_DELAY: - *(va_arg(ap, int64_t *)) = sys->caching; + *(va_arg(ap, vlc_tick_t *)) = sys->caching; break; case DEMUX_HAS_UNSUPPORTED_META: diff --git a/modules/demux/adaptive/PlaylistManager.cpp b/modules/demux/adaptive/PlaylistManager.cpp index 881388f143..916daf9d1c 100644 --- a/modules/demux/adaptive/PlaylistManager.cpp +++ b/modules/demux/adaptive/PlaylistManager.cpp @@ -597,7 +597,7 @@ int PlaylistManager::doControl(int i_query, va_list args) } case DEMUX_GET_PTS_DELAY: - *va_arg (args, int64_t *) = VLC_TICK_FROM_SEC(1); + *va_arg (args, vlc_tick_t *) = VLC_TICK_FROM_SEC(1); break; default: diff --git a/modules/demux/adaptive/plumbing/SourceStream.cpp b/modules/demux/adaptive/plumbing/SourceStream.cpp index 546b6f0e8a..01119a471b 100644 --- a/modules/demux/adaptive/plumbing/SourceStream.cpp +++ b/modules/demux/adaptive/plumbing/SourceStream.cpp @@ -156,7 +156,7 @@ int ChunksSourceStream::control_Callback(stream_t *s, int i_query, va_list args) break; case STREAM_GET_PTS_DELAY: - *(va_arg( args, uint64_t * )) = DEFAULT_PTS_DELAY; + *(va_arg( args, vlc_tick_t * )) = DEFAULT_PTS_DELAY; return VLC_SUCCESS; default: diff --git a/modules/demux/aiff.c b/modules/demux/aiff.c index 1af1a937e3..b8ed3d1119 100644 --- a/modules/demux/aiff.c +++ b/modules/demux/aiff.c @@ -314,8 +314,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) } case DEMUX_GET_TIME: - pi64 = va_arg( args, int64_t * ); - *pi64 = p_sys->i_time; + *va_arg( args, vlc_tick_t * ) = p_sys->i_time; return VLC_SUCCESS; case DEMUX_GET_LENGTH: diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c index f9c540819e..731cd25aae 100644 --- a/modules/demux/mp4/mp4.c +++ b/modules/demux/mp4/mp4.c @@ -2188,7 +2188,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) if ( (p_load = MP4_BoxGet( p_sys->track[i].p_track, "load" )) && BOXDATA(p_load)->i_duration > 0 ) { - *va_arg(args, int64_t *) = + *va_arg(args, vlc_tick_t *) = MP4_rescale( BOXDATA(p_load)->i_duration, p_sys->track[i].i_timescale, CLOCK_FREQ ); return VLC_SUCCESS; diff --git a/modules/stream_filter/decomp.c b/modules/stream_filter/decomp.c index a3e4b22ffa..f5fdd94636 100644 --- a/modules/stream_filter/decomp.c +++ b/modules/stream_filter/decomp.c @@ -89,7 +89,7 @@ typedef struct int read_fd; bool can_pace; bool can_pause; - int64_t pts_delay; + vlc_tick_t pts_delay; } stream_sys_t; extern char **environ; @@ -222,7 +222,7 @@ static int Control (stream_t *stream, int query, va_list args) *(va_arg (args, uint64_t *)) = 0; break; case STREAM_GET_PTS_DELAY: - *va_arg (args, int64_t *) = p_sys->pts_delay; + *va_arg (args, vlc_tick_t *) = p_sys->pts_delay; break; case STREAM_SET_PAUSE_STATE: { diff --git a/modules/stream_filter/hds/hds.c b/modules/stream_filter/hds/hds.c index 9496fee92d..280927b2e5 100644 --- a/modules/stream_filter/hds/hds.c +++ b/modules/stream_filter/hds/hds.c @@ -1893,7 +1893,7 @@ static int Control( stream_t *s, int i_query, va_list args ) *(va_arg( args, bool * )) = true; break; case STREAM_GET_PTS_DELAY: - *va_arg (args, int64_t *) = VLC_TICK_FROM_MS( + *va_arg (args, vlc_tick_t *) = VLC_TICK_FROM_MS( var_InheritInteger(s, "network-caching") ); break; case STREAM_GET_SIZE: diff --git a/modules/stream_filter/prefetch.c b/modules/stream_filter/prefetch.c index 43d22d1609..b5afdffcec 100644 --- a/modules/stream_filter/prefetch.c +++ b/modules/stream_filter/prefetch.c @@ -65,7 +65,7 @@ typedef struct bool can_pace; bool can_pause; uint64_t size; - int64_t pts_delay; + vlc_tick_t pts_delay; char *content_type; uint64_t buffer_offset; @@ -370,7 +370,7 @@ static int Control(stream_t *stream, int query, va_list args) *va_arg(args, uint64_t *) = sys->size; break; case STREAM_GET_PTS_DELAY: - *va_arg(args, int64_t *) = sys->pts_delay; + *va_arg(args, vlc_tick_t *) = sys->pts_delay; break; case STREAM_GET_TITLE_INFO: case STREAM_GET_TITLE: diff --git a/src/input/access.c b/src/input/access.c index 33313ddd17..732837e28b 100644 --- a/src/input/access.c +++ b/src/input/access.c @@ -174,7 +174,7 @@ int access_vaDirectoryControlHelper( stream_t *p_access, int i_query, va_list ar *va_arg( args, bool* ) = false; break; case STREAM_GET_PTS_DELAY: - *va_arg( args, int64_t * ) = 0; + *va_arg( args, vlc_tick_t * ) = 0; break; default: return VLC_EGENERIC; diff --git a/src/input/stream_fifo.c b/src/input/stream_fifo.c index fd82dfb92c..8a5b4269db 100644 --- a/src/input/stream_fifo.c +++ b/src/input/stream_fifo.c @@ -94,7 +94,7 @@ static int vlc_stream_fifo_Control(stream_t *s, int query, va_list ap) break; case STREAM_GET_PTS_DELAY: - *va_arg(ap, int64_t *) = DEFAULT_PTS_DELAY; + *va_arg(ap, vlc_tick_t *) = DEFAULT_PTS_DELAY; break; default: diff --git a/src/input/stream_memory.c b/src/input/stream_memory.c index edb96bc982..f9a3df117c 100644 --- a/src/input/stream_memory.c +++ b/src/input/stream_memory.c @@ -97,7 +97,7 @@ static int Control( stream_t *s, int i_query, va_list args ) break; case STREAM_GET_PTS_DELAY: - *va_arg( args, int64_t * ) = 0; + *va_arg( args, vlc_tick_t * ) = 0; break; case STREAM_GET_TITLE_INFO: diff --git a/test/src/input/stream_fifo.c b/test/src/input/stream_fifo.c index 4c9dce195f..2bc3227cbe 100644 --- a/test/src/input/stream_fifo.c +++ b/test/src/input/stream_fifo.c @@ -59,7 +59,7 @@ int main(void) assert(val == VLC_SUCCESS && !b); val = vlc_stream_GetSize(s, &(uint64_t){ 0 }); assert(val < 0); - val = vlc_stream_Control(s, STREAM_GET_PTS_DELAY, &(int64_t){ 0 }); + val = vlc_stream_Control(s, STREAM_GET_PTS_DELAY, &(vlc_tick_t){ 0 }); assert(val == VLC_SUCCESS); vlc_stream_Delete(s); vlc_stream_fifo_Close(s); _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
