X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finput%2Finput.c;h=0740c01fb0e4550d648c084c31e191a395245ada;hb=03ed4ccc656086751c3aaf39e0a2b0013f95d972;hp=01fdc2f8be893985ac2aafddd551b5f72907f0b4;hpb=6f2c07b9f42c241fdc75456095dc29320aba4849;p=vlc diff --git a/src/input/input.c b/src/input/input.c index 01fdc2f8be..0740c01fb0 100644 --- a/src/input/input.c +++ b/src/input/input.c @@ -1,12 +1,11 @@ /***************************************************************************** * input.c: input thread - * Read a stream, demultiplex and parse it before sending it to - * decoders. ***************************************************************************** * Copyright (C) 1998-2004 VideoLAN * $Id$ * * Authors: Christophe Massiot + * Laurent Aimar * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -33,64 +32,74 @@ #include #include -#ifdef HAVE_SYS_TIMES_H -# include -#endif +#include "input_internal.h" #include "stream_output.h" #include "vlc_interface.h" -#include "codecs.h" #include "vlc_meta.h" -#include "../../modules/demux/util/sub.h" /***************************************************************************** * Local prototypes *****************************************************************************/ -struct input_thread_sys_t -{ - /* subtitles */ - int i_sub; - subtitle_demux_t **sub; +static int Run ( input_thread_t *p_input ); + +static int Init ( input_thread_t *p_input ); +static void Error( input_thread_t *p_input ); +static void End ( 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 ); - int64_t i_stop_time; -}; -static int RunThread ( input_thread_t *p_input ); -static int InitThread ( input_thread_t *p_input ); -static void ErrorThread( input_thread_t *p_input ); -static void EndThread ( input_thread_t *p_input ); +static void UpdateFromAccess( input_thread_t * ); +static void UpdateFromDemux( input_thread_t * ); static void ParseOption( input_thread_t *p_input, const char *psz_option ); static void DecodeUrl ( char * ); +static void MRLSplit( input_thread_t *, char *, char **, char **, char ** ); -/***************************************************************************** - * Callbacks - *****************************************************************************/ -static int PositionCallback( vlc_object_t *p_this, char const *psz_cmd, - vlc_value_t oldval, vlc_value_t newval, void *p_data ); -static int TimeCallback ( vlc_object_t *p_this, char const *psz_cmd, - vlc_value_t oldval, vlc_value_t newval, void *p_data ); -static int StateCallback ( vlc_object_t *p_this, char const *psz_cmd, - vlc_value_t oldval, vlc_value_t newval, void *p_data ); -static int RateCallback ( vlc_object_t *p_this, char const *psz_cmd, - vlc_value_t oldval, vlc_value_t newval, void *p_data ); -static int BookmarkCallback( vlc_object_t *p_this, char const *psz_cmd, - vlc_value_t oldval, vlc_value_t newval, void *p_data ); +static input_source_t *InputSourceNew( input_thread_t *); +static int InputSourceInit( input_thread_t *, input_source_t *, + char *, char *psz_forced_demux ); +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 ); /***************************************************************************** * 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. + * + * Variables for _public_ use: + * * Get and Set: + * - state + * - rate,rate-slower, rate-faster + * - position, position-offset + * - time, time-offset + * - title,title-next,title-prev + * - chapter,chapter-next, chapter-prev + * - program, audio-es, video-es, spu-es + * - audio-delay, spu-delay + * - bookmark + * * Get only: + * - length + * - bookmarks + * - seekable (if you can seek, it doesn't say if 'bar display' has be shown or not, for that check position != 0.0) + * * For intf callback upon changes + * - intf-change + * 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 ) { input_thread_t *p_input; /* thread descriptor */ - vlc_value_t val; int i; /* Allocate descriptor */ @@ -101,8 +110,43 @@ input_thread_t *__input_CreateThread( vlc_object_t *p_parent, return NULL; } - /* Store pointer to input item descriptor */ - p_input->p_item = p_item; + /* 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_state = INIT_S; + p_input->i_rate = INPUT_RATE_DEFAULT; + p_input->i_bookmark = 0; + p_input->bookmark = 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.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 ); @@ -113,165 +157,15 @@ input_thread_t *__input_CreateThread( vlc_object_t *p_parent, } vlc_mutex_unlock( &p_item->lock ); - /* Create a few object variables we'll need later on */ - var_Create( p_input, "video", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); - var_Create( p_input, "audio", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); - var_Create( p_input, "audio-channel", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT ); - var_Create( p_input, "spu-channel", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT ); - var_Create( p_input, "sub-file", VLC_VAR_FILE | VLC_VAR_DOINHERIT ); - var_Create( p_input, "sub-autodetect-file", VLC_VAR_BOOL | - VLC_VAR_DOINHERIT ); - var_Create( p_input, "sub-autodetect-path", VLC_VAR_STRING | - VLC_VAR_DOINHERIT ); - var_Create( p_input, "sub-autodetect-fuzzy", VLC_VAR_INTEGER | - VLC_VAR_DOINHERIT ); - - var_Create( p_input, "sout", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); - var_Create( p_input, "sout-all", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); - var_Create( p_input, "sout-audio", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); - var_Create( p_input, "sout-video", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); - var_Create( p_input, "sout-keep", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); - - /* repeat variable */ - var_Create( p_input, "input-repeat", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT ); - - /* start/stop time */ - var_Create( p_input, "start-time", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT ); - var_Create( p_input, "stop-time", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT ); - - /* decoders */ - var_Create( p_input, "minimize-threads", VLC_VAR_BOOL|VLC_VAR_DOINHERIT ); - - /* play status */ - - /* position variable */ - var_Create( p_input, "position", VLC_VAR_FLOAT ); /* position 0.0->1.0 */ - var_Create( p_input, "position-offset", VLC_VAR_FLOAT ); /* relative */ - val.f_float = 0.0; - var_Change( p_input, "position", VLC_VAR_SETVALUE, &val, NULL ); - var_AddCallback( p_input, "position", PositionCallback, NULL ); - var_AddCallback( p_input, "position-offset", PositionCallback, NULL ); - - /* time variable */ - var_Create( p_input, "time", VLC_VAR_TIME ); - var_Create( p_input, "time-offset", VLC_VAR_TIME ); /* relative */ - val.i_time = 0; - var_Change( p_input, "time", VLC_VAR_SETVALUE, &val, NULL ); - var_AddCallback( p_input, "time", TimeCallback, NULL ); - var_AddCallback( p_input, "time-offset", TimeCallback, NULL ); - - /* length variable */ - var_Create( p_input, "length", VLC_VAR_TIME ); - val.i_time = 0; - var_Change( p_input, "length", VLC_VAR_SETVALUE, &val, NULL ); - - /* rate variable */ - var_Create( p_input, "rate", VLC_VAR_INTEGER ); - var_Create( p_input, "rate-slower", VLC_VAR_VOID ); - var_Create( p_input, "rate-faster", VLC_VAR_VOID ); - val.i_int = DEFAULT_RATE; - var_Change( p_input, "rate", VLC_VAR_SETVALUE, &val, NULL ); - var_AddCallback( p_input, "rate", RateCallback, NULL ); - var_AddCallback( p_input, "rate-slower", RateCallback, NULL ); - var_AddCallback( p_input, "rate-faster", RateCallback, NULL ); - - /* state variable */ - var_Create( p_input, "state", VLC_VAR_INTEGER ); - val.i_int = INIT_S; - var_Change( p_input, "state", VLC_VAR_SETVALUE, &val, NULL ); - var_AddCallback( p_input, "state", StateCallback, NULL ); - - /* state variable */ - var_Create( p_input, "demuxed-id3", VLC_VAR_BOOL ); - val.b_bool = VLC_FALSE; - var_Change( p_input, "demuxed-id3", VLC_VAR_SETVALUE, &val, NULL ); - - /* Initialize thread properties */ - p_input->b_eof = 0; - p_input->b_out_pace_control = VLC_FALSE; - p_input->p_sys = NULL; - - /* Set target */ - vlc_mutex_lock( &p_item->lock ); - p_input->psz_source = strdup( p_item->psz_uri ); - vlc_mutex_unlock( &p_item->lock ); - - /* Stream */ - p_input->s = NULL; - - /* es out */ - p_input->p_es_out = NULL; - - /* Demux */ - p_input->p_demux = NULL; - p_input->pf_demux = NULL; - p_input->pf_rewind = NULL; - p_input->pf_demux_control = demux_vaControlDefault; - p_input->i_cr_average = config_GetInt( p_input, "cr-average" ); - - /* Access */ - p_input->p_access = NULL; - - p_input->i_bufsize = 0; - p_input->i_mtu = 0; - p_input->i_pts_delay = DEFAULT_PTS_DELAY; - - /* Initialize statistics */ - p_input->c_loops = 0; - p_input->stream.c_packets_read = 0; - p_input->stream.c_packets_trashed = 0; - - /* Set locks. */ - vlc_mutex_init( p_input, &p_input->stream.stream_lock ); - vlc_cond_init( p_input, &p_input->stream.stream_wait ); - vlc_mutex_init( p_input, &p_input->stream.control.control_lock ); - - /* Initialize stream description */ - p_input->stream.b_changed = 0; - p_input->stream.i_es_number = 0; - p_input->stream.i_selected_es_number = 0; - p_input->stream.i_pgrm_number = 0; - p_input->stream.i_new_status = p_input->stream.i_new_rate = 0; - p_input->stream.b_new_mute = MUTE_NO_CHANGE; - p_input->stream.i_mux_rate = 0; - p_input->stream.b_seekable = 0; - p_input->stream.p_sout = NULL; - - /* no stream, no program, no area, no es */ - p_input->stream.p_new_program = NULL; - - p_input->stream.i_area_nb = 0; - p_input->stream.pp_areas = NULL; - p_input->stream.p_selected_area = NULL; - p_input->stream.p_new_area = NULL; - - p_input->stream.pp_selected_es = NULL; - p_input->stream.p_removed_es = NULL; - p_input->stream.p_newly_selected_es = NULL; - - /* By default there is one area in a stream */ - input_AddArea( p_input, 0, 1 ); - p_input->stream.p_selected_area = p_input->stream.pp_areas[0]; - - /* Initialize stream control properties. */ - p_input->stream.control.i_status = INIT_S; - p_input->stream.control.i_rate = DEFAULT_RATE; - p_input->stream.control.b_mute = 0; - p_input->stream.control.b_grayscale = config_GetInt( p_input, "grayscale"); - - msg_Info( p_input, "playlist item `%s'", p_input->psz_source ); + /* Create Object Variables for private use only */ + input_ConfigVarInit( p_input ); - /* Bookmarks */ - var_Create( p_input, "bookmarks", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); - var_Create( p_input, "bookmark", VLC_VAR_INTEGER | VLC_VAR_HASCHOICE | - VLC_VAR_ISCOMMAND ); - val.psz_string = _("Bookmark"); - var_Change( p_input, "bookmark", VLC_VAR_SETTEXT, &val, NULL ); - var_AddCallback( p_input, "bookmark", BookmarkCallback, NULL ); - - p_input->i_bookmarks = 0; - p_input->pp_bookmarks = NULL; + /* Create Objects variables for public Get and Set */ + input_ControlVarInit( p_input ); + p_input->input.i_cr_average = var_GetInteger( p_input, "cr-average" ); +#if 0 + /* TODO */ var_Get( p_input, "bookmarks", &val ); if( val.psz_string ) { @@ -318,15 +212,18 @@ input_thread_t *__input_CreateThread( vlc_object_t *p_parent, } free( val.psz_string ); } +#endif + /* 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", RunThread, + if( vlc_thread_create( p_input, "input", Run, VLC_THREAD_PRIORITY_INPUT, VLC_TRUE ) ) { msg_Err( p_input, "cannot create input thread" ); - free( p_input ); + vlc_object_detach( p_input ); + vlc_object_destroy( p_input ); return NULL; } @@ -340,26 +237,40 @@ input_thread_t *__input_CreateThread( vlc_object_t *p_parent, *****************************************************************************/ void input_StopThread( input_thread_t *p_input ) { - demux_t *p_demux; + vlc_list_t *p_list; + int i; + + /* Set die for input */ + p_input->b_die = VLC_TRUE; - /* Make the thread exit from a possible vlc_cond_wait() */ - vlc_mutex_lock( &p_input->stream.stream_lock ); + /* We cannot touch p_input fields directly (we can from another thread), + * so use the vlc_object_find way, it's perfectly safe */ - /* Request thread destruction */ + /* Set die for all access */ + p_list = vlc_list_find( p_input, VLC_OBJECT_ACCESS, FIND_CHILD ); + for( i = 0; i < p_list->i_count; i++ ) + { + p_list->p_values[i].p_object->b_die = VLC_TRUE; + } + vlc_list_release( p_list ); - /* Temporary demux2 hack */ - p_demux = (demux_t *)vlc_object_find( p_input, VLC_OBJECT_DEMUX, - FIND_CHILD ); - if( p_demux ) + /* Set die for all stream */ + p_list = vlc_list_find( p_input, VLC_OBJECT_STREAM, FIND_CHILD ); + for( i = 0; i < p_list->i_count; i++ ) { - p_demux->b_die = 1; - vlc_object_release( p_demux ); + p_list->p_values[i].p_object->b_die = VLC_TRUE; } + vlc_list_release( p_list ); - p_input->b_die = 1; + /* Set die for all demux */ + p_list = vlc_list_find( p_input, VLC_OBJECT_DEMUX, FIND_CHILD ); + for( i = 0; i < p_list->i_count; i++ ) + { + p_list->p_values[i].p_object->b_die = VLC_TRUE; + } + vlc_list_release( p_list ); - vlc_cond_signal( &p_input->stream.stream_wait ); - vlc_mutex_unlock( &p_input->stream.stream_lock ); + input_ControlPush( p_input, INPUT_CONTROL_SET_DIE, NULL ); } /***************************************************************************** @@ -372,550 +283,483 @@ void input_DestroyThread( input_thread_t *p_input ) /* Join the thread */ vlc_thread_join( p_input ); - /* Destroy Mutex locks */ - vlc_mutex_destroy( &p_input->stream.control.control_lock ); - vlc_cond_destroy( &p_input->stream.stream_wait ); - vlc_mutex_destroy( &p_input->stream.stream_lock ); + /* Delete input lock (only after thread joined) */ + vlc_mutex_destroy( &p_input->lock_control ); + + /* TODO: maybe input_DestroyThread should also delete p_input instead + * of the playlist but I'm not sure if it's possible */ } /***************************************************************************** - * RunThread: main thread loop + * 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) *****************************************************************************/ -static int RunThread( input_thread_t *p_input ) +static int Run( input_thread_t *p_input ) { - vlc_value_t val; - mtime_t i_update_next = -1; + int64_t i_intf_update = 0; - /* Signal right now, otherwise we'll get stuck in a peek */ + /* Signal that the thread is launched */ vlc_thread_ready( p_input ); - if( InitThread( p_input ) ) + if( Init( p_input ) ) { /* If we failed, wait before we are killed, and exit */ - p_input->b_error = 1; + p_input->b_error = VLC_TRUE; - ErrorThread( p_input ); + Error( p_input ); /* Tell we're dead */ - p_input->b_dead = 1; + p_input->b_dead = VLC_TRUE; return 0; } - /* initialization is complete */ - vlc_mutex_lock( &p_input->stream.stream_lock ); - p_input->stream.b_changed = 1; - p_input->stream.control.i_status = PLAYING_S; - vlc_mutex_unlock( &p_input->stream.stream_lock ); - - val.i_int = PLAYING_S; - var_Change( p_input, "state", VLC_VAR_SETVALUE, &val, NULL ); - - while( !p_input->b_die && !p_input->b_error && !p_input->b_eof ) + /* Main loop */ + while( !p_input->b_die && !p_input->b_error && !p_input->input.b_eof ) { - unsigned int i, i_count; - - p_input->c_loops++; - - vlc_mutex_lock( &p_input->stream.stream_lock ); + vlc_bool_t b_force_update = VLC_FALSE; + int i_ret; + int i_type; + vlc_value_t val; - if( p_input->stream.p_new_program ) + /* Do the read */ + if( p_input->i_state != PAUSE_S ) { - if( p_input->pf_set_program != NULL ) - { - - /* Reinitialize buffer manager. */ - input_AccessReinit( p_input ); - - p_input->pf_set_program( p_input, - p_input->stream.p_new_program ); - - /* Escape all decoders for the stream discontinuity they - * will encounter. */ - input_EscapeDiscontinuity( p_input ); + if( p_input->i_stop <= 0 || p_input->i_time < p_input->i_stop ) + i_ret=p_input->input.p_demux->pf_demux(p_input->input.p_demux); + else + i_ret = 0; /* EOF */ - for( i = 0; i < p_input->stream.i_pgrm_number; i++ ) + if( i_ret > 0 ) + { + /* TODO */ + if( p_input->input.b_title_demux && + p_input->input.p_demux->info.i_update ) { - pgrm_descriptor_t * p_pgrm - = p_input->stream.pp_programs[i]; - - /* Reinitialize synchro. */ - p_pgrm->i_synchro_state = SYNCHRO_REINIT; + UpdateFromDemux( p_input ); + b_force_update = VLC_TRUE; } - } - p_input->stream.p_new_program = NULL; - } - - if( p_input->stream.p_new_area ) - { - if( p_input->stream.b_seekable && p_input->pf_set_area != NULL ) - { - input_AccessReinit( p_input ); - - p_input->pf_set_area( p_input, p_input->stream.p_new_area ); - - /* Escape all decoders for the stream discontinuity they - * will encounter. */ - input_EscapeDiscontinuity( p_input ); - - for( i = 0; i < p_input->stream.i_pgrm_number; i++ ) + else if( !p_input->input.b_title_demux && + p_input->input.p_access && + p_input->input.p_access->info.i_update ) { - pgrm_descriptor_t * p_pgrm - = p_input->stream.pp_programs[i]; - - /* Reinitialize synchro. */ - p_pgrm->i_synchro_state = SYNCHRO_REINIT; + UpdateFromAccess( p_input ); + b_force_update = VLC_TRUE; } } - p_input->stream.p_new_area = NULL; - } - - if( p_input->stream.p_selected_area->i_seek != NO_SEEK ) - { - if( p_input->stream.p_selected_area->i_size > 0 ) + else if( i_ret == 0 ) /* EOF */ { - unsigned int i; - mtime_t i_time; - double f = (double)p_input->stream.p_selected_area->i_seek / - (double)p_input->stream.p_selected_area->i_size; - - vlc_mutex_unlock( &p_input->stream.stream_lock ); - demux_Control( p_input, DEMUX_SET_POSITION, f ); - vlc_mutex_lock( &p_input->stream.stream_lock ); + vlc_value_t repeat; - /* Escape all decoders for the stream discontinuity they - * will encounter. */ - input_EscapeDiscontinuity( p_input ); - - for( i = 0; i < p_input->stream.i_pgrm_number; i++ ) + var_Get( p_input, "input-repeat", &repeat ); + if( repeat.i_int == 0 ) { - pgrm_descriptor_t * p_pgrm=p_input->stream.pp_programs[i]; - - /* Reinitialize synchro. */ - p_pgrm->i_synchro_state = SYNCHRO_REINIT; + /* End of file - we do not set b_die because only the + * playlist is allowed to do so. */ + msg_Dbg( p_input, "EOF reached" ); + p_input->input.b_eof = VLC_TRUE; } - - vlc_mutex_unlock( &p_input->stream.stream_lock ); - if( !demux_Control( p_input, DEMUX_GET_TIME, &i_time ) ) + else { - int i; - vlc_value_t val; - - /* Help in bar display */ - val.i_time = i_time; - var_Change( p_input, "time", VLC_VAR_SETVALUE, &val, NULL ); + msg_Dbg( p_input, "repeating the same input (%d)", repeat.i_int ); + if( repeat.i_int > 0 ) + { + repeat.i_int--; + var_Set( p_input, "input-repeat", repeat ); + } - /* Seek subs */ - for( i = 0; i < p_input->p_sys->i_sub; i++ ) + /* Seek to title 0 position 0(start) */ + val.i_int = 0; + input_ControlPush( p_input, INPUT_CONTROL_SET_TITLE, &val ); + if( p_input->i_start > 0 ) { - subtitle_Seek( p_input->p_sys->sub[i], i_time ); + val.i_time = p_input->i_start; + input_ControlPush( p_input, INPUT_CONTROL_SET_TIME, + &val ); + } + else + { + val.f_float = 0.0; + input_ControlPush( p_input, INPUT_CONTROL_SET_POSITION, + &val ); } } - if( !demux_Control( p_input, DEMUX_GET_POSITION, &f ) ) - { - val.f_float = (float)f; - var_Change( p_input, "position", VLC_VAR_SETVALUE, &val, NULL ); - } - vlc_mutex_lock( &p_input->stream.stream_lock ); } - p_input->stream.p_selected_area->i_seek = NO_SEEK; - } - - if( p_input->stream.p_removed_es ) - { - input_UnselectES( p_input, p_input->stream.p_removed_es ); - p_input->stream.p_removed_es = NULL; - } - - if( p_input->stream.p_newly_selected_es ) - { - input_SelectES( p_input, p_input->stream.p_newly_selected_es ); - p_input->stream.p_newly_selected_es = NULL; - } - - if( p_input->stream.b_new_mute != MUTE_NO_CHANGE ) - { - if( p_input->stream.b_new_mute ) + else if( i_ret < 0 ) { - input_EscapeAudioDiscontinuity( p_input ); + p_input->b_error = VLC_TRUE; } - vlc_mutex_lock( &p_input->stream.control.control_lock ); - p_input->stream.control.b_mute = p_input->stream.b_new_mute; - vlc_mutex_unlock( &p_input->stream.control.control_lock ); - - p_input->stream.b_new_mute = MUTE_NO_CHANGE; - } - - vlc_mutex_unlock( &p_input->stream.stream_lock ); - - /* Read and demultiplex some data. */ - i_count = p_input->pf_demux( p_input ); - - if( i_count == 0 ) - { - vlc_value_t repeat; - - var_Get( p_input, "input-repeat", &repeat ); - if( repeat.i_int == 0 || p_input->stream.i_area_nb <= 0 ) + if( i_ret > 0 && p_input->i_slave > 0 ) { - /* End of file - we do not set b_die because only the - * playlist is allowed to do so. */ - msg_Info( p_input, "EOF reached" ); - p_input->b_eof = 1; - } - else - { - msg_Dbg( p_input, "repeating the same input (%d)", repeat.i_int ); - if( repeat.i_int > 0 ) - { - repeat.i_int--; - var_Set( p_input, "input-repeat", repeat ); - } - - p_input->stream.p_new_area = p_input->stream.pp_areas[0]; - p_input->stream.p_new_area->i_seek = 0; + SlaveDemux( p_input ); } } - else if( i_count < 0 ) + else { - p_input->b_error = 1; + /* Small wait */ + msleep( 10*1000 ); } - if( !p_input->b_error && !p_input->b_eof && i_update_next < mdate() ) + /* Handle control */ + vlc_mutex_lock( &p_input->lock_control ); + ControlReduce( p_input ); + while( !ControlPopNoLock( p_input, &i_type, &val ) ) { - int i; - mtime_t i_time; - mtime_t i_length; - double d_pos; + msg_Dbg( p_input, "control type=%d", i_type ); + if( Control( p_input, i_type, val ) ) + b_force_update = VLC_TRUE; + } + vlc_mutex_unlock( &p_input->lock_control ); + if( b_force_update || + i_intf_update < mdate() ) + { + vlc_value_t val; + double f_pos; + int64_t i_time, i_length; /* update input status variables */ - if( !demux_Control( p_input, DEMUX_GET_POSITION, &d_pos ) ) + if( !demux2_Control( p_input->input.p_demux, DEMUX_GET_POSITION, &f_pos ) ) { - val.f_float = (float)d_pos; + val.f_float = (float)f_pos; var_Change( p_input, "position", VLC_VAR_SETVALUE, &val, NULL ); } - if( !demux_Control( p_input, DEMUX_GET_TIME, &i_time ) ) + if( !demux2_Control( p_input->input.p_demux, DEMUX_GET_TIME, &i_time ) ) { + p_input->i_time = i_time; val.i_time = i_time; var_Change( p_input, "time", VLC_VAR_SETVALUE, &val, NULL ); } - if( !demux_Control( p_input, DEMUX_GET_LENGTH, &i_length ) ) + if( !demux2_Control( p_input->input.p_demux, DEMUX_GET_LENGTH, &i_length ) ) { + vlc_value_t old_val; + var_Get( p_input, "length", &old_val ); val.i_time = i_length; var_Change( p_input, "length", VLC_VAR_SETVALUE, &val, NULL ); - } - /* Check stop-time */ - if( p_input->p_sys->i_stop_time > 0 && p_input->p_sys->i_stop_time < i_time ) - { - msg_Warn( p_input, "EOF reached because of stop-time" ); - p_input->b_eof = 1; - } + if( old_val.i_time != val.i_time ) + { + char psz_buffer[MSTRTIME_MAX_SIZE]; - /* update subs */ - for( i = 0; i < p_input->p_sys->i_sub; i++ ) - { - subtitle_Demux( p_input->p_sys->sub[i], i_time ); + vlc_mutex_lock( &p_input->input.p_item->lock ); + p_input->input.p_item->i_duration = i_length; + vlc_mutex_unlock( &p_input->input.p_item->lock ); + + input_Control( p_input, INPUT_ADD_INFO, + _("General"), _("Duration"), + msecstotimestr( psz_buffer, i_length / 1000 ) ); + } } - i_update_next = mdate() + I64C(150000); + var_SetBool( p_input, "intf-change", VLC_TRUE ); + 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 0 + if( input_EsOutDecodersEmpty( p_input->p_es_out ) ) +#endif + break; + + msg_Dbg( p_input, "waiting decoder fifos to empty" ); + + msleep( INPUT_IDLE_SLEEP ); } + + /* We have finished */ + p_input->b_eof = VLC_TRUE; } - if( p_input->b_error || p_input->b_eof ) + /* Wait we are asked to die */ + if( !p_input->b_die ) { - ErrorThread( p_input ); + Error( p_input ); } - EndThread( p_input ); + /* Clean up */ + End( p_input ); return 0; } /***************************************************************************** - * InitThread: init the input Thread + * Init: init the input Thread *****************************************************************************/ -static int InitThread( input_thread_t * p_input ) +static int Init( input_thread_t * p_input ) { - vlc_meta_t *p_meta = NULL, *p_meta_user = NULL; -// float f_fps; + char *psz; + char *psz_subtitle; + vlc_value_t val; double f_fps; - mtime_t i_length; - /* Parse source string. Syntax : [[][/]:][] */ - char * psz_parser = p_input->psz_dupsource = strdup(p_input->psz_source); - vlc_value_t val, val1; - int64_t i_microsecondperframe; + /* Initialize optional stream output. (before access/demuxer) */ + psz = var_GetString( p_input, "sout" ); + if( *psz ) + { + p_input->p_sout = sout_NewInstance( p_input, psz ); + if( p_input->p_sout == NULL ) + { + msg_Err( p_input, "cannot start stream output instance, aborting" ); + free( psz ); + return VLC_EGENERIC; + } + } + free( psz ); - subtitle_demux_t *p_sub_toselect = NULL; - char *psz_sub_file = NULL; + /* Create es out */ + p_input->p_es_out = input_EsOutNew( p_input ); + 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 ); - /* Skip the plug-in names */ - while( *psz_parser && *psz_parser != ':' ) + if( InputSourceInit( p_input, &p_input->input, + p_input->input.p_item->psz_uri, NULL ) ) { - psz_parser++; + goto error; } -#if defined( WIN32 ) || defined( UNDER_CE ) - if( psz_parser - p_input->psz_dupsource == 1 ) + +#if 0 { - msg_Warn( p_input, "drive letter %c: found in source string", - p_input->psz_dupsource[0] ) ; - psz_parser = ""; + input_source_t *extra; + char *psz_extra = "/home/fenrir/a.avi"; + + extra = InputSourceNew( p_input ); + if( !InputSourceInit( p_input, extra, psz_extra ) ) + { + TAB_APPEND( p_input->i_slave, p_input->slave, extra ); + } } #endif - if( !*psz_parser ) + /* Create global title (from master) */ + p_input->i_title = p_input->input.i_title; + p_input->title = p_input->input.title; + if( p_input->i_title > 0 ) { - p_input->psz_access = p_input->psz_demux = ""; - p_input->psz_name = p_input->psz_source; - free( p_input->psz_dupsource ); - p_input->psz_dupsource = NULL; + /* Setup variables */ + input_ControlVarNavigation( p_input ); + input_ControlVarTitle( p_input, 0 ); } - else - { - *psz_parser++ = '\0'; - - /* let's skip '//' */ - if( psz_parser[0] == '/' && psz_parser[1] == '/' ) - { - psz_parser += 2 ; - } - p_input->psz_name = psz_parser ; + /* Global flag */ + p_input->b_can_pace_control = p_input->input.b_can_pace_control; + p_input->b_can_pause = p_input->input.b_can_pause; - /* Come back to parse the access and demux plug-ins */ - psz_parser = p_input->psz_dupsource; + /* Fix pts delay */ + if( p_input->i_pts_delay <= 0 ) + p_input->i_pts_delay = DEFAULT_PTS_DELAY; - if( !*psz_parser ) - { - /* No access */ - p_input->psz_access = ""; - } - else if( *psz_parser == '/' ) - { - /* No access */ - p_input->psz_access = ""; - psz_parser++; - } - else - { - p_input->psz_access = psz_parser; + /* If the desynchronisation requested by the user is < 0, we need to + * cache more data. */ + var_Get( p_input, "audio-desync", &val ); + if( val.i_int < 0 ) + p_input->i_pts_delay -= (val.i_int * 1000); - while( *psz_parser && *psz_parser != '/' ) - { - psz_parser++; - } + /* TODO: check meta data from users */ - if( *psz_parser == '/' ) - { - *psz_parser++ = '\0'; - } - } + /* TODO: get meta data from demuxer */ - if( !*psz_parser ) + /* Load master infos */ + /* Init length */ + if( !demux2_Control( p_input->input.p_demux, DEMUX_GET_LENGTH, &val.i_time ) && val.i_time > 0 ) + { + var_Change( p_input, "length", VLC_VAR_SETVALUE, &val, NULL ); + /* TODO update playlist meta data */ + } + /* Start time*/ + /* Set start time */ + p_input->i_start = (int64_t)var_GetInteger( p_input, "start-time" ) * + I64C(1000000); + p_input->i_stop = (int64_t)var_GetInteger( p_input, "stop-time" ) * + I64C(1000000); + + if( p_input->i_start > 0 ) + { + if( p_input->i_start >= val.i_time ) { - /* No demux */ - p_input->psz_demux = ""; + msg_Warn( p_input, "invalid start-time ignored" ); } else { - p_input->psz_demux = psz_parser; - } - } + vlc_value_t s; - msg_Dbg( p_input, "access `%s', demux `%s', name `%s'", - p_input->psz_access, p_input->psz_demux, p_input->psz_name ); + msg_Dbg( p_input, "start-time: %ds", + (int)( p_input->i_start / I64C(1000000) ) ); - if( input_AccessInit( p_input ) == -1 ) - { - free( p_input->psz_source ); - if( p_input->psz_dupsource != NULL ) - { - free( p_input->psz_dupsource ); + s.i_time = p_input->i_start; + input_ControlPush( p_input, INPUT_CONTROL_SET_TIME, &s ); } - - return VLC_EGENERIC; } - - /* Initialize optional stream output. (before demuxer)*/ - var_Get( p_input, "sout", &val ); - if( val.psz_string != NULL ) + if( p_input->i_stop > 0 && p_input->i_stop <= p_input->i_start ) { - if ( *val.psz_string && (p_input->stream.p_sout = - sout_NewInstance( p_input, val.psz_string )) == NULL ) - { - msg_Err( p_input, "cannot start stream output instance, aborting" ); - free( val.psz_string ); - - input_AccessEnd( p_input ); - free( p_input->psz_source ); - if( p_input->psz_dupsource != NULL ) - { - free( p_input->psz_dupsource ); - } - return VLC_EGENERIC; - } - free( val.psz_string ); + msg_Warn( p_input, "invalid stop-time ignored" ); + p_input->i_stop = 0; } - p_input->p_es_out = input_EsOutNew( p_input ); - 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 ); - - /* Find and open appropriate access module */ - p_input->p_access = module_Need( p_input, "access", - p_input->psz_access, VLC_TRUE ); - /* Maybe we had an encoded url */ - if( !p_input->p_access && strchr( p_input->psz_name, '%' ) ) + /* Load subtitles */ + /* Get fps and set it if not already set */ + if( !demux2_Control( p_input->input.p_demux, DEMUX_GET_FPS, &f_fps ) && + f_fps > 1.0 ) { - DecodeUrl( p_input->psz_name ); + vlc_value_t fps; - msg_Dbg( p_input, "retying with %s", p_input->psz_name ); - p_input->p_access = module_Need( p_input, "access", - p_input->psz_access, VLC_TRUE ); + if( var_Get( p_input, "sub-fps", &fps ) ) + { + var_Create( p_input, "sub-fps", VLC_VAR_FLOAT| VLC_VAR_DOINHERIT ); + var_SetFloat( p_input, "sub-fps", f_fps ); + } } -#ifndef WIN32 /* Remove this gross hack from the win32 build as colons - * are forbidden in filenames on Win32. */ - /* Maybe we got something like: /Volumes/toto:titi/gabu.mpg */ - if ( p_input->p_access == NULL - && (*p_input->psz_demux || *p_input->psz_access) ) + /* Look for and add subtitle files */ + psz_subtitle = var_GetString( p_input, "sub-file" ); + if( *psz_subtitle ) { - p_input->psz_access = p_input->psz_demux = ""; - p_input->psz_name = p_input->psz_source; - free( p_input->psz_dupsource); - p_input->psz_dupsource = NULL; + input_source_t *sub; + vlc_value_t count; + vlc_value_t list; - p_input->p_access = module_Need( p_input, "access", - p_input->psz_access, VLC_TRUE ); - } -#endif - if( p_input->p_access == NULL ) - { - msg_Err( p_input, "no suitable access module for `%s/%s://%s'", - p_input->psz_access, p_input->psz_demux, p_input->psz_name ); - if ( p_input->stream.p_sout != NULL ) - { - sout_DeleteInstance( p_input->stream.p_sout ); - } + msg_Dbg( p_input, "forced subtitle: %s", psz_subtitle ); + + var_Change( p_input, "spu-es", VLC_VAR_CHOICESCOUNT, &count, NULL ); - input_AccessEnd( p_input ); - free( p_input->psz_source ); - if( p_input->psz_dupsource != NULL ) + /* */ + sub = InputSourceNew( p_input ); + if( !InputSourceInit( p_input, sub, psz_subtitle, "subtitle" ) ) { - free( p_input->psz_dupsource ); + TAB_APPEND( p_input->i_slave, p_input->slave, sub ); + + /* Select the ES */ + if( !var_Change( p_input, "spu-es", VLC_VAR_GETLIST, &list, NULL ) ) + { + if( count.i_int == 0 ) + count.i_int++; /* if it was first one, there is disable too */ + + if( count.i_int < list.p_list->i_count ) + { + input_ControlPush( p_input, INPUT_CONTROL_SET_ES, &list.p_list->p_values[count.i_int] ); + } + var_Change( p_input, "spu-es", VLC_VAR_FREELIST, &list, NULL ); + } } - input_EsOutDelete( p_input->p_es_out ); - return VLC_EGENERIC; } - /* Waiting for stream. */ - if( p_input->i_mtu ) - { - p_input->i_bufsize = p_input->i_mtu; - } - else + var_Get( p_input, "sub-autodetect-file", &val ); + if( val.b_bool ) { - p_input->i_bufsize = INPUT_DEFAULT_BUFSIZE; - } - - /* If the desynchronisation requested by the user is < 0, we need to - * cache more data. */ - var_Create( p_input, "audio-desync", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); - var_Get( p_input, "audio-desync", &val ); - if( val.i_int < 0 ) - p_input->i_pts_delay -= (val.i_int * 1000); + 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; + int i; - if( p_input->p_current_data == NULL && p_input->pf_read != NULL ) - { - while( !input_FillBuffer( p_input ) ) + for( i = 0; subs[i] != NULL; i++ ) { - if( p_input->b_die || p_input->b_error || p_input->b_eof ) + if( strcmp( psz_subtitle, subs[i] ) ) { - module_Unneed( p_input, p_input->p_access ); - if ( p_input->stream.p_sout != NULL ) + sub = InputSourceNew( p_input ); + if( !InputSourceInit( p_input, sub, subs[i], "subtitle" ) ) { - sout_DeleteInstance( p_input->stream.p_sout ); + TAB_APPEND( p_input->i_slave, p_input->slave, sub ); } - input_AccessEnd( p_input ); - free( p_input->psz_source ); - if( p_input->psz_dupsource != NULL ) - { - free( p_input->psz_dupsource ); - } - input_EsOutDelete( p_input->p_es_out ); - return VLC_EGENERIC; } + free( subs[i] ); } + free( subs ); + free( psz_autopath ); } + free( psz_subtitle ); - /* Create the stream_t facilities */ - p_input->s = input_StreamNew( p_input ); - if( p_input->s == NULL ) + /* Set up es_out */ + es_out_Control( p_input->p_es_out, ES_OUT_SET_ACTIVE, VLC_TRUE ); + val.b_bool = VLC_FALSE; + if( p_input->p_sout ) { - /* should never occur yet */ + var_Get( p_input, "sout-all", &val ); + } + es_out_Control( p_input->p_es_out, ES_OUT_SET_MODE, + val.b_bool ? ES_OUT_MODE_ALL : ES_OUT_MODE_AUTO ); - msg_Err( p_input, "cannot create stream_t" ); + /* TODO select forced subs */ +#if 0 + if( p_sub_toselect ) + { + es_out_Control( p_input->p_es_out, ES_OUT_SET_ES, + p_sub_toselect->p_es, VLC_TRUE ); + } +#endif - module_Unneed( p_input, p_input->p_access ); - if ( p_input->stream.p_sout != NULL ) + if( p_input->p_sout ) + { + if( p_input->p_sout->i_out_pace_nocontrol > 0 ) { - sout_DeleteInstance( p_input->stream.p_sout ); + p_input->b_out_pace_control = VLC_FALSE; } - input_AccessEnd( p_input ); - free( p_input->psz_source ); - if( p_input->psz_dupsource != NULL ) + else { - free( p_input->psz_dupsource ); + p_input->b_out_pace_control = VLC_TRUE; } - input_EsOutDelete( p_input->p_es_out ); - return VLC_EGENERIC; + msg_Dbg( p_input, "starting in %s mode", + p_input->b_out_pace_control ? "asynch" : "synch" ); } - /* Find and open appropriate demux module */ - p_input->p_demux = - module_Need( p_input, "demux", - (p_input->psz_demux && *p_input->psz_demux) ? - p_input->psz_demux : "$demux", - (p_input->psz_demux && *p_input->psz_demux) ? - VLC_TRUE : VLC_FALSE ); + msg_Dbg( p_input, "`%s' sucessfully opened", + p_input->input.p_item->psz_uri ); - if( p_input->p_demux == NULL ) - { - msg_Err( p_input, "no suitable demux module for `%s/%s://%s'", - p_input->psz_access, p_input->psz_demux, p_input->psz_name ); + /* initialization is complete */ + p_input->i_state = PLAYING_S; - input_StreamDelete( p_input->s ); - module_Unneed( p_input, p_input->p_access ); - if ( p_input->stream.p_sout != NULL ) - { - sout_DeleteInstance( p_input->stream.p_sout ); - } - input_AccessEnd( p_input ); - free( p_input->psz_source ); - if( p_input->psz_dupsource != NULL ) - { - free( p_input->psz_dupsource ); - } + val.i_int = PLAYING_S; + var_Change( p_input, "state", VLC_VAR_SETVALUE, &val, NULL ); + + return VLC_SUCCESS; + +error: + if( p_input->p_es_out ) input_EsOutDelete( p_input->p_es_out ); - return VLC_EGENERIC; - } - /* Init input_thread_sys_t */ - p_input->p_sys = malloc( sizeof( input_thread_sys_t ) ); - p_input->p_sys->i_sub = 0; - p_input->p_sys->sub = NULL; + if( p_input->p_sout ) + sout_DeleteInstance( p_input->p_sout ); - p_input->p_sys->i_stop_time = 0; + /* Mark them deleted */ + p_input->input.p_demux = NULL; + p_input->input.p_stream = NULL; + p_input->input.p_access = NULL; + p_input->p_es_out = NULL; + p_input->p_sout = NULL; - /* Get meta information from user */ - var_Create( p_input, "meta-title", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); - var_Create( p_input, "meta-author", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); - var_Create( p_input, "meta-artist", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); + return VLC_EGENERIC; + +#if 0 + vlc_meta_t *p_meta = NULL, *p_meta_user = NULL; +// float f_fps; + double f_fps; + mtime_t i_length; + + FIXME + p_input->input.i_cr_average = config_GetInt( p_input, "cr-average" ); + p_input->stream.control.i_status = INIT_S; + p_input->stream.control.i_rate = DEFAULT_RATE; + + + /* Init input_thread_sys_t */ + p_input->p_sys = malloc( sizeof( input_thread_sys_t ) ); + p_input->p_sys->i_sub = 0; + p_input->p_sys->sub = NULL; + + /* Get meta information from user */ + var_Create( p_input, "meta-title", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); + var_Create( p_input, "meta-author", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); + var_Create( p_input, "meta-artist", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); var_Create( p_input, "meta-genre", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); var_Create( p_input, "meta-copyright", VLC_VAR_STRING | VLC_VAR_DOINHERIT); var_Create( p_input, "meta-description", VLC_VAR_STRING|VLC_VAR_DOINHERIT); @@ -926,37 +770,37 @@ static int InitThread( input_thread_t * p_input ) vlc_value_t val; var_Get( p_input, "meta-title", &val ); - if( val.psz_string && *val.psz_string ) + if( *val.psz_string ) vlc_meta_Add( p_meta_user, VLC_META_TITLE, val.psz_string ); - if( val.psz_string ) free( val.psz_string ); + free( val.psz_string ); var_Get( p_input, "meta-author", &val ); - if( val.psz_string && *val.psz_string ) + if( *val.psz_string ) vlc_meta_Add( p_meta_user, VLC_META_AUTHOR, val.psz_string ); - if( val.psz_string ) free( val.psz_string ); + free( val.psz_string ); var_Get( p_input, "meta-artist", &val ); - if( val.psz_string && *val.psz_string ) + if( *val.psz_string ) vlc_meta_Add( p_meta_user, VLC_META_ARTIST, val.psz_string ); - if( val.psz_string ) free( val.psz_string ); + free( val.psz_string ); var_Get( p_input, "meta-genre", &val ); - if( val.psz_string && *val.psz_string ) + if( *val.psz_string ) vlc_meta_Add( p_meta_user, VLC_META_GENRE, val.psz_string ); - if( val.psz_string ) free( val.psz_string ); + free( val.psz_string ); var_Get( p_input, "meta-copyright", &val ); - if( val.psz_string && *val.psz_string ) + if( *val.psz_string ) vlc_meta_Add( p_meta_user, VLC_META_COPYRIGHT, val.psz_string ); - if( val.psz_string ) free( val.psz_string ); + free( val.psz_string ); var_Get( p_input, "meta-description", &val ); - if( val.psz_string && *val.psz_string ) + if( *val.psz_string ) vlc_meta_Add( p_meta_user, VLC_META_DESCRIPTION, val.psz_string ); - if( val.psz_string ) free( val.psz_string ); + free( val.psz_string ); var_Get( p_input, "meta-date", &val ); - if( val.psz_string && *val.psz_string ) + if( *val.psz_string ) vlc_meta_Add( p_meta_user, VLC_META_DATE, val.psz_string ); - if( val.psz_string ) free( val.psz_string ); + free( val.psz_string ); var_Get( p_input, "meta-url", &val ); - if( val.psz_string && *val.psz_string ) + if( *val.psz_string ) vlc_meta_Add( p_meta_user, VLC_META_URL, val.psz_string ); - if( val.psz_string ) free( val.psz_string ); + free( val.psz_string ); } /* Get meta informations from demuxer */ @@ -1055,25 +899,6 @@ static int InitThread( input_thread_t * p_input ) } } - /* Set stop-time and check validity */ - var_Get( p_input, "stop-time", &val ); - if( val.i_int > 0 ) - { - vlc_value_t start; - - var_Get( p_input, "start-time", &start ); - if( start.i_int >= val.i_int ) - { - msg_Warn( p_input, "invalid stop-time, ignored (stop-time < " - "start-time)" ); - } - else - { - p_input->p_sys->i_stop_time = (int64_t)val.i_int * I64C(1000000); - msg_Dbg( p_input, "stop-time %ds", val.i_int ); - } - } - /* Get fps */ if( demux_Control( p_input, DEMUX_GET_FPS, &f_fps ) || f_fps < 0.1 ) { @@ -1122,6 +947,7 @@ static int InitThread( input_thread_t * p_input ) free( *tmp2++ ); } free( tmp ); + free( val1.psz_string ); } if( psz_sub_file ) free( psz_sub_file ); @@ -1138,30 +964,15 @@ static int InitThread( input_thread_t * p_input ) es_out_Control( p_input->p_es_out, ES_OUT_SET_ES, p_sub_toselect->p_es, VLC_TRUE ); } - - if( p_input->stream.p_sout ) - { - if( p_input->stream.p_sout->i_out_pace_nocontrol > 0 ) - { - p_input->b_out_pace_control = VLC_FALSE; - } - else - { - p_input->b_out_pace_control = VLC_TRUE; - } - msg_Dbg( p_input, "starting in %s mode", - p_input->b_out_pace_control ? "asynch" : "synch" ); - } - - return VLC_SUCCESS; +#endif } /***************************************************************************** - * ErrorThread: RunThread() error loop + * Error: RunThread() error loop ***************************************************************************** * This function is called when an error occured during thread main's loop. *****************************************************************************/ -static void ErrorThread( input_thread_t *p_input ) +static void Error( input_thread_t *p_input ) { while( !p_input->b_die ) { @@ -1171,32 +982,42 @@ static void ErrorThread( input_thread_t *p_input ) } /***************************************************************************** - * EndThread: end the input thread + * End: end the input thread *****************************************************************************/ -static void EndThread( input_thread_t * p_input ) +static void End( input_thread_t * p_input ) { + vlc_value_t val; int i; -#ifdef HAVE_SYS_TIMES_H - /* Display statistics */ - struct tms cpu_usage; - times( &cpu_usage ); - - msg_Dbg( p_input, "%ld loops consuming user: %ld, system: %ld", - p_input->c_loops, cpu_usage.tms_utime, cpu_usage.tms_stime ); -#else - msg_Dbg( p_input, "%ld loops", p_input->c_loops ); -#endif - input_DumpStream( p_input ); + msg_Dbg( p_input, "closing `%s'", + p_input->input.p_item->psz_uri ); + + /* We are at the end */ + p_input->i_state = END_S; + + val.i_int = END_S; + var_Change( p_input, "state", VLC_VAR_SETVALUE, &val, NULL ); + + /* Clean control variables */ + input_ControlVarClean( p_input ); + + /* Clean up master */ + InputSourceClean( p_input, &p_input->input ); - /* Free demultiplexer's data */ - if( p_input->p_demux ) module_Unneed( p_input, p_input->p_demux ); + /* Delete slave */ + for( i = 0; i < p_input->i_slave; i++ ) + { + InputSourceClean( p_input, p_input->slave[i] ); + free( p_input->slave[i] ); + } + if( p_input->slave ) free( p_input->slave ); - /* Free all ES and destroy all decoder threads */ - input_EndStream( p_input ); + /* Unload all modules */ + if( p_input->p_es_out ) + input_EsOutDelete( p_input->p_es_out ); /* Close optional stream output instance */ - if( p_input->stream.p_sout ) + if( p_input->p_sout ) { vlc_object_t *p_pl = vlc_object_find( p_input, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE ); @@ -1206,56 +1027,788 @@ static void EndThread( input_thread_t * p_input ) { /* attach sout to the playlist */ msg_Warn( p_input, "keeping sout" ); - vlc_object_detach( p_input->stream.p_sout ); - vlc_object_attach( p_input->stream.p_sout, p_pl ); + vlc_object_detach( p_input->p_sout ); + vlc_object_attach( p_input->p_sout, p_pl ); } else { msg_Warn( p_input, "destroying sout" ); - sout_DeleteInstance( p_input->stream.p_sout ); + sout_DeleteInstance( p_input->p_sout ); } if( p_pl ) - { vlc_object_release( p_pl ); + } + + /* Tell we're dead */ + p_input->b_dead = VLC_TRUE; +} + +/***************************************************************************** + * Control + *****************************************************************************/ +static inline int ControlPopNoLock( input_thread_t *p_input, + int *pi_type, vlc_value_t *p_val ) +{ + if( p_input->i_control <= 0 ) + { + return VLC_EGENERIC; + } + + *pi_type = p_input->control[0].i_type; + *p_val = p_input->control[0].val; + + p_input->i_control--; + if( p_input->i_control > 0 ) + { + int i; + + for( i = 0; i < p_input->i_control; i++ ) + { + p_input->control[i].i_type = p_input->control[i+1].i_type; + p_input->control[i].val = p_input->control[i+1].val; } } - /* Destroy subtitles demuxers */ - if( p_input->p_sys ) + return VLC_SUCCESS; +} + +static void ControlReduce( input_thread_t *p_input ) +{ + int i; + for( i = 1; i < p_input->i_control; i++ ) + { + const int i_lt = p_input->control[i-1].i_type; + const int i_ct = p_input->control[i].i_type; + + /* XXX We can't merge INPUT_CONTROL_SET_ES */ + msg_Dbg( p_input, "[%d/%d] l=%d c=%d", i, p_input->i_control, i_lt, i_ct ); + if( i_lt == i_ct && + ( i_ct == INPUT_CONTROL_SET_STATE || + i_ct == INPUT_CONTROL_SET_RATE || + i_ct == INPUT_CONTROL_SET_POSITION || + i_ct == INPUT_CONTROL_SET_TIME || + i_ct == INPUT_CONTROL_SET_PROGRAM || + i_ct == INPUT_CONTROL_SET_TITLE || + i_ct == INPUT_CONTROL_SET_SEEKPOINT || + i_ct == INPUT_CONTROL_SET_BOOKMARK ) ) + { + int j; + msg_Dbg( p_input, "merged at %d", i ); + /* Remove the i-1 */ + for( j = i; j < p_input->i_control; j++ ) + p_input->control[j-1] = p_input->control[j]; + p_input->i_control--; + } + else + { + /* TODO but that's not that important + - merge SET_X with SET_X_CMD + - remove SET_SEEKPOINT/SET_POSITION/SET_TIME before a SET_TITLE + - remove SET_SEEKPOINT/SET_POSITION/SET_TIME before another among them + - ? + */ + } + } +} + +static vlc_bool_t Control( input_thread_t *p_input, int i_type, vlc_value_t val ) +{ + vlc_bool_t b_force_update = VLC_FALSE; + + switch( i_type ) + { + case INPUT_CONTROL_SET_DIE: + msg_Dbg( p_input, "control: INPUT_CONTROL_SET_DIE proceed" ); + /* Mark all submodules to die */ + if( p_input->input.p_access ) + p_input->input.p_access->b_die = VLC_TRUE; + if( p_input->input.p_stream ) + p_input->input.p_stream->b_die = VLC_TRUE; + p_input->input.p_demux->b_die = VLC_TRUE; + + p_input->b_die = VLC_TRUE; + break; + + case INPUT_CONTROL_SET_POSITION: + case INPUT_CONTROL_SET_POSITION_OFFSET: + { + double f_pos; + if( i_type == INPUT_CONTROL_SET_POSITION ) + { + f_pos = val.f_float; + } + else + { + /* Should not fail */ + demux2_Control( p_input->input.p_demux, DEMUX_GET_POSITION, &f_pos ); + f_pos += val.f_float; + } + if( f_pos < 0.0 ) f_pos = 0.0; + if( f_pos > 1.0 ) f_pos = 1.0; + if( demux2_Control( p_input->input.p_demux, DEMUX_SET_POSITION, f_pos ) ) + { + msg_Err( p_input, "INPUT_CONTROL_SET_POSITION(_OFFSET) %2.1f%% failed", + f_pos * 100 ); + } + 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; + } + + case INPUT_CONTROL_SET_TIME: + case INPUT_CONTROL_SET_TIME_OFFSET: + { + int64_t i_time; + int i_ret; + + if( i_type == INPUT_CONTROL_SET_TIME ) + { + i_time = val.i_time; + } + else + { + /* Should not fail */ + demux2_Control( p_input->input.p_demux, + DEMUX_GET_TIME, &i_time ); + i_time += val.i_time; + } + if( i_time < 0 ) i_time = 0; + i_ret = demux2_Control( p_input->input.p_demux, + DEMUX_SET_TIME, i_time ); + if( i_ret ) + { + int64_t i_length; + /* Emulate it with a SET_POS */ + + demux2_Control( p_input->input.p_demux, + DEMUX_GET_LENGTH, &i_length ); + if( i_length > 0 ) + { + double f_pos = (double)i_time / (double)i_length; + i_ret = demux2_Control( p_input->input.p_demux, + DEMUX_SET_POSITION, f_pos ); + } + } + if( i_ret ) + { + msg_Err( p_input, "INPUT_CONTROL_SET_TIME(_OFFSET) %lld failed", + 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; + } + + case INPUT_CONTROL_SET_STATE: + if( ( val.i_int == PLAYING_S && p_input->i_state == PAUSE_S ) || + ( val.i_int == PAUSE_S && p_input->i_state == PAUSE_S ) ) + { + int i_ret; + if( p_input->input.p_access ) + i_ret = access2_Control( p_input->input.p_access, + ACCESS_SET_PAUSE_STATE, VLC_FALSE ); + else + i_ret = demux2_Control( p_input->input.p_demux, + DEMUX_SET_PAUSE_STATE, VLC_FALSE ); + + if( i_ret ) + { + /* FIXME What to do ? */ + msg_Warn( p_input, "cannot unset pause -> EOF" ); + input_ControlPush( p_input, INPUT_CONTROL_SET_DIE, NULL ); + } + + b_force_update = VLC_TRUE; + + /* Switch to play */ + p_input->i_state = PLAYING_S; + val.i_int = PLAYING_S; + var_Change( p_input, "state", VLC_VAR_SETVALUE, &val, NULL ); + + /* Reset clock */ + es_out_Control( p_input->p_es_out, ES_OUT_RESET_PCR ); + } + else if( val.i_int == PAUSE_S && p_input->i_state == PLAYING_S && p_input->b_can_pause ) + { + int i_ret; + if( p_input->input.p_access ) + i_ret = access2_Control( p_input->input.p_access, + ACCESS_SET_PAUSE_STATE, VLC_TRUE ); + else + i_ret = demux2_Control( p_input->input.p_demux, + DEMUX_SET_PAUSE_STATE, VLC_TRUE ); + + b_force_update = VLC_TRUE; + + if( i_ret ) + { + msg_Warn( p_input, "cannot set pause state" ); + val.i_int = p_input->i_state; + } + else + { + val.i_int = PAUSE_S; + } + + /* Switch to new state */ + p_input->i_state = val.i_int; + var_Change( p_input, "state", VLC_VAR_SETVALUE, &val, NULL ); + } + else if( val.i_int == PAUSE_S && !p_input->b_can_pause ) + { + b_force_update = VLC_TRUE; + + /* Correct "state" value */ + val.i_int = p_input->i_state; + var_Change( p_input, "state", VLC_VAR_SETVALUE, &val, NULL ); + } + else if( val.i_int != PLAYING_S && val.i_int != PAUSE_S ) + { + msg_Err( p_input, "invalid state in INPUT_CONTROL_SET_STATE" ); + } + break; + + case INPUT_CONTROL_SET_RATE: + case INPUT_CONTROL_SET_RATE_SLOWER: + case INPUT_CONTROL_SET_RATE_FASTER: + { + int i_rate; + + if( i_type == INPUT_CONTROL_SET_RATE_SLOWER ) + i_rate = p_input->i_rate * 2; + else if( i_type == INPUT_CONTROL_SET_RATE_FASTER ) + i_rate = p_input->i_rate / 2; + else + i_rate = val.i_int; + + if( i_rate < INPUT_RATE_MIN ) + { + msg_Dbg( p_input, "cannot set rate faster" ); + i_rate = INPUT_RATE_MIN; + } + else if( i_rate > INPUT_RATE_MAX ) + { + msg_Dbg( p_input, "cannot set rate slower" ); + i_rate = INPUT_RATE_MAX; + } + if( i_rate != INPUT_RATE_DEFAULT && + ( !p_input->b_can_pace_control || !p_input->b_out_pace_control ) ) + { + msg_Dbg( p_input, "cannot change rate" ); + i_rate = INPUT_RATE_DEFAULT; + } + if( i_rate != p_input->i_rate ) + { + p_input->i_rate = i_rate; + val.i_int = i_rate; + var_Change( p_input, "rate", VLC_VAR_SETVALUE, &val, NULL ); + + /* We haven't send data to decoder when rate != default */ + if( i_rate == INPUT_RATE_DEFAULT ) + input_EsOutDiscontinuity( p_input->p_es_out, VLC_TRUE ); + + /* Reset clock */ + es_out_Control( p_input->p_es_out, ES_OUT_RESET_PCR ); + + b_force_update = VLC_TRUE; + } + break; + } + + case INPUT_CONTROL_SET_PROGRAM: + /* No need to force update, es_out does it if needed */ + es_out_Control( p_input->p_es_out, + ES_OUT_SET_GROUP, val.i_int ); + break; + + case INPUT_CONTROL_SET_ES: + /* No need to force update, es_out does it if needed */ + es_out_Control( p_input->p_es_out, + ES_OUT_SET_ES, input_EsOutGetFromID( p_input->p_es_out, val.i_int ) ); + break; + + case INPUT_CONTROL_SET_AUDIO_DELAY: + input_EsOutSetDelay( p_input->p_es_out, + AUDIO_ES, val.i_time ); + var_Change( p_input, "audio-delay", VLC_VAR_SETVALUE, &val, NULL ); + break; + + case INPUT_CONTROL_SET_SPU_DELAY: + input_EsOutSetDelay( p_input->p_es_out, + SPU_ES, val.i_time ); + var_Change( p_input, "spu-delay", VLC_VAR_SETVALUE, &val, NULL ); + break; + + case INPUT_CONTROL_SET_TITLE: + case INPUT_CONTROL_SET_TITLE_NEXT: + case INPUT_CONTROL_SET_TITLE_PREV: + if( p_input->input.b_title_demux && + p_input->input.i_title > 0 ) + { + /* TODO */ + /* FIXME handle demux title */ + demux_t *p_demux = p_input->input.p_demux; + int i_title; + + if( i_type == INPUT_CONTROL_SET_TITLE_PREV ) + i_title = p_demux->info.i_title - 1; + else if( i_type == INPUT_CONTROL_SET_TITLE_NEXT ) + i_title = p_demux->info.i_title + 1; + else + i_title = val.i_int; + + 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 ); + + input_ControlVarTitle( p_input, i_title ); + } + } + else if( p_input->input.i_title > 0 ) + { + access_t *p_access = p_input->input.p_access; + int i_title; + + if( i_type == INPUT_CONTROL_SET_TITLE_PREV ) + i_title = p_access->info.i_title - 1; + else if( i_type == INPUT_CONTROL_SET_TITLE_NEXT ) + i_title = p_access->info.i_title + 1; + else + i_title = val.i_int; + + 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 ); + } + } + break; + case INPUT_CONTROL_SET_SEEKPOINT: + case INPUT_CONTROL_SET_SEEKPOINT_NEXT: + case INPUT_CONTROL_SET_SEEKPOINT_PREV: + if( p_input->input.b_title_demux && + p_input->input.i_title > 0 ) + { + demux_t *p_demux = p_input->input.p_demux; + int i_seekpoint; + + if( i_type == INPUT_CONTROL_SET_SEEKPOINT_PREV ) + i_seekpoint = p_demux->info.i_seekpoint - 1; + else if( i_type == INPUT_CONTROL_SET_TITLE_NEXT ) + i_seekpoint = p_demux->info.i_seekpoint + 1; + else + i_seekpoint = val.i_int; + + 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 ); + } + } + else if( p_input->input.i_title > 0 ) + { + access_t *p_access = p_input->input.p_access; + int i_seekpoint; + + if( i_type == INPUT_CONTROL_SET_SEEKPOINT_PREV ) + i_seekpoint = p_access->info.i_seekpoint - 1; + else if( i_type == INPUT_CONTROL_SET_TITLE_NEXT ) + i_seekpoint = p_access->info.i_seekpoint + 1; + else + i_seekpoint = val.i_int; + + 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 ); + } + } + break; + + case INPUT_CONTROL_SET_BOOKMARK: + default: + msg_Err( p_input, "not yet implemented" ); + break; + } + + return b_force_update; +} + +/***************************************************************************** + * UpdateFromDemux: + *****************************************************************************/ +static void UpdateFromDemux( input_thread_t *p_input ) +{ + demux_t *p_demux = p_input->input.p_demux; + vlc_value_t v; + + if( p_demux->info.i_update & INPUT_UPDATE_TITLE ) + { + v.i_int = p_demux->info.i_title; + var_Change( p_input, "title", VLC_VAR_SETVALUE, &v, NULL ); + + input_ControlVarTitle( p_input, p_demux->info.i_title ); + + p_demux->info.i_update &= ~INPUT_UPDATE_TITLE; + } + if( p_demux->info.i_update & INPUT_UPDATE_SEEKPOINT ) + { + v.i_int = p_demux->info.i_seekpoint; + var_Change( p_input, "chapter", VLC_VAR_SETVALUE, &v, NULL); + + p_demux->info.i_update &= ~INPUT_UPDATE_SEEKPOINT; + } + p_demux->info.i_update &= ~INPUT_UPDATE_SIZE; +} + +/***************************************************************************** + * UpdateFromAccess: + *****************************************************************************/ +static void UpdateFromAccess( input_thread_t *p_input ) +{ + access_t *p_access = p_input->input.p_access; + vlc_value_t v; + + if( p_access->info.i_update & INPUT_UPDATE_TITLE ) + { + v.i_int = p_access->info.i_title; + var_Change( p_input, "title", VLC_VAR_SETVALUE, &v, NULL ); + + input_ControlVarTitle( p_input, p_access->info.i_title ); + + p_access->info.i_update &= ~INPUT_UPDATE_TITLE; + } + if( p_access->info.i_update & INPUT_UPDATE_SEEKPOINT ) + { + 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; + } + p_access->info.i_update &= ~INPUT_UPDATE_SIZE; +} + +/***************************************************************************** + * InputSourceNew: + *****************************************************************************/ +static input_source_t *InputSourceNew( input_thread_t *p_input ) +{ + input_source_t *in = malloc( sizeof( input_source_t ) ); + + in->p_item = NULL; + in->p_access = NULL; + in->p_stream = NULL; + in->p_demux = NULL; + in->b_title_demux = VLC_FALSE; + in->i_title = 0; + in->title = NULL; + in->b_can_pace_control = VLC_TRUE; + in->b_eof = VLC_FALSE; + in->i_cr_average = 0; + + return in; +} + +/***************************************************************************** + * InputSourceInit: + *****************************************************************************/ +static int InputSourceInit( input_thread_t *p_input, + input_source_t *in, char *psz_mrl, + char *psz_forced_demux ) +{ + char *psz_dup = strdup( psz_mrl ); + char *psz_access; + char *psz_demux; + char *psz_path; + vlc_value_t val; + + /* Split uri */ + MRLSplit( p_input, psz_dup, &psz_access, &psz_demux, &psz_path ); + + msg_Dbg( p_input, "`%s' gives access `%s' demux `%s' path `%s'", + psz_mrl, psz_access, psz_demux, psz_path ); + + if( psz_forced_demux && *psz_forced_demux ) + psz_demux = psz_forced_demux; + + /* Try access_demux if no demux given */ + if( *psz_access && *psz_demux == '\0' ) + { + in->p_demux = demux2_New( p_input, psz_access, psz_demux, psz_path, + NULL, p_input->p_es_out ); + } + + if( in->p_demux ) { - for( i = 0; i < p_input->p_sys->i_sub; i++ ) + int64_t i_pts_delay; + + /* Get infos from access_demux */ + demux2_Control( in->p_demux, + DEMUX_GET_PTS_DELAY, &i_pts_delay ); + p_input->i_pts_delay = __MAX( p_input->i_pts_delay, i_pts_delay ); + + in->b_title_demux = VLC_TRUE; + if( demux2_Control( in->p_demux, + DEMUX_GET_TITLE_INFO, + &in->title, &in->i_title ) ) { - subtitle_Close( p_input->p_sys->sub[i] ); + in->i_title = 0; + in->title = NULL; } - if( p_input->p_sys->i_sub > 0 ) + demux2_Control( in->p_demux, DEMUX_CAN_CONTROL_PACE, + &in->b_can_pace_control ); + demux2_Control( in->p_demux, DEMUX_CAN_PAUSE, + &in->b_can_pause ); + + /* FIXME todo + demux2_Control( in->p_demux, DEMUX_CAN_SEEK, + &val.b_bool ); + */ + } + else + { + int64_t i_pts_delay; + + /* Now try a real access */ + in->p_access = access2_New( p_input, psz_access, psz_demux, psz_path ); + + /* Access failed, URL encoded ? */ + if( in->p_access == NULL && strchr( psz_path, '%' ) ) { - free( p_input->p_sys->sub ); + DecodeUrl( psz_path ); + + msg_Dbg( p_input, "retying with access `%s' demux `%s' path `%s'", + psz_access, psz_demux, psz_path ); + + in->p_access = access2_New( p_input, + psz_access, psz_demux, psz_path ); } +#ifndef WIN32 /* Remove this gross hack from the win32 build as colons + * are forbidden in filenames on Win32. */ - /* Free input_thread_sys_t */ - free( p_input->p_sys ); + /* Maybe we got something like: /Volumes/toto:titi/gabu.mpg */ + if( in->p_access == NULL && + *psz_access == '\0' && ( *psz_demux || *psz_path ) ) + { + free( psz_dup ); + psz_dup = strdup( psz_mrl ); + psz_access = ""; + psz_demux = ""; + psz_path = psz_dup; + + in->p_access = access2_New( p_input, + psz_access, psz_demux, psz_path ); + } +#endif + + if( in->p_access == NULL ) + { + msg_Err( p_input, "no suitable access module for `%s'", psz_mrl ); + goto error; + } + + /* Get infos from access */ + access2_Control( in->p_access, + ACCESS_GET_PTS_DELAY, &i_pts_delay ); + p_input->i_pts_delay = __MAX( p_input->i_pts_delay, i_pts_delay ); + + in->b_title_demux = VLC_FALSE; + if( access2_Control( in->p_access, + ACCESS_GET_TITLE_INFO, + &in->title, &in->i_title ) ) + { + in->i_title = 0; + in->title = NULL; + } + access2_Control( in->p_access, ACCESS_CAN_CONTROL_PACE, + &in->b_can_pace_control ); + access2_Control( in->p_access, ACCESS_CAN_PAUSE, + &in->b_can_pause ); + access2_Control( in->p_access, ACCESS_CAN_SEEK, + &val.b_bool ); + var_Set( p_input, "seekable", val ); + + /* Create the stream_t */ + in->p_stream = stream_AccessNew( in->p_access ); + if( in->p_stream == NULL ) + { + msg_Warn( p_input, "cannot create a stream_t from access" ); + goto error; + } + + /* Open a demuxer */ + if( *psz_demux == '\0' && *in->p_access->psz_demux ) + { + psz_demux = in->p_access->psz_demux; + } + in->p_demux = demux2_New( p_input, psz_access, psz_demux, psz_path, + in->p_stream, p_input->p_es_out ); + if( in->p_demux == NULL ) + { + msg_Err( p_input, "no suitable demux module for `%s/%s://%s'", + psz_access, psz_demux, psz_path ); + goto error; + } + + /* TODO get title from demux */ + if( in->i_title <= 0 ) + { + if( demux2_Control( in->p_demux, DEMUX_GET_TITLE_INFO, + &in->title, &in->i_title ) ) + { + in->i_title = 0; + in->title = NULL; + } + else + { + in->b_title_demux = VLC_TRUE; + } + } } + free( psz_dup ); + return VLC_SUCCESS; - /* Destroy the stream_t facilities */ - if( p_input->s ) input_StreamDelete( p_input->s ); +error: + if( in->p_demux ) + demux2_Delete( in->p_demux ); - /* Destroy es out */ - if( p_input->p_es_out ) input_EsOutDelete( p_input->p_es_out ); + if( in->p_stream ) + stream_AccessDelete( in->p_stream ); - /* Close the access plug-in */ - if( p_input->p_access ) module_Unneed( p_input, p_input->p_access ); + if( in->p_access ) + access2_Delete( in->p_access ); + free( psz_dup ); - input_AccessEnd( p_input ); + return VLC_EGENERIC; +} + +/***************************************************************************** + * InputSourceClean: + *****************************************************************************/ +static void InputSourceClean( input_thread_t *p_input, input_source_t *in ) +{ + if( in->p_demux ) + demux2_Delete( in->p_demux ); - /* Free info structures XXX destroy es before 'cause vorbis */ - msg_Dbg( p_input, "freeing info structures..."); + if( in->p_stream ) + stream_AccessDelete( in->p_stream ); - free( p_input->psz_source ); - if( p_input->psz_dupsource != NULL ) free( p_input->psz_dupsource ); + if( in->p_access ) + access2_Delete( in->p_access ); - /* Tell we're dead */ - p_input->b_dead = 1; + if( in->i_title > 0 ) + { + int i; + for( i = 0; i < in->i_title; i++ ) + { + vlc_input_title_Delete( in->title[i] ); + } + free( in->title ); + } } + +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" ); + return; + } + + for( i = 0; i < p_input->i_slave; i++ ) + { + input_source_t *in = p_input->slave[i]; + int i_ret = 1; + + if( in->b_eof ) + continue; + + if( demux2_Control( in->p_demux, DEMUX_SET_NEXT_DEMUX_TIME, i_time ) ) + { + for( ;; ) + { + int64_t i_stime; + if( demux2_Control( in->p_demux, DEMUX_GET_TIME, &i_stime ) ) + { + msg_Err( p_input, "slave[%d] doesn't like DEMUX_GET_TIME -> EOF", i ); + i_ret = 0; + break; + } + //msg_Dbg( p_input, "slave time=%lld input=%lld", i_stime, i_time ); + if( i_stime >= i_time ) + break; + + if( ( i_ret = in->p_demux->pf_demux( in->p_demux ) ) <= 0 ) + break; + } + } + else + { + i_ret = in->p_demux->pf_demux( in->p_demux ); + } + + if( i_ret <= 0 ) + { + msg_Dbg( p_input, "slave %d EOF", i ); + in->b_eof = VLC_TRUE; + } + } +} + +static void SlaveSeek( 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" ); + return; + } + + for( i = 0; i < p_input->i_slave; i++ ) + { + input_source_t *in = p_input->slave[i]; + + if( demux2_Control( in->p_demux, DEMUX_SET_TIME, i_time ) ) + { + msg_Err( p_input, "seek failed for slave %d -> EOF", i ); + in->b_eof = VLC_TRUE; + } + } +} + + /***************************************************************************** * DecodeUrl: decode a given encoded url *****************************************************************************/ @@ -1392,121 +1945,60 @@ static void ParseOption( input_thread_t *p_input, const char *psz_option ) return; } -/***************************************************************************** - * Callbacks (position, time, state, rate ) - *****************************************************************************/ -static int PositionCallback( vlc_object_t *p_this, char const *psz_cmd, - vlc_value_t oldval, vlc_value_t newval, - void *p_data ) +static void MRLSplit( input_thread_t *p_input, char *psz_dup, + char **ppsz_access, char **ppsz_demux, char **ppsz_path ) { - input_thread_t *p_input = (input_thread_t *)p_this; + char *psz_access = NULL; + char *psz_demux = NULL; + char *psz_path = NULL; + char *psz; - msg_Dbg( p_input, "cmd=%s old=%f new=%f", psz_cmd, - oldval.f_float, newval.f_float ); + psz = strchr( psz_dup, ':' ); - if( !strcmp( psz_cmd, "position-offset" ) ) +#if defined( WIN32 ) || defined( UNDER_CE ) + if( psz - psz_dup == 1 ) { - vlc_value_t val; - var_Get( p_input, "position", &val ); - - newval.f_float += val.f_float; + msg_Warn( p_input, "drive letter %c: found in source string", + psz_dup[0] ); + psz_path = psz_dup; } + else +#endif - vlc_mutex_lock( &p_input->stream.stream_lock ); - p_input->stream.p_selected_area->i_seek = - (int64_t)( newval.f_float * - (double)p_input->stream.p_selected_area->i_size ); - - if( p_input->stream.p_selected_area->i_seek < 0 ) + if( psz ) { - p_input->stream.p_selected_area->i_seek = 0; - } - vlc_mutex_unlock( &p_input->stream.stream_lock ); - - return VLC_SUCCESS; -} - -static int TimeCallback( vlc_object_t *p_this, char const *psz_cmd, - vlc_value_t oldval, vlc_value_t newval, void *p_data ) -{ - input_thread_t *p_input = (input_thread_t *)p_this; - vlc_value_t val; + *psz++ = '\0'; + if( psz[0] == '/' && psz[1] == '/' ) + psz += 2; - /* FIXME TODO FIXME */ - msg_Dbg( p_input, "cmd=%s old=%lld new=%lld", psz_cmd, - oldval.i_time, newval.i_time ); + psz_path = psz; - var_Get( p_input, "length", &val ); - if( val.i_time > 0 ) - { - val.f_float = (double)newval.i_time / (double)val.i_time; - if( !strcmp( psz_cmd, "time-offset" ) ) + psz = strchr( psz_dup, '/' ); + if( psz ) { - var_Set( p_input, "position-offset", val ); - } - else - { - var_Set( p_input, "position", val ); + *psz++ = '\0'; + psz_demux = psz; } + + psz_access = psz_dup; } else { - msg_Warn( p_input, "TimeCallback: length <= 0 -> can't seek" ); + psz_path = psz_dup; } - return VLC_SUCCESS; -} - -static int StateCallback( vlc_object_t *p_this, char const *psz_cmd, - vlc_value_t oldval, vlc_value_t newval, - void *p_data ) -{ - input_thread_t *p_input = (input_thread_t *)p_this; - - msg_Dbg( p_input, "cmd=%s old=%d new=%d", - psz_cmd, oldval.i_int, newval.i_int ); - - switch( newval.i_int ) - { - case PLAYING_S: - input_SetStatus( p_input, INPUT_STATUS_PLAY ); - return VLC_SUCCESS; - case PAUSE_S: - input_SetStatus( p_input, INPUT_STATUS_PAUSE ); - return VLC_SUCCESS; - case END_S: - input_SetStatus( p_input, INPUT_STATUS_END ); - return VLC_SUCCESS; - default: - msg_Err( p_input, "cannot set new state (invalid)" ); - return VLC_EGENERIC; - } -} -static int RateCallback( vlc_object_t *p_this, char const *psz_cmd, - vlc_value_t oldval, vlc_value_t newval, void *p_data ) -{ - input_thread_t *p_input = (input_thread_t *)p_this; + if( psz_access == NULL ) + *ppsz_access = ""; + else + *ppsz_access = psz_access; - if( !strcmp( psz_cmd, "rate-slower" ) ) - { - input_SetStatus( p_input, INPUT_STATUS_SLOWER ); - } - else if( !strcmp( psz_cmd, "rate-faster" ) ) - { - input_SetStatus( p_input, INPUT_STATUS_FASTER ); - } + if( psz_demux == NULL ) + *ppsz_demux = ""; else - { - msg_Dbg( p_input, "cmd=%s old=%d new=%d", - psz_cmd, oldval.i_int, newval.i_int ); - input_SetRate( p_input, newval.i_int ); - } - return VLC_SUCCESS; -} + *ppsz_demux = psz_demux; -static int BookmarkCallback( vlc_object_t *p_this, char const *psz_cmd, - vlc_value_t oldval, vlc_value_t newval, void *p_data ) -{ - input_thread_t *p_input = (input_thread_t *)p_this; - return input_Control( p_input, INPUT_SET_BOOKMARK, newval ); + if( psz_path == NULL ) + *ppsz_path = ""; + else + *ppsz_path = psz_path; }