X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finput%2Finput.c;h=2bbe51ca1e988d847451875d39fe566a4a08eed6;hb=ed0b72e3714ad87cb4e10b9a7239e19b9ef0724e;hp=afeda1cfdb05c4a21b66a2d56a4d066cd1dc205f;hpb=fe087a38282e93addb25fa9598393e40ea233b09;p=vlc diff --git a/src/input/input.c b/src/input/input.c index afeda1cfdb..2bbe51ca1e 100644 --- a/src/input/input.c +++ b/src/input/input.c @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** @@ -38,29 +38,31 @@ #include "stream_output.h" #include "vlc_playlist.h" #include "vlc_interface.h" +#include "vlc_interaction.h" /***************************************************************************** * Local prototypes *****************************************************************************/ static int Run ( input_thread_t *p_input ); +static int RunAndClean ( input_thread_t *p_input ); -static int Init ( input_thread_t *p_input, vlc_bool_t b_quick ); -static void Error( input_thread_t *p_input ); -static void End ( input_thread_t *p_input ); +static input_thread_t * Create ( vlc_object_t *, input_item_t *, char *, + vlc_bool_t ); +static int Init ( input_thread_t *p_input, vlc_bool_t b_quick ); +static void Error ( input_thread_t *p_input ); +static void End ( input_thread_t *p_input ); +static void MainLoop( input_thread_t *p_input ); static inline int ControlPopNoLock( input_thread_t *, int *, vlc_value_t * ); static void ControlReduce( input_thread_t * ); static vlc_bool_t Control( input_thread_t *, int, vlc_value_t ); - static int UpdateFromAccess( input_thread_t * ); static int UpdateFromDemux( input_thread_t * ); static int UpdateMeta( input_thread_t *, vlc_bool_t ); static void UpdateItemLength( input_thread_t *, int64_t i_length, vlc_bool_t ); -static void ParseOption( input_thread_t *p_input, const char *psz_option ); - static void DecodeUrl( char * ); static void MRLSections( input_thread_t *, char *, int *, int *, int *, int *); @@ -73,11 +75,9 @@ static void InputSourceClean( input_thread_t *, input_source_t * ); static void SlaveDemux( input_thread_t *p_input ); static void SlaveSeek( input_thread_t *p_input ); -static vlc_meta_t *InputMetaUser( input_thread_t *p_input ); +static void InputMetaUser( input_thread_t *p_input ); /***************************************************************************** - * input_CreateThread: creates a new input thread - ***************************************************************************** * This function creates a new input, and returns a pointer * to its description. On error, it returns NULL. * @@ -101,11 +101,10 @@ static vlc_meta_t *InputMetaUser( input_thread_t *p_input ); * TODO explain when Callback is called * TODO complete this list (?) *****************************************************************************/ -input_thread_t *__input_CreateThread( vlc_object_t *p_parent, - input_item_t *p_item ) - +static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item, + char *psz_header, vlc_bool_t b_quick ) { - input_thread_t *p_input; /* thread descriptor */ + input_thread_t *p_input = NULL; /* thread descriptor */ vlc_value_t val; int i; @@ -116,6 +115,7 @@ input_thread_t *__input_CreateThread( vlc_object_t *p_parent, msg_Err( p_parent, "out of memory" ); return NULL; } + p_input->psz_header = psz_header ? strdup( psz_header ) : NULL; /* Init Common fields */ p_input->b_eof = VLC_FALSE; @@ -149,6 +149,9 @@ input_thread_t *__input_CreateThread( vlc_object_t *p_parent, p_input->input.b_eof = VLC_FALSE; p_input->input.i_cr_average = 0; + p_input->input.p_item->p_meta = vlc_meta_New(); + stats_ReinitInputStats( p_item->p_stats ); + /* No slave */ p_input->i_slave = 0; p_input->slave = NULL; @@ -161,7 +164,7 @@ input_thread_t *__input_CreateThread( vlc_object_t *p_parent, vlc_mutex_lock( &p_item->lock ); for( i = 0; i < p_item->i_options; i++ ) { - ParseOption( p_input, p_item->ppsz_options[i] ); + var_OptionParse( p_input, p_item->ppsz_options[i] ); } vlc_mutex_unlock( &p_item->lock ); @@ -172,62 +175,90 @@ input_thread_t *__input_CreateThread( vlc_object_t *p_parent, input_ControlVarInit( p_input ); p_input->input.i_cr_average = var_GetInteger( p_input, "cr-average" ); - /* TODO */ - var_Get( p_input, "bookmarks", &val ); - if( val.psz_string ) + if( !b_quick ) { - /* FIXME: have a common cfg parsing routine used by sout and others */ - char *psz_parser, *psz_start, *psz_end; - psz_parser = val.psz_string; - while( (psz_start = strchr( psz_parser, '{' ) ) ) + var_Get( p_input, "bookmarks", &val ); + if( val.psz_string ) { - seekpoint_t *p_seekpoint = vlc_seekpoint_New(); - char backup; - psz_start++; - psz_end = strchr( psz_start, '}' ); - if( !psz_end ) break; - psz_parser = psz_end + 1; - backup = *psz_parser; - *psz_parser = 0; - *psz_end = ','; - - while( (psz_end = strchr( psz_start, ',' ) ) ) + /* FIXME: have a common cfg parsing routine used by sout and others */ + char *psz_parser, *psz_start, *psz_end; + psz_parser = val.psz_string; + while( (psz_start = strchr( psz_parser, '{' ) ) ) { - *psz_end = 0; - if( !strncmp( psz_start, "name=", 5 ) ) - { - p_seekpoint->psz_name = psz_start + 5; - } - else if( !strncmp( psz_start, "bytes=", 6 ) ) - { - p_seekpoint->i_byte_offset = atoll(psz_start + 6); - } - else if( !strncmp( psz_start, "time=", 5 ) ) - { - p_seekpoint->i_time_offset = atoll(psz_start + 5) * 1000000; + seekpoint_t *p_seekpoint = vlc_seekpoint_New(); + char backup; + psz_start++; + psz_end = strchr( psz_start, '}' ); + if( !psz_end ) break; + psz_parser = psz_end + 1; + backup = *psz_parser; + *psz_parser = 0; + *psz_end = ','; + while( (psz_end = strchr( psz_start, ',' ) ) ) + { + *psz_end = 0; + if( !strncmp( psz_start, "name=", 5 ) ) + { + p_seekpoint->psz_name = psz_start + 5; + } + else if( !strncmp( psz_start, "bytes=", 6 ) ) + { + p_seekpoint->i_byte_offset = atoll(psz_start + 6); + } + else if( !strncmp( psz_start, "time=", 5 ) ) + { + p_seekpoint->i_time_offset = atoll(psz_start + 5) * + 1000000; + } + psz_start = psz_end + 1; } - psz_start = psz_end + 1; + msg_Dbg( p_input, "adding bookmark: %s, bytes="I64Fd", time="I64Fd, + p_seekpoint->psz_name, p_seekpoint->i_byte_offset, + p_seekpoint->i_time_offset ); + input_Control( p_input, INPUT_ADD_BOOKMARK, p_seekpoint ); + vlc_seekpoint_Delete( p_seekpoint ); + *psz_parser = backup; } - msg_Dbg( p_input, "adding bookmark: %s, bytes="I64Fd", time="I64Fd, - p_seekpoint->psz_name, p_seekpoint->i_byte_offset, - p_seekpoint->i_time_offset ); - input_Control( p_input, INPUT_ADD_BOOKMARK, p_seekpoint ); - vlc_seekpoint_Delete( p_seekpoint ); - *psz_parser = backup; + free( val.psz_string ); } - free( val.psz_string ); } /* Remove 'Now playing' info as it is probably outdated */ - input_Control( p_input, INPUT_DEL_INFO, _("Meta-information"), - VLC_META_NOW_PLAYING ); + input_Control( p_input, INPUT_DEL_INFO, _(VLC_META_INFO_CAT), + VLC_META_NOW_PLAYING ); /* ? Don't translate as it might has been copied ? */ + + return p_input; +} + +/** + * Initialize an input thread and run it. You will need to monitor the thread to clean + * up after it is done + * + * \param p_parent a vlc_object + * \param p_item an input item + * \return a pointer to the spawned input thread + */ +input_thread_t *__input_CreateThread( vlc_object_t *p_parent, + input_item_t *p_item ) +{ + return __input_CreateThread2( p_parent, p_item, NULL ); +} + + +/* Gruik ! */ +input_thread_t *__input_CreateThread2( vlc_object_t *p_parent, + input_item_t *p_item, + char *psz_header ) +{ + input_thread_t *p_input = NULL; /* thread descriptor */ + p_input = Create( p_parent, p_item, psz_header, VLC_FALSE ); /* Now we can attach our new input */ vlc_object_attach( p_input, p_parent ); /* Create thread and wait for its readiness. */ if( vlc_thread_create( p_input, "input", Run, - VLC_THREAD_PRIORITY_INPUT, VLC_TRUE ) ) + VLC_THREAD_PRIORITY_INPUT, VLC_TRUE ) ) { msg_Err( p_input, "cannot create input thread" ); vlc_object_detach( p_input ); @@ -238,75 +269,60 @@ input_thread_t *__input_CreateThread( vlc_object_t *p_parent, return p_input; } -/***************************************************************************** - * input_PreParse: Lightweight input for playlist item preparsing - *****************************************************************************/ -int __input_Preparse( vlc_object_t *p_parent, input_item_t *p_item ) + +/** + * Initialize an input thread and run it. This thread will clean after himself, + * you can forget about it. It can work either in blocking or non-blocking mode + * + * \param p_parent a vlc_object + * \param p_item an input item + * \param b_block should we block until read is finished ? + * \return the input object id if non blocking, an error code else + */ +int __input_Read( vlc_object_t *p_parent, input_item_t *p_item, + vlc_bool_t b_block ) { - input_thread_t *p_input; /* thread descriptor */ - int i; + input_thread_t *p_input = NULL; /* thread descriptor */ - /* Allocate descriptor */ - p_input = vlc_object_create( p_parent, VLC_OBJECT_INPUT ); - if( p_input == NULL ) + p_input = Create( p_parent, p_item, NULL, VLC_FALSE ); + /* Now we can attach our new input */ + vlc_object_attach( p_input, p_parent ); + + if( b_block ) { - msg_Err( p_parent, "out of memory" ); - return VLC_EGENERIC; + RunAndClean( p_input ); + return VLC_SUCCESS; } - - /* Init Common fields */ - p_input->b_eof = VLC_FALSE; - p_input->b_can_pace_control = VLC_TRUE; - p_input->i_start = 0; - p_input->i_time = 0; - p_input->i_stop = 0; - p_input->i_title = 0; - p_input->title = NULL; - p_input->i_title_offset = p_input->i_seekpoint_offset = 0; - p_input->i_state = INIT_S; - p_input->i_rate = INPUT_RATE_DEFAULT; - p_input->i_bookmark = 0; - p_input->bookmark = NULL; - p_input->p_meta = NULL; - p_input->p_es_out = NULL; - p_input->p_sout = NULL; - p_input->b_out_pace_control = VLC_FALSE; - p_input->i_pts_delay = 0; - - /* Init Input fields */ - p_input->input.p_item = p_item; - p_input->input.p_access = NULL; - p_input->input.p_stream = NULL; - p_input->input.p_demux = NULL; - p_input->input.b_title_demux = VLC_FALSE; - p_input->input.i_title = 0; - p_input->input.title = NULL; - p_input->input.i_title_offset = p_input->input.i_seekpoint_offset = 0; - p_input->input.b_can_pace_control = VLC_TRUE; - p_input->input.b_eof = VLC_FALSE; - p_input->input.i_cr_average = 0; - - /* No slave */ - p_input->i_slave = 0; - p_input->slave = NULL; - - /* Init control buffer */ - vlc_mutex_init( p_input, &p_input->lock_control ); - p_input->i_control = 0; - - /* Parse input options */ - vlc_mutex_lock( &p_item->lock ); - for( i = 0; i < p_item->i_options; i++ ) + else { - ParseOption( p_input, p_item->ppsz_options[i] ); + if( vlc_thread_create( p_input, "input", RunAndClean, + VLC_THREAD_PRIORITY_INPUT, VLC_TRUE ) ) + { + msg_Err( p_input, "cannot create input thread" ); + vlc_object_detach( p_input ); + vlc_object_destroy( p_input ); + return VLC_EGENERIC; + } } - vlc_mutex_unlock( &p_item->lock ); + return p_input->i_object_id; +} - /* Create Object Variables for private use only */ - input_ConfigVarInit( p_input ); - input_ControlVarInit( p_input ); +/** + * Initialize an input and initialize it to preparse the item + * This function is blocking. It will only accept to parse files + * + * \param p_parent a vlc_object_t + * \param p_item an input item + * \return VLC_SUCCESS or an error + */ +int __input_Preparse( vlc_object_t *p_parent, input_item_t *p_item ) +{ + input_thread_t *p_input = NULL; /* thread descriptor */ - p_input->input.i_cr_average = var_GetInteger( p_input, "cr-average" ); + /* Allocate descriptor */ + p_input = Create( p_parent, p_item, NULL, VLC_TRUE ); + p_input->i_flags |= OBJECT_FLAGS_NODBG; + p_input->i_flags |= OBJECT_FLAGS_NOINTERACT; /* Now we can attach our new input */ vlc_object_attach( p_input, p_parent ); @@ -316,27 +332,20 @@ int __input_Preparse( vlc_object_t *p_parent, input_item_t *p_item ) /* Clean up master */ InputSourceClean( p_input, &p_input->input ); - /* Kill access and demux */ - if( p_input->input.p_access ) p_input->input.p_access->b_die = VLC_TRUE; - if( p_input->input.p_demux ) p_input->input.p_access->b_die = VLC_TRUE; - /* Unload all modules */ if( p_input->p_es_out ) input_EsOutDelete( p_input->p_es_out ); - /* Delete meta */ - if( p_input->p_meta ) vlc_meta_Delete( p_input->p_meta ); - vlc_object_detach( p_input ); vlc_object_destroy( p_input ); return VLC_SUCCESS; } -/***************************************************************************** - * input_StopThread: mark an input thread as zombie - ***************************************************************************** - * This function should not return until the thread is effectively cancelled. - *****************************************************************************/ +/** + * Request a running input thread to stop and die + * + * \param the input thread to stop + */ void input_StopThread( input_thread_t *p_input ) { vlc_list_t *p_list; @@ -375,11 +384,12 @@ void input_StopThread( input_thread_t *p_input ) input_ControlPush( p_input, INPUT_CONTROL_SET_DIE, NULL ); } -/***************************************************************************** - * input_DestroyThread: mark an input thread as zombie - ***************************************************************************** - * This function should not return until the thread is effectively cancelled. - *****************************************************************************/ +/** + * Clean up a dead input thread + * This function does not return until the thread is effectively cancelled. + * + * \param the input thread to kill + */ void input_DestroyThread( input_thread_t *p_input ) { /* Join the thread */ @@ -394,17 +404,11 @@ void input_DestroyThread( input_thread_t *p_input ) /***************************************************************************** * Run: main thread loop - ***************************************************************************** - * Thread in charge of processing the network packets and demultiplexing. - * - * TODO: - * read subtitle support (XXX take care of spu-delay in the right way). - * multi-input support (XXX may be done with subs) + * This is the "normal" thread that spawns the input processing chain, + * reads the stream, cleans up and waits *****************************************************************************/ static int Run( input_thread_t *p_input ) { - int64_t i_intf_update = 0; - /* Signal that the thread is launched */ vlc_thread_ready( p_input ); @@ -421,7 +425,88 @@ static int Run( input_thread_t *p_input ) return 0; } - /* Main loop */ + MainLoop( p_input ); + + if( !p_input->b_eof && !p_input->b_error && p_input->input.b_eof ) + { + /* We have finish to demux data but not to play them */ + while( !p_input->b_die ) + { + if( input_EsOutDecodersEmpty( p_input->p_es_out ) ) + break; + + msg_Dbg( p_input, "waiting decoder fifos to empty" ); + + msleep( INPUT_IDLE_SLEEP ); + } + + /* We have finished */ + p_input->b_eof = VLC_TRUE; + } + + /* Wait we are asked to die */ + if( !p_input->b_die ) + { + Error( p_input ); + } + + /* Clean up */ + End( p_input ); + + return 0; +} + +/***************************************************************************** + * RunAndClean: main thread loop + * This is the "just forget me" thread that spawns the input processing chain, + * reads the stream, cleans up and releases memory + *****************************************************************************/ +static int RunAndClean( input_thread_t *p_input ) +{ + /* Signal that the thread is launched */ + vlc_thread_ready( p_input ); + + if( Init( p_input, VLC_FALSE ) ) + { + /* If we failed, just exit */ + return 0; + } + + MainLoop( p_input ); + + if( !p_input->b_eof && !p_input->b_error && p_input->input.b_eof ) + { + /* We have finish to demux data but not to play them */ + while( !p_input->b_die ) + { + if( input_EsOutDecodersEmpty( p_input->p_es_out ) ) + break; + + msg_Dbg( p_input, "waiting decoder fifos to empty" ); + + msleep( INPUT_IDLE_SLEEP ); + } + /* We have finished */ + p_input->b_eof = VLC_TRUE; + } + + /* Clean up */ + End( p_input ); + + /* Release memory */ + vlc_object_detach( p_input ); + vlc_object_destroy( p_input ); + + return 0; +} + + +/***************************************************************************** + * Main loop: Fill buffers from access, and demux + *****************************************************************************/ +static void MainLoop( input_thread_t *p_input ) +{ + int64_t i_intf_update = 0; while( !p_input->b_die && !p_input->b_error && !p_input->input.b_eof ) { vlc_bool_t b_force_update = VLC_FALSE; @@ -570,34 +655,6 @@ static int Run( input_thread_t *p_input ) i_intf_update = mdate() + I64C(150000); } } - - if( !p_input->b_eof && !p_input->b_error && p_input->input.b_eof ) - { - /* We have finish to demux data but not to play them */ - while( !p_input->b_die ) - { - if( input_EsOutDecodersEmpty( p_input->p_es_out ) ) - break; - - msg_Dbg( p_input, "waiting decoder fifos to empty" ); - - msleep( INPUT_IDLE_SLEEP ); - } - - /* We have finished */ - p_input->b_eof = VLC_TRUE; - } - - /* Wait we are asked to die */ - if( !p_input->b_die ) - { - Error( p_input ); - } - - /* Clean up */ - End( p_input ); - - return 0; } @@ -607,7 +664,7 @@ static int Init( input_thread_t * p_input, vlc_bool_t b_quick ) char *psz_subtitle; vlc_value_t val; double f_fps; - vlc_meta_t *p_meta, *p_meta_tmp; + vlc_meta_t *p_meta; int i_es_out_mode; int i, i_delay; @@ -620,6 +677,32 @@ static int Init( input_thread_t * p_input, vlc_bool_t b_quick ) */ if( !b_quick ) { + /* Prepare statistics */ + counter_t *p_counter; + stats_Create( p_input, "read_bytes", STATS_READ_BYTES, + VLC_VAR_INTEGER, STATS_COUNTER ); + stats_Create( p_input, "read_packets", STATS_READ_PACKETS, + VLC_VAR_INTEGER, STATS_COUNTER ); + stats_Create( p_input, "demux_read", STATS_DEMUX_READ, + VLC_VAR_INTEGER, STATS_COUNTER ); + stats_Create( p_input, "input_bitrate", STATS_INPUT_BITRATE, + VLC_VAR_FLOAT, STATS_DERIVATIVE ); + stats_Create( p_input, "demux_bitrate", STATS_DEMUX_BITRATE, + VLC_VAR_FLOAT, STATS_DERIVATIVE ); + + p_counter = stats_CounterGet( p_input, p_input->i_object_id, + STATS_INPUT_BITRATE ); + if( p_counter ) p_counter->update_interval = 1000000; + p_counter = stats_CounterGet( p_input, p_input->i_object_id, + STATS_DEMUX_BITRATE ); + if( p_counter ) p_counter->update_interval = 1000000; + + stats_Create( p_input, "played_abuffers", STATS_PLAYED_ABUFFERS, + VLC_VAR_INTEGER, STATS_COUNTER ); + stats_Create( p_input, "lost_abuffers", STATS_LOST_ABUFFERS, + VLC_VAR_INTEGER, STATS_COUNTER ); + + /* handle sout */ psz = var_GetString( p_input, "sout" ); if( *psz && strncasecmp( p_input->input.p_item->psz_uri, "vlc:", 4 ) ) { @@ -640,6 +723,9 @@ static int Init( input_thread_t * p_input, vlc_bool_t b_quick ) es_out_Control( p_input->p_es_out, ES_OUT_SET_ACTIVE, VLC_FALSE ); es_out_Control( p_input->p_es_out, ES_OUT_SET_MODE, ES_OUT_MODE_NONE ); + var_Create( p_input, "bit-rate", VLC_VAR_INTEGER ); + var_Create( p_input, "sample-rate", VLC_VAR_INTEGER ); + if( InputSourceInit( p_input, &p_input->input, p_input->input.p_item->psz_uri, NULL, b_quick ) ) { @@ -799,12 +885,12 @@ static int Init( input_thread_t * p_input, vlc_bool_t b_quick ) var_Get( p_input, "sub-autodetect-file", &val ); if( val.b_bool ) { - char *psz_autopath = var_GetString( p_input, "sub-autodetect-path" ); + char *psz_autopath = var_GetString( p_input, "sub-autodetect-path" ); char **subs = subtitles_Detect( p_input, psz_autopath, p_input->input.p_item->psz_uri ); input_source_t *sub; - for( i = 0; subs[i] != NULL; i++ ) + for( i = 0; subs && subs[i]; i++ ) { if( strcmp( psz_subtitle, subs[i] ) ) { @@ -817,8 +903,8 @@ static int Init( input_thread_t * p_input, vlc_bool_t b_quick ) } free( subs[i] ); } - free( subs ); - free( psz_autopath ); + if( subs ) free( subs ); + if( psz_autopath ) free( psz_autopath ); } free( psz_subtitle ); @@ -928,79 +1014,32 @@ static int Init( input_thread_t * p_input, vlc_bool_t b_quick ) } } + p_meta = p_input->input.p_item->p_meta; /* Get meta data from users */ - p_meta_tmp = InputMetaUser( p_input ); - + InputMetaUser( p_input ); /* Get meta data from master input */ - if( demux2_Control( p_input->input.p_demux, DEMUX_GET_META, &p_meta ) ) - p_meta = NULL; - - /* Merge them */ - if( p_meta == NULL ) - { - p_meta = p_meta_tmp; - } - else if( p_meta_tmp ) - { - vlc_meta_Merge( p_meta, p_meta_tmp ); - vlc_meta_Delete( p_meta_tmp ); - } + demux2_Control( p_input->input.p_demux, DEMUX_GET_META, p_meta ); /* Access_file does not give any meta, and there are no slave */ if( !b_quick ) { - if( !p_input->input.p_access || + if( p_input->input.p_access ) access2_Control( p_input->input.p_access, ACCESS_GET_META, - &p_meta_tmp)) - p_meta_tmp = NULL; - - if( p_meta == NULL ) - { - p_meta = p_meta_tmp; - } - else if( p_meta_tmp ) - { - vlc_meta_Merge( p_meta, p_meta_tmp ); - vlc_meta_Delete( p_meta_tmp ); - } + p_meta ); /* Get meta data from slave input */ for( i = 0; i < p_input->i_slave; i++ ) { - vlc_meta_t *p_meta_slave; - - if( !demux2_Control( p_input->slave[i]->p_demux, - DEMUX_GET_META, &p_meta_slave ) ) + demux2_Control( p_input->slave[i]->p_demux, + DEMUX_GET_META, p_meta ); + if( p_input->slave[i]->p_access ) { - if( p_meta == NULL ) - { - p_meta = p_meta_slave; - } - else if( p_meta_slave ) - { - vlc_meta_Merge( p_meta, p_meta_slave ); - vlc_meta_Delete( p_meta_slave ); - } - } - - if( p_input->slave[i]->p_access && - !access2_Control( p_input->slave[i]->p_access, - ACCESS_GET_META, &p_meta_slave ) ) - { - if( p_meta == NULL ) - { - p_meta = p_meta_slave; - } - else if( p_meta_slave ) - { - vlc_meta_Merge( p_meta, p_meta_slave ); - vlc_meta_Delete( p_meta_slave ); - } + access2_Control( p_input->slave[i]->p_access, + ACCESS_GET_META, p_meta ); } } } - p_input->p_meta = p_meta; UpdateMeta( p_input, b_quick ); if( !b_quick ) @@ -1010,11 +1049,6 @@ static int Init( input_thread_t * p_input, vlc_bool_t b_quick ) } - /* Trigger intf update for this item */ - /* Playlist has a callback on this variable and will forward - * it to intf */ - var_SetInteger( p_input, "item-change", p_input->input.p_item->i_id ); - /* initialization is complete */ p_input->i_state = PLAYING_S; @@ -1098,23 +1132,19 @@ static void End( input_thread_t * p_input ) if( var_Get( p_input, "sout-keep", &keep ) >= 0 && keep.b_bool && p_pl ) { /* attach sout to the playlist */ - msg_Warn( p_input, "keeping sout" ); + msg_Dbg( p_input, "keeping sout" ); vlc_object_detach( p_input->p_sout ); vlc_object_attach( p_input->p_sout, p_pl ); } else { - msg_Warn( p_input, "destroying sout" ); + msg_Dbg( p_input, "destroying sout" ); sout_DeleteInstance( p_input->p_sout ); } if( p_pl ) vlc_object_release( p_pl ); } - /* Delete meta */ - if( p_input->p_meta ) - vlc_meta_Delete( p_input->p_meta ); - /* Tell we're dead */ p_input->b_dead = VLC_TRUE; } @@ -1194,6 +1224,8 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type, { vlc_bool_t b_force_update = VLC_FALSE; + if( !p_input ) return b_force_update; + switch( i_type ) { case INPUT_CONTROL_SET_DIE: @@ -1239,8 +1271,6 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type, if( p_input->i_slave > 0 ) SlaveSeek( p_input ); - //input_EsOutDiscontinuity( p_input->p_es_out, VLC_FALSE ); - //es_out_Control( p_input->p_es_out, ES_OUT_RESET_PCR ); b_force_update = VLC_TRUE; } break; @@ -1274,8 +1304,8 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type, if( i_ret ) { int64_t i_length; - /* Emulate it with a SET_POS */ + /* Emulate it with a SET_POS */ demux2_Control( p_input->input.p_demux, DEMUX_GET_LENGTH, &i_length ); if( i_length > 0 ) @@ -1287,16 +1317,14 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type, } if( i_ret ) { - msg_Err( p_input, "INPUT_CONTROL_SET_TIME(_OFFSET) "I64Fd - " failed", i_time ); + msg_Warn( p_input, "INPUT_CONTROL_SET_TIME(_OFFSET) "I64Fd + " failed or not possible", i_time ); } else { if( p_input->i_slave > 0 ) SlaveSeek( p_input ); - //input_EsOutDiscontinuity( p_input->p_es_out, VLC_FALSE ); - //es_out_Control( p_input->p_es_out, ES_OUT_RESET_PCR ); b_force_update = VLC_TRUE; } break; @@ -1332,6 +1360,7 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type, /* Reset clock */ es_out_Control( p_input->p_es_out, ES_OUT_RESET_PCR ); + input_EsOutDiscontinuity( p_input->p_es_out, VLC_FALSE ); } else if( val.i_int == PAUSE_S && p_input->i_state == PLAYING_S && p_input->b_can_pause ) @@ -1470,11 +1499,10 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type, if( i_title >= 0 && i_title < p_input->input.i_title ) { - demux2_Control( p_demux, DEMUX_SET_TITLE, i_title ); - input_EsOutDiscontinuity( p_input->p_es_out, VLC_FALSE ); es_out_Control( p_input->p_es_out, ES_OUT_RESET_PCR ); + demux2_Control( p_demux, DEMUX_SET_TITLE, i_title ); input_ControlVarTitle( p_input, i_title ); } } @@ -1492,11 +1520,11 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type, if( i_title >= 0 && i_title < p_input->input.i_title ) { - access2_Control( p_access, ACCESS_SET_TITLE, i_title ); - stream_AccessReset( p_input->input.p_stream ); - input_EsOutDiscontinuity( p_input->p_es_out, VLC_FALSE ); es_out_Control( p_input->p_es_out, ES_OUT_RESET_PCR ); + + access2_Control( p_access, ACCESS_SET_TITLE, i_title ); + stream_AccessReset( p_input->input.p_stream ); } } break; @@ -1533,10 +1561,10 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type, if( i_seekpoint >= 0 && i_seekpoint < p_input->input.title[p_demux->info.i_title]->i_seekpoint ) { - demux2_Control( p_demux, DEMUX_SET_SEEKPOINT, i_seekpoint ); - input_EsOutDiscontinuity( p_input->p_es_out, VLC_FALSE ); es_out_Control( p_input->p_es_out, ES_OUT_RESET_PCR ); + + demux2_Control( p_demux, DEMUX_SET_SEEKPOINT, i_seekpoint ); } } else if( p_input->input.i_title > 0 ) @@ -1569,11 +1597,12 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type, if( i_seekpoint >= 0 && i_seekpoint < p_input->input.title[p_access->info.i_title]->i_seekpoint ) { - access2_Control( p_access, ACCESS_SET_SEEKPOINT, i_seekpoint ); - stream_AccessReset( p_input->input.p_stream ); - input_EsOutDiscontinuity( p_input->p_es_out, VLC_FALSE ); es_out_Control( p_input->p_es_out, ES_OUT_RESET_PCR ); + + access2_Control( p_access, ACCESS_SET_SEEKPOINT, + i_seekpoint ); + stream_AccessReset( p_input->input.p_stream ); } } break; @@ -1586,8 +1615,7 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type, if( !InputSourceInit( p_input, slave, val.psz_string, NULL, VLC_FALSE ) ) { - vlc_meta_t *p_meta_new = NULL; - vlc_meta_t *p_meta; + vlc_meta_t *p_meta = p_input->input.p_item->p_meta; int64_t i_time; /* Add the slave */ @@ -1612,38 +1640,11 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type, break; } - /* Get meta (access and demux) */ - if( access2_Control( slave->p_access, - ACCESS_GET_META, &p_meta_new ) ) - p_meta_new = NULL; - if( !demux2_Control( slave->p_demux, - DEMUX_GET_META, &p_meta ) ) - { - if( p_meta_new ) - { - vlc_meta_Merge( p_meta_new, p_meta ); - vlc_meta_Delete( p_meta ); - } - else - { - p_meta_new = p_meta; - } - } - /* Update meta */ - if( p_meta_new ) - { - if( p_input->p_meta ) - { - vlc_meta_Merge( p_input->p_meta, p_meta_new ); - vlc_meta_Delete( p_meta_new ); - } - else - { - p_input->p_meta = p_meta_new; - } - UpdateMeta( p_input, VLC_FALSE ); - } + access2_Control( slave->p_access, ACCESS_GET_META, + p_meta ); + demux2_Control( slave->p_demux, DEMUX_GET_META, p_meta ); + UpdateMeta( p_input, VLC_FALSE ); TAB_APPEND( p_input->i_slave, p_input->slave, slave ); } @@ -1742,28 +1743,15 @@ static int UpdateFromAccess( input_thread_t *p_input ) { v.i_int = p_access->info.i_seekpoint; var_Change( p_input, "chapter", VLC_VAR_SETVALUE, &v, NULL); - p_access->info.i_update &= ~INPUT_UPDATE_SEEKPOINT; } if( p_access->info.i_update & INPUT_UPDATE_META ) { /* TODO maybe multi - access ? */ - vlc_meta_t *p_meta; - if( !access2_Control( p_input->input.p_access,ACCESS_GET_META,&p_meta)) - { - if( p_input->p_meta ) - { - vlc_meta_Merge( p_input->p_meta, p_meta ); - vlc_meta_Delete( p_meta ); - } - else - { - p_input->p_meta = p_meta; - } - - UpdateMeta( p_input, VLC_FALSE ); - var_SetBool( p_input, "item-change", p_input->input.p_item->i_id ); - } + vlc_meta_t *p_meta = p_input->input.p_item->p_meta; + access2_Control( p_input->input.p_access,ACCESS_GET_META, p_meta ); + UpdateMeta( p_input, VLC_FALSE ); + var_SetBool( p_input, "item-change", p_input->input.p_item->i_id ); p_access->info.i_update &= ~INPUT_UPDATE_META; } @@ -1801,58 +1789,14 @@ static int UpdateFromAccess( input_thread_t *p_input ) *****************************************************************************/ static int UpdateMeta( input_thread_t *p_input, vlc_bool_t b_quick ) { - vlc_meta_t *p_meta = p_input->p_meta; - int i; - - if( !p_meta || p_meta->i_meta == 0 ) + vlc_meta_t *p_meta = p_input->input.p_item->p_meta; + if( !p_meta ) return VLC_SUCCESS; - if( !b_quick ) msg_Dbg( p_input, "meta information:" ); - for( i = 0; i < p_meta->i_meta; i++ ) - { - if( !b_quick ) - msg_Dbg( p_input, " - '%s' = '%s'", - _(p_meta->name[i]), p_meta->value[i] ); + if( p_meta->psz_title && !p_input->input.p_item->b_fixed_name ) + input_Control( p_input, INPUT_SET_NAME, p_meta->psz_title ); - if( !strcmp(p_meta->name[i], VLC_META_TITLE) && p_meta->value[i] && - !p_input->input.p_item->b_fixed_name ) - input_Control( p_input, INPUT_SET_NAME, p_meta->value[i] ); - - if( !strcmp( p_meta->name[i], VLC_META_AUTHOR ) ) - input_Control( p_input, INPUT_ADD_INFO, _("General"), - _("Author"), p_meta->value[i] ); - - input_Control( p_input, INPUT_ADD_INFO, _("Meta-information"), - _(p_meta->name[i]), "%s", p_meta->value[i] ); - } - - for( i = 0; i < p_meta->i_track; i++ ) - { - vlc_meta_t *tk = p_meta->track[i]; - int j; - - if( tk->i_meta > 0 ) - { - char *psz_cat = malloc( strlen(_("Stream")) + 10 ); - - msg_Dbg( p_input, " - track[%d]:", i ); - - sprintf( psz_cat, "%s %d", _("Stream"), i ); - for( j = 0; j < tk->i_meta; j++ ) - { - msg_Dbg( p_input, " - '%s' = '%s'", _(tk->name[j]), - tk->value[j] ); - - input_Control( p_input, INPUT_ADD_INFO, psz_cat, - _(tk->name[j]), "%s", tk->value[j] ); - } - } - } - - if( p_input->p_sout && p_input->p_sout->p_meta == NULL ) - { - p_input->p_sout->p_meta = vlc_meta_Duplicate( p_meta ); - } + /** \todo handle sout meta */ return VLC_SUCCESS; } @@ -1888,7 +1832,13 @@ static void UpdateItemLength( input_thread_t *p_input, int64_t i_length, *****************************************************************************/ static input_source_t *InputSourceNew( input_thread_t *p_input ) { - input_source_t *in = malloc( sizeof( input_source_t ) ); + input_source_t *in = (input_source_t*) malloc( sizeof( input_source_t ) ); + + if( !in ) + { + msg_Err( p_input, "out of memory for new input source" ); + return NULL; + } in->p_item = NULL; in->p_access = NULL; @@ -1919,6 +1869,8 @@ static int InputSourceInit( input_thread_t *p_input, char *psz; vlc_value_t val; + if( !in ) return VLC_EGENERIC; + /* Split uri */ if( !b_quick ) { @@ -1938,7 +1890,28 @@ static int InputSourceInit( input_thread_t *p_input, &in->i_seekpoint_start, &in->i_seekpoint_end ); if( psz_forced_demux && *psz_forced_demux ) + { psz_demux = psz_forced_demux; + } + else if( !psz_demux || *psz_demux == '\0' ) + { + /* special hack for forcing a demuxer with --demux=module + * (and do nothing with a list) */ + char *psz_var_demux = var_GetString( p_input, "demux" ); + + if( *psz_var_demux != '\0' && + !strchr(psz_var_demux, ',' ) && + !strchr(psz_var_demux, ':' ) ) + { + psz_demux = psz_var_demux; + + msg_Dbg( p_input, "enforced demux ` %s'", psz_demux ); + } + else if( psz_var_demux ) + { + free( psz_var_demux ); + } + } /* Try access_demux if no demux given */ if( *psz_demux == '\0' ) @@ -1950,7 +1923,7 @@ static int InputSourceInit( input_thread_t *p_input, else { psz_path = psz_mrl; - msg_Dbg( p_input, "trying to preparse %s", psz_path ); + msg_Dbg( p_input, "trying to pre-parse %s", psz_path ); psz_demux = strdup( "" ); psz_access = strdup( "file" ); } @@ -2009,10 +1982,14 @@ static int InputSourceInit( input_thread_t *p_input, if( in->p_access == NULL && *psz_access == '\0' && ( *psz_demux || *psz_path ) ) { - free( psz_dup ); + if( psz_dup ) free( psz_dup ); psz_dup = strdup( psz_mrl ); psz_access = ""; - psz_demux = ""; + if( psz_forced_demux && *psz_forced_demux ) + { + psz_demux = psz_forced_demux; + } + else psz_demux = ""; psz_path = psz_dup; in->p_access = access2_New( p_input, @@ -2024,6 +2001,8 @@ static int InputSourceInit( input_thread_t *p_input, if( in->p_access == NULL ) { msg_Err( p_input, "no suitable access module for `%s'", psz_mrl ); + intf_UserFatal( VLC_OBJECT( p_input), + _("Errors"),"Unable to open '%s'", psz_mrl ); goto error; } @@ -2047,7 +2026,7 @@ static int InputSourceInit( input_thread_t *p_input, psz = end; } - free( psz_tmp ); + if( psz_tmp ) free( psz_tmp ); /* Get infos from access */ if( !b_quick ) @@ -2093,6 +2072,8 @@ static int InputSourceInit( input_thread_t *p_input, { msg_Err( p_input, "no suitable demux module for `%s/%s://%s'", psz_access, psz_demux, psz_path ); + intf_UserFatal( VLC_OBJECT( p_input), _("Errors"), + "Unrecognized format for '%s'", psz_mrl ); goto error; } @@ -2116,7 +2097,7 @@ static int InputSourceInit( input_thread_t *p_input, if( var_GetInteger( p_input, "clock-synchro" ) != -1 ) in->b_can_pace_control = !var_GetInteger( p_input, "clock-synchro" ); - free( psz_dup ); + if( psz_dup ) free( psz_dup ); return VLC_SUCCESS; error: @@ -2128,7 +2109,7 @@ error: if( in->p_access ) access2_Delete( in->p_access ); - free( psz_dup ); + if( psz_dup ) free( psz_dup ); return VLC_EGENERIC; } @@ -2162,6 +2143,7 @@ static void SlaveDemux( input_thread_t *p_input ) { int64_t i_time; int i; + if( demux2_Control( p_input->input.p_demux, DEMUX_GET_TIME, &i_time ) ) { msg_Err( p_input, "demux doesn't like DEMUX_GET_TIME" ); @@ -2234,32 +2216,31 @@ static void SlaveSeek( input_thread_t *p_input ) /***************************************************************************** * InputMetaUser: *****************************************************************************/ -static vlc_meta_t *InputMetaUser( input_thread_t *p_input ) +static void InputMetaUser( input_thread_t *p_input ) { - vlc_meta_t *p_meta; + vlc_meta_t *p_meta = p_input->input.p_item->p_meta; vlc_value_t val; - if( ( p_meta = vlc_meta_New() ) == NULL ) - return NULL; + if( !p_meta ) return; /* Get meta information from user */ -#define GET_META( c, s ) \ +#define GET_META( field, s ) \ var_Get( p_input, (s), &val ); \ - if( *val.psz_string ) \ - vlc_meta_Add( p_meta, c, val.psz_string ); \ + if( *val.psz_string ) { \ + if( p_meta->psz_ ## field ) free ( p_meta->psz_ ## field ); \ + p_meta->psz_ ## field = strdup( val.psz_string ); \ + } \ free( val.psz_string ) - GET_META( VLC_META_TITLE, "meta-title" ); - GET_META( VLC_META_AUTHOR, "meta-author" ); - GET_META( VLC_META_ARTIST, "meta-artist" ); - GET_META( VLC_META_GENRE, "meta-genre" ); - GET_META( VLC_META_COPYRIGHT, "meta-copyright" ); - GET_META( VLC_META_DESCRIPTION, "meta-description" ); - GET_META( VLC_META_DATE, "meta-date" ); - GET_META( VLC_META_URL, "meta-url" ); + GET_META( title, "meta-title" ); + GET_META( author, "meta-author" ); + GET_META( artist, "meta-artist" ); + GET_META( genre, "meta-genre" ); + GET_META( copyright, "meta-copyright" ); + GET_META( description, "meta-description" ); + GET_META( date, "meta-date" ); + GET_META( url, "meta-url" ); #undef GET_META - - return p_meta; } /***************************************************************************** @@ -2297,106 +2278,8 @@ static void DecodeUrl( char *psz ) *psz++ = *p++; } } - *psz++ ='\0'; - free( dup ); -} - -/***************************************************************************** - * ParseOption: parses the options for the input - ***************************************************************************** - * This function parses the input (config) options and creates their associated - * object variables. - * Options are of the form "[no[-]]foo[=bar]" where foo is the option name and - * bar is the value of the option. - *****************************************************************************/ -static void ParseOption( input_thread_t *p_input, const char *psz_option ) -{ - char *psz_name = (char *)psz_option; - char *psz_value = strchr( psz_option, '=' ); - int i_name_len, i_type; - vlc_bool_t b_isno = VLC_FALSE; - vlc_value_t val; - - if( psz_value ) i_name_len = psz_value - psz_option; - else i_name_len = strlen( psz_option ); - - /* It's too much of an hassle to remove the ':' when we parse - * the cmd line :) */ - if( i_name_len && *psz_name == ':' ) - { - psz_name++; - i_name_len--; - } - - if( i_name_len == 0 ) return; - - psz_name = strndup( psz_name, i_name_len ); - if( psz_value ) psz_value++; - - i_type = config_GetType( p_input, psz_name ); - - if( !i_type && !psz_value ) - { - /* check for "no-foo" or "nofoo" */ - if( !strncmp( psz_name, "no-", 3 ) ) - { - memmove( psz_name, psz_name + 3, strlen(psz_name) + 1 - 3 ); - } - else if( !strncmp( psz_name, "no", 2 ) ) - { - memmove( psz_name, psz_name + 2, strlen(psz_name) + 1 - 2 ); - } - else goto cleanup; /* Option doesn't exist */ - - b_isno = VLC_TRUE; - i_type = config_GetType( p_input, psz_name ); - - if( !i_type ) goto cleanup; /* Option doesn't exist */ - } - else if( !i_type ) goto cleanup; /* Option doesn't exist */ - - if( ( i_type != VLC_VAR_BOOL ) && - ( !psz_value || !*psz_value ) ) goto cleanup; /* Invalid value */ - - /* Create the variable in the input object. - * Children of the input object will be able to retreive this value - * thanks to the inheritance property of the object variables. */ - var_Create( p_input, psz_name, i_type ); - - switch( i_type ) - { - case VLC_VAR_BOOL: - val.b_bool = !b_isno; - break; - - case VLC_VAR_INTEGER: - val.i_int = atoi( psz_value ); - break; - - case VLC_VAR_FLOAT: - val.f_float = atof( psz_value ); - break; - - case VLC_VAR_STRING: - case VLC_VAR_MODULE: - case VLC_VAR_FILE: - case VLC_VAR_DIRECTORY: - val.psz_string = psz_value; - break; - - default: - goto cleanup; - break; - } - - var_Set( p_input, psz_name, val ); - - msg_Dbg( p_input, "set input option: %s to %s", psz_name, - psz_value ? psz_value : ( val.b_bool ? "true" : "false") ); - - cleanup: - if( psz_name ) free( psz_name ); - return; + if( psz ) *psz++ ='\0'; + if( dup ) free( dup ); } /***************************************************************************** @@ -2523,114 +2406,3 @@ static void MRLSections( input_thread_t *p_input, char *psz_source, psz_source, *pi_title_start, *pi_chapter_start, *pi_title_end, *pi_chapter_end ); } - - -/*********************************************************************** - * Info management functions - ***********************************************************************/ -/** - * Get a info item from a given category in a given input item. - * - * \param p_i The input item to get info from - * \param psz_cat String representing the category for the info - * \param psz_name String representing the name of the desired info - * \return A pointer to the string with the given info if found, or an - * empty string otherwise. The caller should free the returned - * pointer. - */ -char *vlc_input_item_GetInfo( input_item_t *p_i, - const char *psz_cat, - const char *psz_name ) -{ - int i,j; - - vlc_mutex_lock( &p_i->lock ); - - for( i = 0 ; i< p_i->i_categories ; i++ ) - { - info_category_t *p_cat = p_i->pp_categories[i]; - - if( !psz_cat || strcmp( p_cat->psz_name, psz_cat ) ) - continue; - - for( j = 0; j < p_cat->i_infos ; j++ ) - { - if( !strcmp( p_cat->pp_infos[j]->psz_name, psz_name ) ) - { - char *psz_ret = strdup( p_cat->pp_infos[j]->psz_value ); - vlc_mutex_unlock( &p_i->lock ); - return psz_ret; - } - } - } - vlc_mutex_unlock( &p_i->lock ); - return strdup( "" ); -} - -int vlc_input_item_AddInfo( input_item_t *p_i, - const char *psz_cat, - const char *psz_name, - const char *psz_format, ... ) -{ - va_list args; - int i; - info_t *p_info = NULL; - info_category_t *p_cat = NULL ; - - vlc_mutex_lock( &p_i->lock ); - - for( i = 0 ; i < p_i->i_categories ; i ++ ) - { - if( !strcmp( p_i->pp_categories[i]->psz_name, psz_cat ) ) - { - p_cat = p_i->pp_categories[i]; - break; - } - } - if( !p_cat ) - { - if( !(p_cat = (info_category_t *)malloc( sizeof(info_category_t) )) ) - { - vlc_mutex_unlock( &p_i->lock ); - return VLC_EGENERIC; - } - p_cat->psz_name = strdup( psz_cat ); - p_cat->i_infos = 0; - p_cat->pp_infos = 0; - INSERT_ELEM( p_i->pp_categories, p_i->i_categories, p_i->i_categories, - p_cat ); - } - - for( i = 0; i< p_cat->i_infos; i++ ) - { - if( !strcmp( p_cat->pp_infos[i]->psz_name, psz_name ) ) - { - p_info = p_cat->pp_infos[i]; - break; - } - } - - if( !p_info ) - { - if( ( p_info = (info_t *)malloc( sizeof( info_t ) ) ) == NULL ) - { - vlc_mutex_unlock( &p_i->lock ); - return VLC_EGENERIC; - } - INSERT_ELEM( p_cat->pp_infos, p_cat->i_infos, p_cat->i_infos, p_info ); - p_info->psz_name = strdup( psz_name ); - } - else - { - if( p_info->psz_value ) free( p_info->psz_value ); - } - - va_start( args, psz_format ); - vasprintf( &p_info->psz_value, psz_format, args); - va_end( args ); - - vlc_mutex_unlock( &p_i->lock ); - - return VLC_SUCCESS; -} -