X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finput%2Finput.c;h=c1001102aafedc65dd398e52c5544ebe79b91b89;hb=56c907c617b9e895e4c348cf35473227813ff482;hp=0f09556d632a31693d26ee95f2623e14820f1d45;hpb=9186a2f0cd21bd7874361a2a9c376d7d69e5af07;p=vlc diff --git a/src/input/input.c b/src/input/input.c index 0f09556d63..c1001102aa 100644 --- a/src/input/input.c +++ b/src/input/input.c @@ -51,6 +51,7 @@ #include #include #include +#include #include #ifdef HAVE_SYS_STAT_H @@ -112,6 +113,7 @@ static void input_ChangeState( input_thread_t *p_input, int i_state ); /* TODO f /* Do not let a pts_delay from access/demux go beyong 60s */ #define INPUT_PTS_DELAY_MAX INT64_C(60000000) +#undef input_Create /** * Create a new input_thread_t. * @@ -124,15 +126,14 @@ static void input_ChangeState( input_thread_t *p_input, int i_state ); /* TODO f * \param p_resource an optional input ressource * \return a pointer to the spawned input thread */ - -input_thread_t *__input_Create( vlc_object_t *p_parent, - input_item_t *p_item, - const char *psz_log, input_resource_t *p_resource ) +input_thread_t *input_Create( vlc_object_t *p_parent, + input_item_t *p_item, + const char *psz_log, input_resource_t *p_resource ) { - return Create( p_parent, p_item, psz_log, false, p_resource ); } +#undef input_CreateAndStart /** * Create a new input_thread_t and start it. * @@ -140,10 +141,10 @@ input_thread_t *__input_Create( vlc_object_t *p_parent, * * \see input_Create */ -input_thread_t *__input_CreateAndStart( vlc_object_t *p_parent, - input_item_t *p_item, const char *psz_log ) +input_thread_t *input_CreateAndStart( vlc_object_t *p_parent, + input_item_t *p_item, const char *psz_log ) { - input_thread_t *p_input = __input_Create( p_parent, p_item, psz_log, NULL ); + input_thread_t *p_input = input_Create( p_parent, p_item, psz_log, NULL ); if( input_Start( p_input ) ) { @@ -153,6 +154,7 @@ input_thread_t *__input_CreateAndStart( vlc_object_t *p_parent, return p_input; } +#undef input_Read /** * Initialize an input thread and run it until it stops by itself. * @@ -160,7 +162,7 @@ input_thread_t *__input_CreateAndStart( vlc_object_t *p_parent, * \param p_item an input item * \return an error code, VLC_SUCCESS on success */ -int __input_Read( vlc_object_t *p_parent, input_item_t *p_item ) +int input_Read( vlc_object_t *p_parent, input_item_t *p_item ) { input_thread_t *p_input = Create( p_parent, p_item, NULL, false, NULL ); if( !p_input ) @@ -312,6 +314,8 @@ static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item, if( p_input == NULL ) return NULL; + vlc_object_attach( p_input, p_parent ); + /* Construct a nice name for the input timer */ char psz_timer_name[255]; char * psz_name = input_item_GetName( p_item ); @@ -345,17 +349,17 @@ static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item, p_input->p->title = NULL; p_input->p->i_title_offset = p_input->p->i_seekpoint_offset = 0; p_input->p->i_state = INIT_S; - p_input->p->i_rate = INPUT_RATE_DEFAULT - / var_CreateGetFloat( p_input, "rate" ); - /* Currently, the input rate variable is an integer. So we need to destroy - * the float variable inherited from the configuration. */ - var_Destroy( p_input, "rate" ); + double f_rate = var_InheritFloat( p_input, "rate" ); + if( f_rate <= 0. ) + { + msg_Warn( p_input, "Negative or zero rate values are forbidden" ); + f_rate = 1.; + } + p_input->p->i_rate = INPUT_RATE_DEFAULT / f_rate; p_input->p->b_recording = false; memset( &p_input->p->bookmark, 0, sizeof(p_input->p->bookmark) ); TAB_INIT( p_input->p->i_bookmark, p_input->p->pp_bookmark ); TAB_INIT( p_input->p->i_attachment, p_input->p->attachment ); - p_input->p->p_es_out_display = NULL; - p_input->p->p_es_out = NULL; p_input->p->p_sout = NULL; p_input->p->b_out_pace_control = false; @@ -471,16 +475,20 @@ static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item, if( p_input->b_preparsing ) p_input->i_flags |= OBJECT_FLAGS_QUIET | OBJECT_FLAGS_NOINTERACT; + /* Make sure the interaction option is honored */ + if( !var_InheritBool( p_input, "interact" ) ) + p_input->i_flags |= OBJECT_FLAGS_NOINTERACT; + /* */ memset( &p_input->p->counters, 0, sizeof( p_input->p->counters ) ); vlc_mutex_init( &p_input->p->counters.counters_lock ); + p_input->p->p_es_out_display = input_EsOutNew( p_input, p_input->p->i_rate ); + p_input->p->p_es_out = NULL; + /* Set the destructor when we are sure we are initialized */ vlc_object_set_destructor( p_input, (vlc_destructor_t)Destructor ); - /* Attach only once we are ready */ - vlc_object_attach( p_input, p_parent ); - return p_input; } @@ -498,6 +506,9 @@ static void Destructor( input_thread_t * p_input ) stats_TimerDump( p_input, STATS_TIMER_INPUT_LAUNCHING ); stats_TimerClean( p_input, STATS_TIMER_INPUT_LAUNCHING ); + if( p_input->p->p_es_out_display ) + es_out_Delete( p_input->p->p_es_out_display ); + if( p_input->p->p_resource ) input_resource_Delete( p_input->p->p_resource ); @@ -1036,31 +1047,42 @@ static void LoadSubtitles( input_thread_t *p_input ) /* Load subtitles from attachments */ int i_attachment = 0; - char **ppsz_attachment = NULL; + input_attachment_t **pp_attachment = NULL; vlc_mutex_lock( &p_input->p->p_item->lock ); for( int i = 0; i < p_input->p->i_attachment; i++ ) { const input_attachment_t *a = p_input->p->attachment[i]; if( !strcmp( a->psz_mime, "application/x-srt" ) ) - TAB_APPEND( i_attachment, ppsz_attachment, - strdup( a->psz_name ) ); + TAB_APPEND( i_attachment, pp_attachment, + vlc_input_attachment_New( a->psz_name, NULL, + a->psz_description, NULL, 0 ) ); } vlc_mutex_unlock( &p_input->p->p_item->lock ); + if( i_attachment > 0 ) + var_Create( p_input, "sub-description", VLC_VAR_STRING ); for( int i = 0; i < i_attachment; i++ ) { + input_attachment_t *a = pp_attachment[i]; + if( !a ) + continue; char *psz_mrl; - if( ppsz_attachment[i] && - asprintf( &psz_mrl, "attachment://%s", ppsz_attachment[i] ) >= 0 ) + if( a->psz_name[i] && + asprintf( &psz_mrl, "attachment://%s", a->psz_name ) >= 0 ) { + var_SetString( p_input, "sub-description", a->psz_description ? a->psz_description : ""); + SubtitleAdd( p_input, psz_mrl, b_forced ); + b_forced = false; free( psz_mrl ); } - free( ppsz_attachment[i] ); + vlc_input_attachment_Delete( a ); } - free( ppsz_attachment ); + free( pp_attachment ); + if( i_attachment > 0 ) + var_Destroy( p_input, "sub-description" ); } static void LoadSlaves( input_thread_t *p_input ) @@ -1118,6 +1140,8 @@ static void UpdatePtsDelay( input_thread_t *p_input ) const int i_cr_average = var_GetInteger( p_input, "cr-average" ) * i_pts_delay / DEFAULT_PTS_DELAY; /* */ + es_out_SetDelay( p_input->p->p_es_out_display, AUDIO_ES, i_audio_delay ); + es_out_SetDelay( p_input->p->p_es_out_display, SPU_ES, i_spu_delay ); es_out_SetJitter( p_input->p->p_es_out, i_pts_delay, i_cr_average ); } @@ -1130,7 +1154,6 @@ static void InitPrograms( input_thread_t * p_input ) UpdatePtsDelay( p_input ); /* Set up es_out */ - es_out_Control( p_input->p->p_es_out, ES_OUT_SET_ACTIVE, true ); i_es_out_mode = ES_OUT_MODE_AUTO; if( p_input->p->p_sout ) { @@ -1152,7 +1175,7 @@ static void InitPrograms( input_thread_t * p_input ) } } } - es_out_Control( p_input->p->p_es_out, ES_OUT_SET_MODE, i_es_out_mode ); + es_out_SetMode( p_input->p->p_es_out, i_es_out_mode ); /* Inform the demuxer about waited group (needed only for DVB) */ if( i_es_out_mode == ES_OUT_MODE_ALL ) @@ -1174,7 +1197,7 @@ static void InitPrograms( input_thread_t * p_input ) static int Init( input_thread_t * p_input ) { vlc_meta_t *p_meta; - int i, ret; + int i; for( i = 0; i < p_input->p->p_item->i_options; i++ ) { @@ -1192,16 +1215,12 @@ static int Init( input_thread_t * p_input ) InitStatistics( p_input ); #ifdef ENABLE_SOUT - ret = InitSout( p_input ); - if( ret != VLC_SUCCESS ) - goto error_stats; + if( InitSout( p_input ) ) + goto error; #endif /* Create es out */ - p_input->p->p_es_out_display = input_EsOutNew( p_input, p_input->p->i_rate ); - p_input->p->p_es_out = input_EsOutTimeshiftNew( p_input, p_input->p->p_es_out_display, p_input->p->i_rate ); - es_out_Control( p_input->p->p_es_out, ES_OUT_SET_ACTIVE, false ); - es_out_Control( p_input->p->p_es_out, ES_OUT_SET_MODE, ES_OUT_MODE_NONE ); + p_input->p->p_es_out = input_EsOutTimeshiftNew( p_input, p_input->p->p_es_out_display, p_input->p->i_rate ); /* */ input_ChangeState( p_input, OPENING_S ); @@ -1281,8 +1300,7 @@ error: if( p_input->p->p_es_out ) es_out_Delete( p_input->p->p_es_out ); - if( p_input->p->p_es_out_display ) - es_out_Delete( p_input->p->p_es_out_display ); + es_out_SetMode( p_input->p->p_es_out_display, ES_OUT_MODE_END ); if( p_input->p->p_resource ) { if( p_input->p->p_sout ) @@ -1291,9 +1309,6 @@ error: input_resource_SetInput( p_input->p->p_resource, NULL ); } -#ifdef ENABLE_SOUT -error_stats: -#endif if( !p_input->b_preparsing && libvlc_stats( p_input ) ) { #define EXIT_COUNTER( c ) do { if( p_input->p->counters.p_##c ) \ @@ -1328,7 +1343,6 @@ error_stats: p_input->p->input.p_stream = NULL; p_input->p->input.p_access = NULL; p_input->p->p_es_out = NULL; - p_input->p->p_es_out_display = NULL; p_input->p->p_sout = NULL; return VLC_EGENERIC; @@ -1348,8 +1362,7 @@ static void End( input_thread_t * p_input ) input_ControlVarStop( p_input ); /* Stop es out activity */ - es_out_Control( p_input->p->p_es_out, ES_OUT_SET_ACTIVE, false ); - es_out_Control( p_input->p->p_es_out, ES_OUT_SET_MODE, ES_OUT_MODE_NONE ); + es_out_SetMode( p_input->p->p_es_out, ES_OUT_MODE_NONE ); /* Clean up master */ InputSourceClean( &p_input->p->input ); @@ -1365,8 +1378,7 @@ static void End( input_thread_t * p_input ) /* Unload all modules */ if( p_input->p->p_es_out ) es_out_Delete( p_input->p->p_es_out ); - if( p_input->p->p_es_out_display ) - es_out_Delete( p_input->p->p_es_out_display ); + es_out_SetMode( p_input->p->p_es_out_display, ES_OUT_MODE_END ); if( !p_input->b_preparsing ) { @@ -1912,19 +1924,13 @@ static bool Control( input_thread_t *p_input, break; case INPUT_CONTROL_SET_AUDIO_DELAY: - if( !es_out_SetDelay( p_input->p->p_es_out_display, AUDIO_ES, val.i_time ) ) - { - input_SendEventAudioDelay( p_input, val.i_time ); - UpdatePtsDelay( p_input ); - } + input_SendEventAudioDelay( p_input, val.i_time ); + UpdatePtsDelay( p_input ); break; case INPUT_CONTROL_SET_SPU_DELAY: - if( !es_out_SetDelay( p_input->p->p_es_out_display, SPU_ES, val.i_time ) ) - { - input_SendEventSubtitleDelay( p_input, val.i_time ); - UpdatePtsDelay( p_input ); - } + input_SendEventSubtitleDelay( p_input, val.i_time ); + UpdatePtsDelay( p_input ); break; case INPUT_CONTROL_SET_TITLE: @@ -2187,7 +2193,7 @@ static bool Control( input_thread_t *p_input, else if( bookmark.i_byte_offset >= 0 && p_input->p->input.p_stream ) { - const int64_t i_size = stream_Size( p_input->p->input.p_stream ); + const uint64_t i_size = stream_Size( p_input->p->input.p_stream ); if( i_size > 0 && bookmark.i_byte_offset <= i_size ) { val.f_float = (double)bookmark.i_byte_offset / i_size; @@ -2631,26 +2637,11 @@ static int InputSourceInit( input_thread_t *p_input, psz_demux = in->p_access->psz_demux; } - { - /* Take access/stream redirections into account */ - char *psz_real_path; - char *psz_buf = NULL; - if( in->p_stream->psz_path ) - { - const char *psz_a, *psz_d; - psz_buf = strdup( in->p_stream->psz_path ); - input_SplitMRL( &psz_a, &psz_d, &psz_real_path, psz_buf ); - } - else - { - psz_real_path = psz_path; - } - in->p_demux = demux_New( p_input, p_input, psz_access, psz_demux, - psz_real_path, - in->p_stream, p_input->p->p_es_out, - p_input->b_preparsing ); - free( psz_buf ); - } + in->p_demux = demux_New( p_input, p_input, psz_access, psz_demux, + /* Take access/stream redirections into account: */ + in->p_stream->psz_path ? in->p_stream->psz_path : psz_path, + in->p_stream, p_input->p->p_es_out, + p_input->b_preparsing ); if( in->p_demux == NULL ) { @@ -2798,6 +2789,7 @@ static void InputSourceMeta( input_thread_t *p_input, VLC_OBJECT_GENERIC, "demux meta" ); if( !p_demux_meta ) return; + vlc_object_attach( p_demux_meta, p_demux ); p_demux_meta->p_demux = p_demux; p_demux_meta->p_item = p_input->p->p_item; @@ -3004,7 +2996,7 @@ static void InputGetExtraFilesPattern( input_thread_t *p_input, if( asprintf( &psz_file, psz_format, psz_base, i ) < 0 ) break; - if( utf8_stat( psz_file, &st ) || !S_ISREG( st.st_mode ) || !st.st_size ) + if( vlc_stat( psz_file, &st ) || !S_ISREG( st.st_mode ) || !st.st_size ) { free( psz_file ); break; @@ -3086,11 +3078,11 @@ static void input_ChangeState( input_thread_t *p_input, int i_state ) * MRLSplit: parse the access, demux and url part of the * Media Resource Locator. *****************************************************************************/ -void input_SplitMRL( const char **ppsz_access, const char **ppsz_demux, char **ppsz_path, - char *psz_dup ) +void input_SplitMRL( const char **ppsz_access, const char **ppsz_demux, + char **ppsz_path, char *psz_dup ) { - char *psz_access = NULL; - char *psz_demux = NULL; + const char *psz_access; + const char *psz_demux = ""; char *psz_path; /* Either there is an access/demux specification before :// @@ -3103,22 +3095,32 @@ void input_SplitMRL( const char **ppsz_access, const char **ppsz_demux, char **p /* Separate access from demux (/://) */ psz_access = psz_dup; - psz_demux = strchr( psz_access, '/' ); - if( psz_demux ) - *psz_demux++ = '\0'; /* We really don't want module name substitution here! */ if( psz_access[0] == '$' ) psz_access++; - if( psz_demux && psz_demux[0] == '$' ) - psz_demux++; + + char *p = strchr( psz_access, '/' ); + if( p ) + { + *p = '\0'; + psz_demux = p + 1; + if( psz_demux[0] == '$' ) + psz_demux++; + } } else { +#ifndef NDEBUG + fprintf( stderr, "%s(\"%s\"): not a valid URI!\n", __func__, + psz_dup ); +#endif psz_path = psz_dup; + psz_access = ""; } - *ppsz_access = psz_access ? psz_access : ""; - *ppsz_demux = psz_demux ? psz_demux : ""; + + *ppsz_access = psz_access; + *ppsz_demux = psz_demux; *ppsz_path = psz_path; } @@ -3236,7 +3238,7 @@ static void SubtitleAdd( input_thread_t *p_input, char *psz_subtitle, bool b_for strcpy( psz_extension, ".idx" ); - if( !utf8_stat( psz_path, &st ) && S_ISREG( st.st_mode ) ) + if( !vlc_stat( psz_path, &st ) && S_ISREG( st.st_mode ) ) { msg_Dbg( p_input, "using %s subtitles file instead of %s", psz_path, psz_subtitle ); @@ -3321,7 +3323,7 @@ char *input_CreateFilename( vlc_object_t *p_obj, const char *psz_path, const cha char *psz_file; DIR *path; - path = utf8_opendir( psz_path ); + path = vlc_opendir( psz_path ); if( path ) { closedir( path ); @@ -3330,16 +3332,14 @@ char *input_CreateFilename( vlc_object_t *p_obj, const char *psz_path, const cha if( !psz_tmp ) return NULL; - char *psz_tmp2 = filename_sanitize( psz_tmp ); - free( psz_tmp ); + filename_sanitize( psz_tmp ); - if( !psz_tmp2 || - asprintf( &psz_file, "%s"DIR_SEP"%s%s%s", - psz_path, psz_tmp2, + if( asprintf( &psz_file, "%s"DIR_SEP"%s%s%s", + psz_path, psz_tmp, psz_extension ? "." : "", psz_extension ? psz_extension : "" ) < 0 ) psz_file = NULL; - free( psz_tmp2 ); + free( psz_tmp ); return psz_file; } else