mirrors/vlc
0
0
Fork 0
mirror of https://github.com/videolan/vlc.git synced 2024-11-23 18:03:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

modules: the "live-caching" is always translated to a vlc_tick_t

Browse Source
This commit is contained in:
Steve Lhomme 2018-07-06 10:03:49 +02:00
parent 416913eb01
commit 5ef6d13736
23 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/access/alsa.c
View File

@ -459,7 +459,7 @@ static int Open (vlc_object_t *obj)
sys->rate = param;
sys->start = vlc_tick_now ();
sys->caching = INT64_C(1000) * var_InheritInteger (demux, "live-caching");
sys->caching = VLC_TICK_FROM_MS(var_InheritInteger (demux, "live-caching"));
param = sys->caching;
val = snd_pcm_hw_params_set_buffer_time_near (pcm, hw, &param, NULL);
if (val)

2
modules/access/avcapture.m
View File

@ -451,7 +451,7 @@ 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, "live-caching");
*pi64 = VLC_TICK_FROM_MS(var_InheritInteger(p_demux, "live-caching"));
return VLC_SUCCESS;
case DEMUX_GET_TIME:

2
modules/access/decklink.cpp
View File

@ -742,7 +742,7 @@ static int Control(demux_t *demux, int query, va_list args)
case DEMUX_GET_PTS_DELAY:
pi64 = va_arg(args, int64_t *);
*pi64 = INT64_C(1000) * var_InheritInteger(demux, "live-caching");
*pi64 = VLC_TICK_FROM_MS(var_InheritInteger(demux, "live-caching"));
return VLC_SUCCESS;
case DEMUX_GET_TIME:

4
modules/access/dshow/dshow.cpp
View File

@ -1933,7 +1933,7 @@ static int AccessControl( 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, "live-caching" );
VLC_TICK_FROM_MS( var_InheritInteger( p_access, "live-caching" ) );
break;
case STREAM_GET_CONTENT_TYPE:
@ -1982,7 +1982,7 @@ static int DemuxControl( 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, "live-caching" );
VLC_TICK_FROM_MS( var_InheritInteger( p_demux, "live-caching" ) );
return VLC_SUCCESS;
case DEMUX_GET_TIME:

2
modules/access/dtv/access.c
View File

@ -541,7 +541,7 @@ 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 = var_InheritInteger (access, "live-caching") * INT64_C(1000);
*v = VLC_TICK_FROM_MS( var_InheritInteger (access, "live-caching") );
break;
}

2
modules/access/dv.c
View File

@ -283,7 +283,7 @@ static int Control( stream_t *p_access, int i_query, va_list args )
case STREAM_GET_PTS_DELAY:
*va_arg( args, int64_t * ) =
INT64_C(1000) * var_InheritInteger( p_access, "live-caching" );
VLC_TICK_FROM_MS( var_InheritInteger( p_access, "live-caching" ) );
break;
/* */

2
modules/access/jack.c
View File

@ -341,7 +341,7 @@ 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, "live-caching" );
*pi64 = VLC_TICK_FROM_MS( var_InheritInteger( p_demux, "live-caching" ) );
return VLC_SUCCESS;
case DEMUX_GET_TIME:

4
modules/access/linsys/linsys_hdsdi.c
View File

@ -310,8 +310,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, "live-caching" );
*pi64 = VLC_TICK_FROM_MS(
var_InheritInteger( p_demux, "live-caching" ) );
return VLC_SUCCESS;
/* TODO implement others */

4
modules/access/linsys/linsys_sdi.c
View File

@ -379,8 +379,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, "live-caching" );
*pi64 = VLC_TICK_FROM_MS(
var_InheritInteger( p_demux, "live-caching" ) );
return VLC_SUCCESS;
/* TODO implement others */

4
modules/access/oss.c
View File

@ -218,8 +218,8 @@ static int DemuxControl( 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, "live-caching" );
*pi64 = VLC_TICK_FROM_MS(
var_InheritInteger( p_demux, "live-caching" ) );
return VLC_SUCCESS;
case DEMUX_GET_TIME:

2
modules/access/pulse.c
View File

@ -269,7 +269,7 @@ static int Open(vlc_object_t *obj)
sys->stream = NULL;
sys->es = NULL;
sys->discontinuity = false;
sys->caching = INT64_C(1000) * var_InheritInteger(obj, "live-caching");
sys->caching = VLC_TICK_FROM_MS( var_InheritInteger(obj, "live-caching") );
demux->p_sys = sys;
/* Stream parameters */

2
modules/access/qtsound.m
View File

@ -548,7 +548,7 @@ static int Control(demux_t *p_demux, int i_query, va_list args)
case DEMUX_GET_PTS_DELAY:
pi64 = (int64_t*)va_arg(args, int64_t *);
*pi64 = INT64_C(1000) * var_InheritInteger(p_demux, "live-caching");
*pi64 = VLC_TICK_FROM_MS(var_InheritInteger(p_demux, "live-caching"));
return VLC_SUCCESS;
default:

4
modules/access/rdp.c
View File

@ -303,8 +303,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, "live-caching" );
*pi64 = VLC_TICK_FROM_MS(
var_InheritInteger( p_demux, "live-caching" ) );
return VLC_SUCCESS;
case DEMUX_GET_TIME:

2
modules/access/satip.c
View File

@ -570,7 +570,7 @@ static int satip_control(stream_t *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(access, "live-caching");
*pi_64 = VLC_TICK_FROM_MS(var_InheritInteger(access, "live-caching"));
break;
default:

4
modules/access/screen/screen.c
View File

@ -321,8 +321,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, "live-caching" );
*pi64 = VLC_TICK_FROM_MS(
var_InheritInteger( p_demux, "live-caching" ) );
return VLC_SUCCESS;
case DEMUX_GET_TIME:

4
modules/access/screen/wayland.c
View File

@ -303,8 +303,8 @@ static int Control(demux_t *demux, int query, va_list args)
// break;
case DEMUX_GET_PTS_DELAY:
*va_arg(args, int64_t *) = INT64_C(1000)
* var_InheritInteger(demux, "live-caching");
*va_arg(args, int64_t *) = VLC_TICK_FROM_MS(
var_InheritInteger(demux, "live-caching") );
break;
case DEMUX_CAN_CONTROL_PACE:

2
modules/access/screen/xcb.c
View File

@ -302,7 +302,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, "live-caching");
*v = VLC_TICK_FROM_MS(var_InheritInteger (demux, "live-caching"));
return VLC_SUCCESS;
}

2
modules/access/shm.c
View File

@ -295,7 +295,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, "live-caching");
*v = VLC_TICK_FROM_MS( var_InheritInteger (demux, "live-caching") );
return VLC_SUCCESS;
}

2
modules/access/timecode.c
View File

@ -148,7 +148,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, "live-caching");
*v = VLC_TICK_FROM_MS( var_InheritInteger (demux, "live-caching") );
break;
}

4
modules/access/v4l2/access.c
View File

@ -263,8 +263,8 @@ static int AccessControl( 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, "live-caching" );
*va_arg(args,int64_t *) = VLC_TICK_FROM_MS(
var_InheritInteger( access, "live-caching" ) );
break;
case STREAM_SET_PAUSE_STATE:

4
modules/access/v4l2/demux.c
View File

@ -848,8 +848,8 @@ static int DemuxControl( demux_t *demux, int query, va_list args )
return VLC_SUCCESS;
case DEMUX_GET_PTS_DELAY:
*va_arg(args,int64_t *) = INT64_C(1000)
* var_InheritInteger( demux, "live-caching" );
*va_arg(args,int64_t *) = VLC_TICK_FROM_MS(
var_InheritInteger( demux, "live-caching" ) );
return VLC_SUCCESS;
case DEMUX_GET_TIME:

4
modules/access/v4l2/radio.c
View File

@ -50,8 +50,8 @@ static int RadioControl (demux_t *demux, int query, va_list args)
break;
case DEMUX_GET_PTS_DELAY:
*va_arg (args,int64_t *) = INT64_C(1000)
* var_InheritInteger (demux, "live-caching");
*va_arg (args,int64_t *) = VLC_TICK_FROM_MS(
var_InheritInteger (demux, "live-caching") );
break;
case DEMUX_GET_TIME:

2
modules/access/wasapi.c
View File

@ -396,7 +396,7 @@ static int Open(vlc_object_t *obj)
sys->client = NULL;
sys->es = NULL;
sys->caching = INT64_C(1000) * var_InheritInteger(obj, "live-caching");
sys->caching = VLC_TICK_FROM_MS( var_InheritInteger(obj, "live-caching") );
sys->start_time = vlc_tick_now();
for (unsigned i = 0; i < 2; i++)
sys->events[i] = NULL;