Browse Source

preparser: rename default_timeout

It is now the main timeout.
pull/171/head
Thomas Guillem 2 years ago
committed by Steve Lhomme
parent
commit
d853c70076
  1. 4
      include/vlc_preparser.h
  2. 12
      src/preparser/preparser.c

4
include/vlc_preparser.h

@ -63,7 +63,7 @@ typedef enum input_item_meta_request_option_t
*
* @param obj the parent object
* @param max_threads the maximum number of threads used to parse, must be >= 1
* @param default_timeout default timeout of the preparser, 0 for no limits.
* @param timeout timeout of the preparser, 0 for no limits.
* @param request_type a combination of META_REQUEST_OPTION_PARSE,
* META_REQUEST_OPTION_FETCH_LOCAL and META_REQUEST_OPTION_FETCH_NETWORK, it is
* used to setup the executors for each domain.
@ -71,7 +71,7 @@ typedef enum input_item_meta_request_option_t
*/
VLC_API vlc_preparser_t *vlc_preparser_New( vlc_object_t *obj,
unsigned max_threads,
vlc_tick_t default_timeout,
vlc_tick_t timeout,
input_item_meta_request_option_t request_type );
/**

12
src/preparser/preparser.c

@ -36,7 +36,7 @@ struct vlc_preparser_t
vlc_object_t* owner;
input_fetcher_t* fetcher;
vlc_executor_t *executor;
vlc_tick_t default_timeout;
vlc_tick_t timeout;
atomic_bool deactivated;
vlc_mutex_t lock;
@ -319,11 +319,11 @@ Interrupt(struct task *task)
}
vlc_preparser_t* vlc_preparser_New( vlc_object_t *parent, unsigned max_threads,
vlc_tick_t default_timeout,
vlc_tick_t timeout,
input_item_meta_request_option_t request_type )
{
assert(max_threads >= 1);
assert(default_timeout >= 0);
assert(timeout >= 0);
assert(request_type & (META_REQUEST_OPTION_FETCH_ANY|META_REQUEST_OPTION_PARSE));
vlc_preparser_t* preparser = malloc( sizeof *preparser );
@ -342,7 +342,7 @@ vlc_preparser_t* vlc_preparser_New( vlc_object_t *parent, unsigned max_threads,
else
preparser->executor = NULL;
preparser->default_timeout = default_timeout;
preparser->timeout = timeout;
preparser->owner = parent;
if (request_type & META_REQUEST_OPTION_FETCH_ANY)
@ -386,7 +386,7 @@ vlc_preparser_req_id vlc_preparser_Push( vlc_preparser_t *preparser, input_item_
struct task *task =
TaskNew(preparser, item, i_options, cbs, cbs_userdata,
preparser->default_timeout);
preparser->timeout);
if( !task )
return 0;
@ -451,7 +451,7 @@ void vlc_preparser_Deactivate( vlc_preparser_t* preparser )
void vlc_preparser_SetTimeout( vlc_preparser_t *preparser,
vlc_tick_t timeout )
{
preparser->default_timeout = timeout;
preparser->timeout = timeout;
}
void vlc_preparser_Delete( vlc_preparser_t *preparser )

Loading…
Cancel
Save