* Read an MPEG2 stream, demultiplex and parse it before sending it to
* decoders.
*****************************************************************************
- * Copyright (C) 1998-2001 VideoLAN
- * $Id: input.c,v 1.180 2002/03/01 00:33:18 massiot Exp $
+ * Copyright (C) 1998-2002 VideoLAN
+ * $Id: input.c,v 1.214 2002/11/10 18:04:23 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
- * Alexis Guillard <alexis.guillard@bt.com>
*
* 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
* Preamble
*****************************************************************************/
#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <videolan/vlc.h>
+#include <vlc/vlc.h>
+
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#ifdef HAVE_FCNTL_H
+# include <fcntl.h>
+#endif
#include <string.h>
-#include <errno.h>
#ifdef HAVE_SYS_TIMES_H
# include <sys/times.h>
#endif
#include "netutils.h"
-
-#include "intf_playlist.h"
+#include "vlc_playlist.h"
#include "stream_control.h"
#include "input_ext-intf.h"
#include "input_ext-dec.h"
#include "input_ext-plugins.h"
+#include "stream_output.h"
+
#include "interface.h"
/*****************************************************************************
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 CloseThread ( input_thread_t *p_input );
-static void DestroyThread ( input_thread_t *p_input );
static void EndThread ( input_thread_t *p_input );
-/*****************************************************************************
- * input_InitBank: initialize the input bank.
- *****************************************************************************/
-void input_InitBank ( void )
-{
- p_input_bank->i_count = 0;
-
- /* XXX: Workaround for old interface modules */
- p_input_bank->pp_input[0] = NULL;
-
- vlc_mutex_init( &p_input_bank->lock );
-}
-
-/*****************************************************************************
- * input_EndBank: empty the input bank.
- *****************************************************************************
- * This function ends all unused inputs and empties the bank in
- * case of success.
- *****************************************************************************/
-void input_EndBank ( void )
-{
- int i_input;
-
- /* Ask all remaining video outputs to die */
- for( i_input = 0; i_input < p_input_bank->i_count; i_input++ )
- {
- input_StopThread(
- p_input_bank->pp_input[ i_input ], NULL );
- input_DestroyThread(
- p_input_bank->pp_input[ i_input ] );
- }
-
- vlc_mutex_destroy( &p_input_bank->lock );
-}
-
/*****************************************************************************
* input_CreateThread: creates a new input thread
*****************************************************************************
* If pi_status is NULL, then the function will block until the thread is ready.
* If not, it will be updated using one of the THREAD_* constants.
*****************************************************************************/
-input_thread_t *input_CreateThread ( playlist_item_t *p_item, int *pi_status )
+input_thread_t *__input_CreateThread( vlc_object_t *p_parent,
+ playlist_item_t *p_item, int *pi_status )
{
input_thread_t * p_input; /* thread descriptor */
+ input_info_category_t * p_info;
/* Allocate descriptor */
- p_input = (input_thread_t *)malloc( sizeof(input_thread_t) );
+ p_input = vlc_object_create( p_parent, VLC_OBJECT_INPUT );
if( p_input == NULL )
{
- intf_ErrMsg( "input error: can't allocate input thread (%s)",
- strerror(errno) );
- return( NULL );
+ msg_Err( p_parent, "out of memory" );
+ return NULL;
}
/* Initialize thread properties */
- p_input->b_die = 0;
- p_input->b_error = 0;
p_input->b_eof = 0;
/* Set target */
p_input->psz_source = strdup( p_item->psz_name );
- /* Set status */
- p_input->i_status = THREAD_CREATE;
+ /* Demux */
+ p_input->p_demux = NULL;
+
+ /* Access */
+ p_input->p_access = NULL;
+ p_input->i_bufsize = 0;
+ p_input->i_mtu = 0;
+
/* 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->stream.stream_lock );
- vlc_cond_init( &p_input->stream.stream_wait );
- vlc_mutex_init( &p_input->stream.control.control_lock );
+ 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_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.control.i_status = PLAYING_S;
p_input->stream.control.i_rate = DEFAULT_RATE;
p_input->stream.control.b_mute = 0;
- p_input->stream.control.b_grayscale = config_GetIntVariable(
- VOUT_GRAYSCALE_VAR );
- p_input->stream.control.i_smp = config_GetIntVariable( VDEC_SMP_VAR );
-
- intf_WarnMsg( 1, "input: playlist item `%s'", p_input->psz_source );
+ p_input->stream.control.b_grayscale = config_GetInt( p_input, "grayscale" );
- /* Create thread. */
- if( vlc_thread_create( &p_input->thread_id, "input",
- (vlc_thread_func_t)RunThread, (void *) p_input ) )
+ /* Initialize input info */
+ p_input->stream.p_info = malloc( sizeof( input_info_category_t ) );
+ if( !p_input->stream.p_info )
{
- intf_ErrMsg( "input error: can't create input thread (%s)",
- strerror(errno) );
- free( p_input );
- return( NULL );
+ msg_Err( p_input, "No memory!" );
+ return NULL;
}
+ p_input->stream.p_info->psz_name = strdup("General") ;
+ p_input->stream.p_info->p_info = NULL;
+ p_input->stream.p_info->p_next = NULL;
-#if 0
- /* If status is NULL, wait until the thread is created */
- if( pi_status == NULL )
+ msg_Info( p_input, "playlist item `%s'", p_input->psz_source );
+
+ p_info = input_InfoCategory( p_input, "General" );
+ input_AddInfo( p_info, "playlist item", p_input->psz_source );
+ vlc_object_attach( p_input, p_parent );
+
+ /* Create thread and wait for its readiness. */
+ if( vlc_thread_create( p_input, "input", RunThread,
+ VLC_THREAD_PRIORITY_INPUT, VLC_TRUE ) )
{
- do
- {
- msleep( THREAD_SLEEP );
- } while( (i_status != THREAD_READY) && (i_status != THREAD_ERROR)
- && (i_status != THREAD_FATAL) );
+ msg_Err( p_input, "cannot create input thread" );
+ free( p_input );
+ return NULL;
}
-#endif
- return( p_input );
+ return p_input;
}
/*****************************************************************************
*****************************************************************************
* This function should not return until the thread is effectively cancelled.
*****************************************************************************/
-void input_StopThread( input_thread_t *p_input, int *pi_status )
+void input_StopThread( input_thread_t *p_input )
{
/* Make the thread exit from a possible vlc_cond_wait() */
vlc_mutex_lock( &p_input->stream.stream_lock );
-
/* Request thread destruction */
p_input->b_die = 1;
vlc_cond_signal( &p_input->stream.stream_wait );
vlc_mutex_unlock( &p_input->stream.stream_lock );
-
- /* If status is NULL, wait until thread has been destroyed */
-#if 0
- if( pi_status == NULL )
- {
- do
- {
- msleep( THREAD_SLEEP );
- } while ( (i_status != THREAD_OVER) && (i_status != THREAD_ERROR)
- && (i_status != THREAD_FATAL) );
- }
-#endif
}
/*****************************************************************************
void input_DestroyThread( input_thread_t *p_input )
{
/* Join the thread */
- vlc_thread_join( p_input->thread_id );
+ 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 );
-
- /* Free input structure */
- free( p_input );
}
/*****************************************************************************
*****************************************************************************/
static int RunThread( input_thread_t *p_input )
{
+ /* Signal right now, otherwise we'll get stuck in a peek */
+ vlc_thread_ready( p_input );
+
if( InitThread( p_input ) )
{
/* If we failed, wait before we are killed, and exit */
- p_input->i_status = THREAD_ERROR;
p_input->b_error = 1;
ErrorThread( p_input );
- DestroyThread( p_input );
+ p_input->b_dead = 1;
return 0;
}
- p_input->i_status = THREAD_READY;
-
/* initialization is complete */
vlc_mutex_lock( &p_input->stream.stream_lock );
p_input->stream.b_changed = 1;
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 );
+ p_input->stream.p_new_program );
+
+ /* 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++ )
{
pgrm_descriptor_t * p_pgrm
= p_input->stream.pp_programs[i];
- /* Escape all decoders for the stream discontinuity they
- * will encounter. */
- input_EscapeDiscontinuity( p_input, p_pgrm );
/* Reinitialize synchro. */
p_pgrm->i_synchro_state = SYNCHRO_REINIT;
{
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++ )
{
pgrm_descriptor_t * p_pgrm
= p_input->stream.pp_programs[i];
- /* Escape all decoders for the stream discontinuity they
- * will encounter. */
- input_EscapeDiscontinuity( p_input, p_pgrm );
/* Reinitialize synchro. */
p_pgrm->i_synchro_state = SYNCHRO_REINIT;
if( p_input->stream.p_selected_area->i_seek != NO_SEEK )
{
- if( p_input->stream.b_seekable && p_input->pf_seek != NULL )
+ if( p_input->stream.b_seekable
+ && p_input->pf_seek != NULL )
{
- off_t i_new_pos = p_input->stream.p_selected_area->i_seek;
+ off_t i_new_pos;
+
+ /* Reinitialize buffer manager. */
+ input_AccessReinit( p_input );
+
+ i_new_pos = p_input->stream.p_selected_area->i_seek;
vlc_mutex_unlock( &p_input->stream.stream_lock );
p_input->pf_seek( p_input, i_new_pos );
vlc_mutex_lock( &p_input->stream.stream_lock );
+ /* 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++ )
{
pgrm_descriptor_t * p_pgrm
= p_input->stream.pp_programs[i];
- /* Escape all decoders for the stream discontinuity they
- * will encounter. */
- input_EscapeDiscontinuity( p_input, p_pgrm );
/* Reinitialize synchro. */
p_pgrm->i_synchro_state = SYNCHRO_REINIT;
}
-
- /* Reinitialize buffer manager. */
- input_AccessReinit( p_input );
}
p_input->stream.p_selected_area->i_seek = NO_SEEK;
}
if( i_count == 0 && p_input->stream.b_seekable )
{
/* End of file - we do not set b_die because only the
- * interface is allowed to do so. */
- intf_WarnMsg( 3, "input: EOF reached" );
+ * playlist is allowed to do so. */
+ msg_Info( p_input, "EOF reached" );
p_input->b_eof = 1;
}
else if( i_count < 0 )
EndThread( p_input );
- DestroyThread( p_input );
-
return 0;
}
{
psz_parser++;
}
+#ifdef WIN32
+ if( psz_parser - p_input->psz_source == 1 )
+ {
+ msg_Warn( p_input, "drive letter %c: found in source string",
+ p_input->psz_source ) ;
+ psz_parser = "";
+ }
+#endif
if( !*psz_parser )
{
- p_input->psz_access = p_input->psz_demux = NULL;
+ p_input->psz_access = p_input->psz_demux = "";
p_input->psz_name = p_input->psz_source;
}
else
{
*psz_parser++ = '\0';
- p_input->psz_name = psz_parser;
+ /* let's skip '//' */
+ if( psz_parser[0] == '/' && psz_parser[1] == '/' )
+ {
+ psz_parser += 2 ;
+ }
+
+ p_input->psz_name = psz_parser ;
/* Come back to parse the access and demux plug-ins */
psz_parser = p_input->psz_source;
+
if( !*psz_parser )
{
/* No access */
- p_input->psz_access = NULL;
+ p_input->psz_access = "";
}
else if( *psz_parser == '/' )
{
/* No access */
- p_input->psz_access = NULL;
+ p_input->psz_access = "";
psz_parser++;
}
else
if( !*psz_parser )
{
/* No demux */
- p_input->psz_demux = NULL;
+ p_input->psz_demux = "";
}
else
{
}
}
- intf_WarnMsg( 2, "input: access=%s demux=%s name=%s",
- p_input->psz_access, p_input->psz_demux,
- p_input->psz_name );
+ msg_Dbg( p_input, "access `%s', demux `%s', name `%s'",
+ p_input->psz_access, p_input->psz_demux, p_input->psz_name );
if( input_AccessInit( p_input ) == -1 )
{
- return( -1 );
+ return -1;
}
- /* Find and open appropriate access plug-in. */
- p_input->p_access_module = module_Need( MODULE_CAPABILITY_ACCESS,
- p_input->psz_access,
- (void *)p_input );
+ /* Find and open appropriate access module */
+ p_input->p_access = module_Need( p_input, "access",
+ p_input->psz_access );
- if( p_input->p_access_module == NULL )
+ if( p_input->p_access == NULL )
{
- intf_ErrMsg( "input error: no suitable access plug-in for `%s/%s:%s'",
- p_input->psz_access, p_input->psz_demux,
- p_input->psz_name );
- return( -1 );
+ msg_Err( p_input, "no suitable access module for `%s/%s://%s'",
+ p_input->psz_access, p_input->psz_demux, p_input->psz_name );
+ return -1;
}
-#define f p_input->p_access_module->p_functions->access.functions.access
- p_input->pf_open = f.pf_open;
- p_input->pf_close = f.pf_close;
- p_input->pf_read = f.pf_read;
- p_input->pf_set_area = f.pf_set_area;
- p_input->pf_set_program = f.pf_set_program;
- p_input->pf_seek = f.pf_seek;
-#undef f
-
/* Waiting for stream. */
if( p_input->i_mtu )
{
p_input->i_bufsize = INPUT_DEFAULT_BUFSIZE;
}
- if( p_input->p_current_data == NULL )
+ if( p_input->p_current_data == NULL && p_input->pf_read != NULL )
{
while( !input_FillBuffer( p_input ) )
{
- if( p_input->b_die || p_input->b_error )
+ if( p_input->b_die || p_input->b_error || p_input->b_eof )
{
- module_Unneed( p_input->p_access_module );
- return( -1 );
+ module_Unneed( p_input, p_input->p_access );
+ return -1;
}
}
}
- /* Find and open appropriate demux plug-in. */
- p_input->p_demux_module = module_Need( MODULE_CAPABILITY_DEMUX,
- p_input->psz_demux,
- (void *)p_input );
+ /* Find and open appropriate demux module */
+ p_input->p_demux = module_Need( p_input, "demux",
+ p_input->psz_demux );
- if( p_input->p_demux_module == NULL )
+ if( p_input->p_demux== NULL )
{
- intf_ErrMsg( "input error: no suitable demux plug-in for `%s/%s:%s'",
- p_input->psz_access, p_input->psz_demux,
- p_input->psz_name );
- module_Unneed( p_input->p_access_module );
- return( -1 );
+ msg_Err( p_input, "no suitable demux module for `%s/%s://%s'",
+ p_input->psz_access, p_input->psz_demux, p_input->psz_name );
+ module_Unneed( p_input, p_input->p_access );
+ return -1;
}
-#define f p_input->p_demux_module->p_functions->demux.functions.demux
- p_input->pf_init = f.pf_init;
- p_input->pf_end = f.pf_end;
- p_input->pf_demux = f.pf_demux;
- p_input->pf_rewind = f.pf_rewind;
-#undef f
+ /* Initialize optional stream output. */
+ psz_parser = config_GetPsz( p_input, "sout" );
+ if ( psz_parser != NULL )
+ {
+ if ( *psz_parser &&
+ (p_input->stream.p_sout = sout_NewInstance( p_input, psz_parser ))
+ == NULL )
+ {
+ msg_Err( p_input, "cannot start stream output instance, aborting" );
+ free( psz_parser );
+ module_Unneed( p_input, p_input->p_access );
+ module_Unneed( p_input, p_input->p_demux );
+ return -1;
+ }
+
+ free( psz_parser );
+ }
- return( 0 );
+ return 0;
}
/*****************************************************************************
*****************************************************************************/
static void EndThread( input_thread_t * p_input )
{
- /* Store status */
- p_input->i_status = THREAD_END;
-
- if( p_main->b_stats )
- {
#ifdef HAVE_SYS_TIMES_H
- /* Display statistics */
- struct tms cpu_usage;
- times( &cpu_usage );
+ /* Display statistics */
+ struct tms cpu_usage;
+ times( &cpu_usage );
- intf_StatMsg( "input stats: %d loops consuming user: %d, system: %d",
- p_input->c_loops,
- cpu_usage.tms_utime, cpu_usage.tms_stime );
+ msg_Dbg( p_input, "%d loops consuming user: %d, system: %d",
+ p_input->c_loops, cpu_usage.tms_utime, cpu_usage.tms_stime );
#else
- intf_StatMsg( "input stats: %d loops", p_input->c_loops );
+ msg_Dbg( p_input, "%d loops", p_input->c_loops );
#endif
- input_DumpStream( p_input );
- }
+ /* Free info structures */
+ msg_Dbg( p_input, "freeing info structures...");
+ input_DelInfo( p_input );
+
+ input_DumpStream( p_input );
/* Free all ES and destroy all decoder threads */
input_EndStream( p_input );
+ /* Close optional stream output instance */
+ if ( p_input->stream.p_sout != NULL )
+ {
+ sout_DeleteInstance( p_input->stream.p_sout );
+ }
+
/* Free demultiplexer's data */
- p_input->pf_end( p_input );
- module_Unneed( p_input->p_demux_module );
+ module_Unneed( p_input, p_input->p_demux );
/* Close the access plug-in */
- CloseThread( p_input );
-}
-
-/*****************************************************************************
- * CloseThread: close the target
- *****************************************************************************/
-static void CloseThread( input_thread_t * p_input )
-{
- p_input->pf_close( p_input );
- module_Unneed( p_input->p_access_module );
+ module_Unneed( p_input, p_input->p_access );
input_AccessEnd( p_input );
free( p_input->psz_source );
-}
-/*****************************************************************************
- * DestroyThread: destroy the input thread
- *****************************************************************************/
-static void DestroyThread( input_thread_t * p_input )
-{
- /* Update status */
- p_input->i_status = THREAD_OVER;
+ /* Tell we're dead */
+ p_input->b_dead = 1;
}
projects / vlc / blobdiff