* decoders.
*****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN
+ * $Id: input.c,v 1.80 2001/02/12 13:20:14 massiot Exp $
*
- * Authors:
+ * Authors: Christophe Massiot <massiot@via.ecp.fr>
*
* 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
#include <string.h>
#include <errno.h>
+#ifdef STATS
+# include <sys/times.h>
+#endif
+
#include "config.h"
#include "common.h"
#include "threads.h"
#include "mtime.h"
+#include "modules.h"
#include "intf_msg.h"
+#include "intf_plst.h"
#include "stream_control.h"
#include "input_ext-intf.h"
#include "input_ext-dec.h"
#include "input.h"
+#include "interface.h"
+
+#include "main.h"
/*****************************************************************************
* Local prototypes
static void InitThread ( input_thread_t *p_input );
static void ErrorThread ( input_thread_t *p_input );
static void EndThread ( input_thread_t *p_input );
-static void NetworkOpen ( input_thread_t *p_input );
-static void FileOpen ( input_thread_t *p_input );
/*****************************************************************************
* 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 ( input_config_t * p_config, int *pi_status )
+input_thread_t *input_CreateThread ( playlist_item_t *p_item, int *pi_status )
{
input_thread_t * p_input; /* thread descriptor */
int i_status; /* thread status */
- int i;
/* Allocate descriptor */
- intf_DbgMsg("\n");
p_input = (input_thread_t *)malloc( sizeof(input_thread_t) );
if( p_input == NULL )
{
- intf_ErrMsg("error: %s\n", strerror(errno));
- free( p_config );
+ intf_ErrMsg( "input error: can't allocate input thread (%s)",
+ strerror(errno) );
return( NULL );
}
/* Initialize thread properties */
p_input->b_die = 0;
p_input->b_error = 0;
+ p_input->b_eof = 0;
+
+ /* Set target */
+ p_input->p_source = p_item->psz_name;
+
/* I have never understood that stuff --Meuuh */
p_input->pi_status = (pi_status != NULL) ? pi_status : &i_status;
*p_input->pi_status = THREAD_CREATE;
- p_input->p_config = p_config;
/* Initialize stream description */
- for( i = 0; i < INPUT_MAX_SELECTED_ES; i++ )
- {
- p_input->pp_selected_es[i] = NULL;
- }
- for( i= 0; i < INPUT_MAX_ES; i++ )
- {
- p_input->p_es[i].i_id = EMPTY_ID;
- }
+ 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.i_seek = NO_SEEK;
/* Initialize stream control properties. */
p_input->stream.control.i_status = PLAYING_S;
p_input->stream.control.i_rate = DEFAULT_RATE;
- p_input->stream.control.i_ref_sysdate = 0;
- p_input->stream.control.i_ref_clock = 0;
p_input->stream.control.b_mute = 0;
p_input->stream.control.b_bw = 0;
+ /* Initialize default settings for spawned decoders */
+ p_input->p_default_aout = p_main->p_aout;
+ p_input->p_default_vout = p_main->p_vout;
+
/* Create thread and 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 );
if( vlc_thread_create( &p_input->thread_id, "input", (void *) RunThread,
(void *) p_input ) )
{
- intf_ErrMsg("error: %s\n", strerror(errno) );
+ intf_ErrMsg( "input error: can't create input thread (%s)",
+ strerror(errno) );
free( p_input );
- free( p_config );
return( NULL );
}
/* Request thread destruction */
p_input->b_die = 1;
+ /* Make the thread exit of an eventual vlc_cond_wait() */
+ vlc_mutex_lock( &p_input->stream.stream_lock );
+ 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( pi_status == NULL )
{
*****************************************************************************/
static void RunThread( input_thread_t *p_input )
{
- data_packet_t * pp_packets[INPUT_READ_ONCE];
+ data_packet_t * pp_packets[INPUT_READ_ONCE];
+ int i_error, i;
InitThread( p_input );
- while( !p_input->b_die && !p_input->b_error )
+ while( !p_input->b_die && !p_input->b_error && !p_input->b_eof )
{
+
#ifdef STATS
p_input->c_loops++;
#endif
- vlc_mutex_lock( &p_input->stream.control.control_lock );
- if( p_input->stream.control.i_status == BACKWARD_S
- && p_input->p_plugin->pf_rewind != NULL )
+ vlc_mutex_lock( &p_input->stream.stream_lock );
+ if( p_input->stream.i_seek != NO_SEEK )
{
- p_input->p_plugin->pf_rewind( p_input );
- /* FIXME: probably don't do it every loop, but when ? */
+ if( p_input->stream.b_seekable && p_input->pf_seek != NULL )
+ {
+ p_input->pf_seek( p_input, p_input->stream.i_seek );
+
+ 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;
+ }
+ }
+ p_input->stream.i_seek = NO_SEEK;
}
- vlc_mutex_unlock( &p_input->stream.control.control_lock );
+ vlc_mutex_unlock( &p_input->stream.stream_lock );
- p_input->p_plugin->pf_read( p_input, pp_packets );
- if( !p_input->b_error )
+ i_error = p_input->pf_read( p_input, pp_packets );
+
+ /* Demultiplex read packets. */
+ for( i = 0; i < INPUT_READ_ONCE && pp_packets[i] != NULL; i++ )
{
- int i;
+ p_input->pf_demux( p_input, pp_packets[i] );
+ }
- for( i = 0; i < INPUT_READ_ONCE && pp_packets[i] != NULL; i++ )
+ if( i_error )
+ {
+ if( i_error == 1 )
{
- p_input->p_plugin->pf_demux( p_input, pp_packets[i] );
+ /* End of file - we do not set b_die because only the
+ * interface is allowed to do so. */
+ intf_WarnMsg( 1, "End of file reached" );
+ p_input->b_eof = 1;
+ }
+ else
+ {
+ p_input->b_error = 1;
}
}
}
- if( p_input->b_error )
+ if( p_input->b_error || p_input->b_eof )
{
ErrorThread( p_input );
}
}
/*****************************************************************************
- * InitThread: init the input thread
+ * InitThread: init the input Thread
*****************************************************************************/
-input_capabilities_t * PSKludge( void );
static void InitThread( input_thread_t * p_input )
{
- /* Initialize default settings for spawned decoders */
- p_input->p_default_aout = p_input->p_config->p_default_aout;
- p_input->p_default_vout = p_input->p_config->p_default_vout;
#ifdef STATS
/* Initialize statistics */
p_input->c_packets_trashed = 0;
#endif
- /* Use the appropriate input method */
- switch( p_input->p_config->i_method )
+ p_input->p_input_module = module_Need( p_main->p_bank,
+ MODULE_CAPABILITY_INPUT, NULL );
+
+ if( p_input->p_input_module == NULL )
{
- case INPUT_METHOD_FILE: /* file methods */
- FileOpen( p_input );
- break;
- case INPUT_METHOD_VLAN_BCAST: /* vlan network method */
-/* if( !p_main->b_vlans )
- {
- intf_ErrMsg("error: vlans are not activated\n");
- free( p_input );
- return( NULL );
- } */ /* la-lala */
- /* ... pass through */
- case INPUT_METHOD_UCAST: /* network methods */
- case INPUT_METHOD_MCAST:
- case INPUT_METHOD_BCAST:
- NetworkOpen( p_input );
- break;
-#ifdef DEBUG
- default:
- intf_ErrMsg("Unknow input method");
- free( p_input->p_config );
+ intf_ErrMsg( "input error: no suitable input module" );
p_input->b_error = 1;
- break;
-#endif
+ return;
}
- free( p_input->p_config );
+#define f p_input->p_input_module->p_functions->input.functions.input
+ p_input->pf_init = f.pf_init;
+ p_input->pf_open = f.pf_open;
+ p_input->pf_close = f.pf_close;
+ p_input->pf_end = f.pf_end;
+ p_input->pf_read = f.pf_read;
+ p_input->pf_demux = f.pf_demux;
+ p_input->pf_new_packet = f.pf_new_packet;
+ p_input->pf_new_pes = f.pf_new_pes;
+ p_input->pf_delete_packet = f.pf_delete_packet;
+ p_input->pf_delete_pes = f.pf_delete_pes;
+ p_input->pf_rewind = f.pf_rewind;
+ p_input->pf_seek = f.pf_seek;
+#undef f
+
+ p_input->pf_open( p_input );
- /* Probe plugin (FIXME: load plugins before & write this) */
- p_input->p_plugin = PSKludge();
- p_input->p_plugin->pf_init( p_input );
+ if( p_input->b_error )
+ {
+ module_Unneed( p_main->p_bank, p_input->p_input_module );
+ }
+ else
+ {
+ p_input->pf_init( p_input );
+ }
*p_input->pi_status = THREAD_READY;
}
static void EndThread( input_thread_t * p_input )
{
int * pi_status; /* thread status */
- int i_es_loop; /* es index */
/* Store status */
pi_status = p_input->pi_status;
*pi_status = THREAD_END;
- /* Destroy all decoder threads */
- for( i_es_loop = 0;
- (i_es_loop < INPUT_MAX_ES)
- && (p_input->pp_selected_es[i_es_loop] != NULL) ;
- i_es_loop++ )
+#ifdef STATS
{
- p_input->pp_selected_es[i_es_loop]->p_decoder_fifo->b_die = 1;
- /* Make sure the thread leaves the GetByte() function */
- vlc_mutex_lock( &p_input->pp_selected_es[i_es_loop]->p_decoder_fifo->data_lock);
- vlc_cond_signal( &p_input->pp_selected_es[i_es_loop]->p_decoder_fifo->data_wait );
- vlc_mutex_unlock( &p_input->pp_selected_es[i_es_loop]->p_decoder_fifo->data_lock );
-
- /* Waiting for the thread to exit */
- vlc_thread_join( p_input->pp_selected_es[i_es_loop]->thread_id );
- free( p_input->pp_selected_es[i_es_loop]->p_decoder_fifo );
+ struct tms cpu_usage;
+ times( &cpu_usage );
+
+ intf_Msg("input stats: cpu usage (user: %d, system: %d)",
+ cpu_usage.tms_utime, cpu_usage.tms_stime);
}
+#endif
+
+ /* Free all ES and destroy all decoder threads */
+ input_EndStream( p_input );
+
+ /* Close stream */
+ p_input->pf_close( p_input );
/* Free demultiplexer's data */
+ p_input->pf_end( p_input );
- /* Update status */
- *pi_status = THREAD_OVER;
-}
+ /* Release modules */
+ module_Unneed( p_main->p_bank, p_input->p_input_module );
-/*****************************************************************************
- * NetworkOpen : open a network socket descriptor
- *****************************************************************************/
-static void NetworkOpen( input_thread_t * p_input )
-{
- /* straight copy & paste of input_network.c of input-I */
+ /* Destroy Mutex locks */
+ vlc_mutex_destroy( &p_input->stream.control.control_lock );
+ vlc_mutex_destroy( &p_input->stream.stream_lock );
+
+ /* Free input structure */
+ free( p_input );
- /* We cannot rewind nor lseek() */
- p_input->stream.b_seekable = 0;
- /* We cannot control the pace */
- p_input->stream.b_pace_control = 0;
+ /* Update status */
+ *pi_status = THREAD_OVER;
}
/*****************************************************************************
- * FileOpen : open a file descriptor
+ * input_FileOpen : open a file descriptor
*****************************************************************************/
-static void FileOpen( input_thread_t * p_input )
+void input_FileOpen( input_thread_t * p_input )
{
struct stat stat_info;
-#define p_config p_input->p_config
-
- if( stat( p_config->p_source, &stat_info ) == (-1) )
+ if( stat( p_input->p_source, &stat_info ) == (-1) )
{
- intf_ErrMsg("Cannot stat() file %s (%s)", p_config->p_source,
- strerror(errno));
+ intf_ErrMsg( "input error: cannot stat() file `%s' (%s)",
+ p_input->p_source, strerror(errno));
p_input->b_error = 1;
return;
}
else
{
vlc_mutex_unlock( &p_input->stream.stream_lock );
- intf_ErrMsg("Unknown file type");
+ intf_ErrMsg( "input error: unknown file type for `%s'",
+ p_input->p_source );
p_input->b_error = 1;
return;
}
p_input->stream.i_tell = 0;
vlc_mutex_unlock( &p_input->stream.stream_lock );
- intf_Msg( "Opening file %s", p_config->p_source );
- if( (p_input->i_handle = open( p_config->p_source,
+ intf_Msg( "input: opening file %s", p_input->p_source );
+ if( (p_input->i_handle = open( p_input->p_source,
/*O_NONBLOCK | O_LARGEFILE*/0 )) == (-1) )
{
- intf_ErrMsg("Cannot open file (%s)", strerror(errno));
+ intf_ErrMsg( "input error: cannot open file (%s)", strerror(errno) );
p_input->b_error = 1;
return;
}
-#undef p_config
}
+
+/*****************************************************************************
+ * input_FileClose : close a file descriptor
+ *****************************************************************************/
+void input_FileClose( input_thread_t * p_input )
+{
+ close( p_input->i_handle );
+
+ return;
+}
+
projects / vlc / blobdiff