[vlc-commits] modules: the "network-caching" is always translated to a vlc_tick_t
Steve Lhomme
git at videolan.org
Fri Jul 6 10:48:27 CEST 2018
vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Fri Jul 6 09:53:20 2018 +0200| [f8872ec58990e14522d8ef2041f08c151a571fd6] | committer: Steve Lhomme
modules: the "network-caching" is always translated to a vlc_tick_t
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f8872ec58990e14522d8ef2041f08c151a571fd6
---
modules/access/avio.c | 2 +-
modules/access/dsm/access.c | 4 ++--
modules/access/file.c | 6 +++---
modules/access/ftp.c | 4 ++--
modules/access/http.c | 4 ++--
modules/access/http/access.c | 8 ++++----
modules/access/live555.cpp | 4 ++--
modules/access/mms/mmsh.c | 4 ++--
modules/access/mms/mmstu.c | 4 ++--
modules/access/rtp/rtp.c | 2 +-
modules/access/rtsp/access.c | 4 ++--
modules/access/samba.c | 4 ++--
modules/access/sftp.c | 4 ++--
modules/access/srt.c | 4 ++--
modules/access/tcp.c | 4 ++--
modules/access/udp.c | 4 ++--
modules/access/unc.c | 4 ++--
modules/access/vnc.c | 4 ++--
modules/stream_filter/hds/hds.c | 4 ++--
19 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/modules/access/avio.c b/modules/access/avio.c
index 1e90dac8dc..c43aeb20d6 100644
--- a/modules/access/avio.c
+++ b/modules/access/avio.c
@@ -334,7 +334,7 @@ static int Control(stream_t *access, int query, va_list args)
return VLC_SUCCESS;
case STREAM_GET_PTS_DELAY: {
int64_t *delay = va_arg(args, int64_t *);
- *delay = INT64_C(1000) * var_InheritInteger(access, "network-caching");
+ *delay = VLC_TICK_FROM_MS(var_InheritInteger(access, "network-caching"));
return VLC_SUCCESS;
}
case STREAM_SET_PAUSE_STATE: {
diff --git a/modules/access/dsm/access.c b/modules/access/dsm/access.c
index 8bb7998294..39682750e1 100644
--- a/modules/access/dsm/access.c
+++ b/modules/access/dsm/access.c
@@ -491,8 +491,8 @@ static int Control( stream_t *p_access, int i_query, va_list args )
break;
}
case STREAM_GET_PTS_DELAY:
- *va_arg( args, int64_t * ) = INT64_C(1000)
- * var_InheritInteger( p_access, "network-caching" );
+ *va_arg( args, int64_t * ) = VLC_TICK_FROM_MS(
+ var_InheritInteger( p_access, "network-caching" ) );
break;
case STREAM_SET_PAUSE_STATE:
diff --git a/modules/access/file.c b/modules/access/file.c
index 16b5c740cd..70a44da47b 100644
--- a/modules/access/file.c
+++ b/modules/access/file.c
@@ -342,10 +342,10 @@ 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 * );
if (IsRemote (p_sys->fd, p_access->psz_filepath))
- *pi_64 = var_InheritInteger (p_access, "network-caching");
+ *pi_64 = VLC_TICK_FROM_MS(
+ var_InheritInteger (p_access, "network-caching") );
else
- *pi_64 = var_InheritInteger (p_access, "file-caching");
- *pi_64 *= 1000;
+ *pi_64 = var_InheritInteger (p_access, "file-caching") * 1000;
break;
case STREAM_SET_PAUSE_STATE:
diff --git a/modules/access/ftp.c b/modules/access/ftp.c
index 61bf4a240e..c963b5c65a 100644
--- a/modules/access/ftp.c
+++ b/modules/access/ftp.c
@@ -1049,8 +1049,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 = INT64_C(1000)
- * var_InheritInteger( p_access, "network-caching" );
+ *pi_64 = 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 88be5aafb3..9bcd2e2450 100644
--- a/modules/access/http.c
+++ b/modules/access/http.c
@@ -570,8 +570,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 = INT64_C(1000)
- * var_InheritInteger( p_access, "network-caching" );
+ *pi_64 = 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 24af4ce22a..8ac638e62b 100644
--- a/modules/access/http/access.c
+++ b/modules/access/http/access.c
@@ -93,8 +93,8 @@ static int FileControl(stream_t *access, int query, va_list args)
}
case STREAM_GET_PTS_DELAY:
- *va_arg(args, int64_t *) = INT64_C(1000) *
- var_InheritInteger(access, "network-caching");
+ *va_arg(args, int64_t *) = VLC_TICK_FROM_MS(
+ var_InheritInteger(access, "network-caching") );
break;
case STREAM_GET_CONTENT_TYPE:
@@ -141,8 +141,8 @@ static int LiveControl(stream_t *access, int query, va_list args)
break;
case STREAM_GET_PTS_DELAY:
- *va_arg(args, int64_t *) = INT64_C(1000) *
- var_InheritInteger(access, "network-caching");
+ *va_arg(args, int64_t *) = VLC_TICK_FROM_MS(
+ var_InheritInteger(access, "network-caching") );
break;
case STREAM_GET_CONTENT_TYPE:
diff --git a/modules/access/live555.cpp b/modules/access/live555.cpp
index 6787cf4ea5..1931c7420b 100644
--- a/modules/access/live555.cpp
+++ b/modules/access/live555.cpp
@@ -1755,8 +1755,8 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
case DEMUX_GET_PTS_DELAY:
pi64 = va_arg( args, int64_t * );
- *pi64 = INT64_C(1000)
- * var_InheritInteger( p_demux, "network-caching" );
+ *pi64 = 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 d2f497dd94..477e4a4d7d 100644
--- a/modules/access/mms/mmsh.c
+++ b/modules/access/mms/mmsh.c
@@ -215,8 +215,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 = INT64_C(1000)
- * var_InheritInteger( p_access, "network-caching" );
+ *pi_64 = 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 63f8664287..24c2227474 100644
--- a/modules/access/mms/mmstu.c
+++ b/modules/access/mms/mmstu.c
@@ -252,8 +252,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 = INT64_C(1000)
- * var_InheritInteger( p_access, "network-caching" );
+ *pi_64 = VLC_TICK_FROM_MS(
+ var_InheritInteger( p_access, "network-caching" ) );
break;
case STREAM_GET_PRIVATE_ID_STATE:
diff --git a/modules/access/rtp/rtp.c b/modules/access/rtp/rtp.c
index 3215eb5a5b..37d2dd165a 100644
--- a/modules/access/rtp/rtp.c
+++ b/modules/access/rtp/rtp.c
@@ -384,7 +384,7 @@ 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 = INT64_C(1000) * var_InheritInteger (demux, "network-caching");
+ *v = 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 3dfe6d9143..09da697ed8 100644
--- a/modules/access/rtsp/access.c
+++ b/modules/access/rtsp/access.c
@@ -316,8 +316,8 @@ static int Control( stream_t *p_access, int i_query, va_list args )
break;
case STREAM_GET_PTS_DELAY:
- *va_arg( args, int64_t * ) = INT64_C(1000)
- * var_InheritInteger(p_access, "network-caching");
+ *va_arg( args, int64_t * ) = VLC_TICK_FROM_MS(
+ var_InheritInteger(p_access, "network-caching") );
break;
case STREAM_SET_PAUSE_STATE:
diff --git a/modules/access/samba.c b/modules/access/samba.c
index 8d683f2572..b1beb5cbc9 100644
--- a/modules/access/samba.c
+++ b/modules/access/samba.c
@@ -203,8 +203,8 @@ static int Control( stream_t *p_access, int i_query, va_list args )
break;
case STREAM_GET_PTS_DELAY:
- *va_arg( args, int64_t * ) = INT64_C(1000)
- * var_InheritInteger( p_access, "network-caching" );
+ *va_arg( args, int64_t * ) = VLC_TICK_FROM_MS(
+ var_InheritInteger( p_access, "network-caching" ) );
break;
case STREAM_SET_PAUSE_STATE:
diff --git a/modules/access/sftp.c b/modules/access/sftp.c
index 9e20b8c47b..2d9a0cb3b7 100644
--- a/modules/access/sftp.c
+++ b/modules/access/sftp.c
@@ -594,8 +594,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 = INT64_C(1000)
- * var_InheritInteger( p_access, "network-caching" );
+ *pi_64 = VLC_TICK_FROM_MS(
+ var_InheritInteger( p_access, "network-caching" ) );
break;
case STREAM_SET_PAUSE_STATE:
diff --git a/modules/access/srt.c b/modules/access/srt.c
index d0dadfbba3..f196e38c63 100644
--- a/modules/access/srt.c
+++ b/modules/access/srt.c
@@ -98,8 +98,8 @@ 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 * ) = INT64_C(1000)
- * var_InheritInteger(p_stream, "network-caching");
+ *va_arg( args, int64_t * ) = VLC_TICK_FROM_MS(
+ var_InheritInteger(p_stream, "network-caching") );
break;
default:
i_ret = VLC_EGENERIC;
diff --git a/modules/access/tcp.c b/modules/access/tcp.c
index 947ee49b06..ca4b00d20d 100644
--- a/modules/access/tcp.c
+++ b/modules/access/tcp.c
@@ -61,8 +61,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 = INT64_C(1000)
- * var_InheritInteger( p_access, "network-caching" );
+ *pi_64 = VLC_TICK_FROM_MS(
+ var_InheritInteger( p_access, "network-caching" ) );
break;
case STREAM_SET_PAUSE_STATE:
diff --git a/modules/access/udp.c b/modules/access/udp.c
index f2269d3659..5fb8ca65aa 100644
--- a/modules/access/udp.c
+++ b/modules/access/udp.c
@@ -208,8 +208,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 = INT64_C(1000)
- * var_InheritInteger(p_access, "network-caching");
+ *pi_64 = 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 187df23e36..abdbb8f3f6 100644
--- a/modules/access/unc.c
+++ b/modules/access/unc.c
@@ -241,8 +241,8 @@ static int Control( stream_t *p_access, int i_query, va_list args )
break;
case STREAM_GET_PTS_DELAY:
- *va_arg( args, int64_t * ) = INT64_C(1000)
- * var_InheritInteger( p_access, "network-caching" );
+ *va_arg( args, int64_t * ) = VLC_TICK_FROM_MS(
+ var_InheritInteger( p_access, "network-caching" ) );
break;
case STREAM_SET_PAUSE_STATE:
diff --git a/modules/access/vnc.c b/modules/access/vnc.c
index c6a8ae426a..b49f8224cf 100644
--- a/modules/access/vnc.c
+++ b/modules/access/vnc.c
@@ -300,8 +300,8 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
case DEMUX_GET_PTS_DELAY:
pi64 = va_arg( args, int64_t * );
- *pi64 = INT64_C(1000)
- * var_InheritInteger( p_demux, "network-caching" );
+ *pi64 = VLC_TICK_FROM_MS(
+ var_InheritInteger( p_demux, "network-caching" ) );
return VLC_SUCCESS;
case DEMUX_GET_TIME:
diff --git a/modules/stream_filter/hds/hds.c b/modules/stream_filter/hds/hds.c
index d78163c4fa..9496fee92d 100644
--- a/modules/stream_filter/hds/hds.c
+++ b/modules/stream_filter/hds/hds.c
@@ -1893,8 +1893,8 @@ 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 *) = INT64_C(1000) *
- var_InheritInteger(s, "network-caching");
+ *va_arg (args, int64_t *) = VLC_TICK_FROM_MS(
+ var_InheritInteger(s, "network-caching") );
break;
case STREAM_GET_SIZE:
*(va_arg (args, uint64_t *)) = get_stream_size(s);
More information about the vlc-commits
mailing list