* decoders.
*****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: input.c,v 1.102 2001/04/28 03:36:25 sam Exp $
+ * $Id: input.c,v 1.130 2001/08/27 16:13:20 massiot Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
-#include <unistd.h>
+
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#elif defined( _MSC_VER ) && defined( _WIN32 )
+# include <io.h>
+#endif
+
#include <string.h>
+#include <errno.h>
+
#ifdef STRNCASECMP_IN_STRINGS_H
# include <strings.h>
#endif
-#include <errno.h>
-/* Network functions */
-
-#if !defined( SYS_BEOS ) && !defined( SYS_NTO ) && !defined( WIN32 )
-#include <netdb.h> /* hostent ... */
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <sys/types.h>
-#include <sys/socket.h>
+#ifdef WIN32
+# include <winsock2.h>
+#elif !defined( SYS_BEOS ) && !defined( SYS_NTO )
+# include <netdb.h> /* hostent ... */
+# include <sys/socket.h>
+# include <netinet/in.h>
+# include <sys/types.h>
+# include <sys/socket.h>
#endif
#ifdef STATS
#include "stream_control.h"
#include "input_ext-intf.h"
#include "input_ext-dec.h"
+#include "input_ext-plugins.h"
-#include "input.h"
#include "interface.h"
#include "main.h"
- /* #include <netutils.h> */
-
-
/*****************************************************************************
* Local prototypes
*****************************************************************************/
static void DestroyThread ( input_thread_t *p_input );
static void EndThread ( input_thread_t *p_input );
+static void FileOpen ( input_thread_t *p_input );
+static void FileClose ( input_thread_t *p_input );
+#if !defined( SYS_BEOS ) && !defined( SYS_NTO )
+static void NetworkOpen ( input_thread_t *p_input );
+static void NetworkClose ( input_thread_t *p_input );
+#endif
+
/*****************************************************************************
* input_CreateThread: creates a new input thread
*****************************************************************************
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;
/* no stream, no area */
p_input->stream.i_area_nb = 0;
p_input->stream.pp_areas = NULL;
p_input->stream.p_selected_area = NULL;
- /* By default there is one areas in a stream */
+ p_input->stream.p_new_area = NULL;
+
+ /* By default there is one area in a stream */
input_AddArea( p_input );
p_input->stream.p_selected_area = p_input->stream.pp_areas[0];
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_bw = 0;
+ p_input->stream.control.b_grayscale = main_GetIntVariable(
+ VOUT_GRAYSCALE_VAR, VOUT_GRAYSCALE_DEFAULT );
+ p_input->stream.control.i_smp = main_GetIntVariable(
+ VDEC_SMP_VAR, VDEC_SMP_DEFAULT );
+
+ /* Setup callbacks */
+ p_input->pf_file_open = FileOpen;
+ p_input->pf_file_close = FileClose;
+#if !defined( SYS_BEOS ) && !defined( SYS_NTO )
+ p_input->pf_network_open = NetworkOpen;
+ p_input->pf_network_close = NetworkClose;
+#endif
- /* Initialize default settings for spawned decoders */
- p_input->p_default_aout = p_main->p_aout;
- p_input->p_default_vout = p_main->p_vout;
+ intf_WarnMsg( 1, "input: playlist item `%s'", p_input->p_source );
- /* 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 );
+ /* Create thread. */
if( vlc_thread_create( &p_input->thread_id, "input", (void *) RunThread,
(void *) p_input ) )
{
static void RunThread( input_thread_t *p_input )
{
int i_error, i;
+ data_packet_t ** pp_packets;
if( InitThread( p_input ) )
{
-
/* If we failed, wait before we are killed, and exit */
*p_input->pi_status = THREAD_ERROR;
p_input->b_error = 1;
p_input->stream.b_changed = 1;
vlc_mutex_unlock( &p_input->stream.stream_lock );
- while( !p_input->b_die && !p_input->b_error && !p_input->b_eof )
+ pp_packets = (data_packet_t **) malloc( p_input->i_read_once *
+ sizeof( data_packet_t * ) );
+ if( pp_packets == NULL )
{
- data_packet_t * pp_packets[p_input->i_read_once];
+ intf_ErrMsg( "input error: out of memory" );
+ free( pp_packets );
+ p_input->b_error = 1;
+ }
+ 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.stream_lock );
+ if( p_input->stream.p_new_area )
+ {
+ if( p_input->stream.b_seekable && p_input->pf_set_area != NULL )
+ {
+
+ p_input->pf_set_area( p_input, p_input->stream.p_new_area );
+
+ 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.p_new_area = NULL;
+ }
+
if( p_input->stream.p_selected_area->i_seek != NO_SEEK )
{
if( p_input->stream.b_seekable && p_input->pf_seek != NULL )
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 )
+ {
+ input_EscapeAudioDiscontinuity( p_input );
+ }
+
+ 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 );
i_error = p_input->pf_read( p_input, pp_packets );
{
/* End of file - we do not set b_die because only the
* interface is allowed to do so. */
- intf_WarnMsg( 1, "input: EOF reached" );
+ intf_WarnMsg( 3, "input: EOF reached" );
p_input->b_eof = 1;
}
else
}
}
+ free( pp_packets );
+
if( p_input->b_error || p_input->b_eof )
{
ErrorThread( p_input );
p_input->c_packets_trashed = 0;
#endif
- p_input->p_input_module = module_Need( p_main->p_bank,
- MODULE_CAPABILITY_INPUT,
+ /* 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 );
+
+ /* Default, might get overwritten */
+ p_input->pf_open = p_input->pf_file_open;
+ p_input->pf_close = p_input->pf_file_close;
+
+ p_input->p_input_module = module_Need( MODULE_CAPABILITY_INPUT,
(probedata_t *)p_input );
if( p_input->p_input_module == NULL )
#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;
+ if( f.pf_open != NULL )
+ {
+ p_input->pf_open = f.pf_open;
+ }
+ if( f.pf_close != NULL )
+ {
+ p_input->pf_close = f.pf_close;
+ }
p_input->pf_end = f.pf_end;
+ p_input->pf_init_bit_stream= f.pf_init_bit_stream;
p_input->pf_read = f.pf_read;
p_input->pf_set_area = f.pf_set_area;
p_input->pf_demux = f.pf_demux;
p_input->pf_rewind = f.pf_rewind;
p_input->pf_seek = f.pf_seek;
#undef f
+
+ /* We found the appropriate plugin, open the target */
p_input->pf_open( p_input );
if( p_input->b_error )
{
/* We barfed -- exit nicely */
- p_input->pf_close( p_input );
- module_Unneed( p_main->p_bank, p_input->p_input_module );
+ module_Unneed( p_input->p_input_module );
return( -1 );
}
{
/* We barfed -- exit nicely */
p_input->pf_close( p_input );
- module_Unneed( p_main->p_bank, p_input->p_input_module );
+ module_Unneed( p_input->p_input_module );
return( -1 );
}
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);
+ intf_Msg( "input stats: cpu usage (user: %d, system: %d)",
+ cpu_usage.tms_utime, cpu_usage.tms_stime );
}
#endif
p_input->pf_close( p_input );
/* Release modules */
- module_Unneed( p_main->p_bank, p_input->p_input_module );
+ module_Unneed( p_input->p_input_module );
}
}
/*****************************************************************************
- * input_FileOpen : open a file descriptor
+ * FileOpen : open a file descriptor
*****************************************************************************/
-void input_FileOpen( input_thread_t * p_input )
+static void FileOpen( input_thread_t * p_input )
{
struct stat stat_info;
int i_stat;
p_input->stream.p_selected_area->i_tell = 0;
vlc_mutex_unlock( &p_input->stream.stream_lock );
- intf_Msg( "input: opening file `%s'", p_input->p_source );
-#ifndef WIN32
+ intf_WarnMsg( 2, "input: opening file `%s'", p_input->p_source );
if( (p_input->i_handle = open( psz_name,
/*O_NONBLOCK | O_LARGEFILE*/0 )) == (-1) )
-#else
- if( (p_input->i_handle = open( psz_name, O_BINARY
- /*O_NONBLOCK | O_LARGEFILE*/ )) == (-1) )
-#endif
{
intf_ErrMsg( "input error: cannot open file (%s)", strerror(errno) );
p_input->b_error = 1;
}
/*****************************************************************************
- * input_FileClose : close a file descriptor
+ * FileClose : close a file descriptor
*****************************************************************************/
-void input_FileClose( input_thread_t * p_input )
+static void FileClose( input_thread_t * p_input )
{
- intf_Msg( "input: closing file `%s'", p_input->p_source );
+ intf_WarnMsg( 2, "input: closing file `%s'", p_input->p_source );
+
close( p_input->i_handle );
return;
}
-
-#if !defined( SYS_BEOS ) && !defined( SYS_NTO ) && !defined( WIN32 )
+#if !defined( SYS_BEOS ) && !defined( SYS_NTO )
/*****************************************************************************
- * input_NetworkOpen : open a network socket
+ * NetworkOpen : open a network socket
*****************************************************************************/
-void input_NetworkOpen( input_thread_t * p_input )
+static void NetworkOpen( input_thread_t * p_input )
{
char *psz_server = NULL;
+ char *psz_broadcast = NULL;
int i_port = 0;
int i_opt;
+ int i_opt_size;
struct sockaddr_in sock;
- char * psz_broadcast;
+ unsigned int i_mc_group;
+
+#ifdef WIN32
+ WSADATA Data;
+ int i_err;
+#endif
- /* Are we broadcasting ? */
- psz_broadcast = main_GetPszVariable( INPUT_BROADCAST_VAR, NULL );
+#ifdef WIN32
+ /* WinSock Library Init. */
+ i_err = WSAStartup( MAKEWORD( 1, 1 ), &Data );
+
+ if( i_err )
+ {
+ intf_ErrMsg( "input: can't initiate WinSocks, error %i", i_err );
+ return ;
+ }
+#endif
/* Get the remote server */
if( p_input->p_source != NULL )
*psz_port = '\0';
psz_port++;
- i_port = atoi( psz_port );
+ psz_broadcast = psz_port;
+ while( *psz_broadcast && *psz_broadcast != ':' )
+ {
+ psz_broadcast++;
+ }
+
+ if( *psz_broadcast )
+ {
+ *psz_broadcast = '\0';
+ psz_broadcast++;
+ while( *psz_broadcast && *psz_broadcast == ':' )
+ {
+ psz_broadcast++;
+ }
+ }
+ else
+ {
+ psz_broadcast = NULL;
+ }
+
+ /* port before broadcast address */
+ if( *psz_port != ':' )
+ {
+ i_port = atoi( psz_port );
+ }
}
}
else
{
i_port = main_GetIntVariable( INPUT_PORT_VAR, INPUT_PORT_DEFAULT );
}
-
+
+ if( psz_broadcast == NULL )
+ {
+ /* Are we broadcasting ? */
+ if( main_GetIntVariable( INPUT_BROADCAST_VAR,
+ INPUT_BROADCAST_DEFAULT ) )
+ {
+ psz_broadcast = main_GetPszVariable( INPUT_BCAST_ADDR_VAR,
+ INPUT_BCAST_ADDR_DEFAULT );
+ }
+ else
+ {
+ psz_broadcast = NULL;
+ }
+ }
+
+ intf_WarnMsg( 2, "input: server=%s port=%d broadcast=%s",
+ psz_server, i_port, psz_broadcast );
+
/* Open a SOCK_DGRAM (UDP) socket, in the AF_INET domain, automatic (0)
* protocol */
p_input->i_handle = socket( AF_INET, SOCK_DGRAM, 0 );
if( p_input->i_handle == -1 )
{
- intf_ErrMsg("input error: can't create socket : %s", strerror(errno));
+ intf_ErrMsg( "input error: can't create socket (%s)", strerror(errno) );
p_input->b_error = 1;
return;
}
/* We may want to reuse an already used socket */
i_opt = 1;
if( setsockopt( p_input->i_handle, SOL_SOCKET, SO_REUSEADDR,
- &i_opt, sizeof( i_opt ) ) == -1 )
+ (void *) &i_opt, sizeof( i_opt ) ) == -1 )
{
- intf_ErrMsg("input error: can't configure socket (SO_REUSEADDR: %s)",
- strerror(errno));
+ intf_ErrMsg( "input error: can't configure socket (SO_REUSEADDR: %s)",
+ strerror(errno));
close( p_input->i_handle );
p_input->b_error = 1;
return;
* packet loss caused by scheduling problems */
i_opt = 0x80000;
if( setsockopt( p_input->i_handle, SOL_SOCKET, SO_RCVBUF,
- &i_opt, sizeof( i_opt ) ) == -1 )
+ (void *) &i_opt, sizeof( i_opt ) ) == -1 )
+ {
+ intf_ErrMsg( "input error: can't configure socket (SO_RCVBUF: %s)",
+ strerror(errno));
+ close( p_input->i_handle );
+ p_input->b_error = 1;
+ return;
+ }
+
+ /* Check if we really got what we have asked for, because Linux, etc.
+ * will silently limit the max buffer size to net.core.rmem_max which
+ * is typically only 65535 bytes */
+ i_opt = 0;
+ i_opt_size = sizeof( i_opt );
+ if( getsockopt( p_input->i_handle, SOL_SOCKET, SO_RCVBUF,
+ (void*) &i_opt, &i_opt_size ) == -1 )
{
- intf_ErrMsg("input error: can't configure socket (SO_RCVBUF: %s)",
- strerror(errno));
+ intf_ErrMsg( "input error: can't configure socket (SO_RCVBUF: %s)",
+ strerror(errno));
close( p_input->i_handle );
p_input->b_error = 1;
return;
}
+
+ if( i_opt < 0x80000 )
+ {
+ intf_ErrMsg( "input warning: socket receive buffer size just %d instead of %d bytes.\n",
+ i_opt, 0x80000 );
+ }
/* Build the local socket */
- if ( network_BuildLocalAddr( &sock, i_port, psz_broadcast )
- == -1 )
+ if ( network_BuildLocalAddr( &sock, i_port, psz_broadcast ) == -1 )
{
+ intf_ErrMsg( "input error: can't build local address" );
close( p_input->i_handle );
p_input->b_error = 1;
return;
}
+
+ /* Required for IP_ADD_MEMBERSHIP */
+ i_mc_group = sock.sin_addr.s_addr;
+
+#if defined( WIN32 )
+ if ( psz_broadcast != NULL )
+ {
+ sock.sin_addr.s_addr = INADDR_ANY;
+ }
+#define IN_MULTICAST(a) IN_CLASSD(a)
+#endif
/* Bind it */
if( bind( p_input->i_handle, (struct sockaddr *)&sock,
sizeof( sock ) ) < 0 )
{
- intf_ErrMsg("input error: can't bind socket (%s)", strerror(errno));
+ intf_ErrMsg( "input error: can't bind socket (%s)", strerror(errno) );
close( p_input->i_handle );
p_input->b_error = 1;
return;
}
+ /* Join the m/c group if sock is a multicast address */
+ if( IN_MULTICAST( ntohl(i_mc_group) ) )
+ {
+ struct ip_mreq imr;
+
+ imr.imr_interface.s_addr = htonl(INADDR_ANY);
+ imr.imr_multiaddr.s_addr = i_mc_group;
+ if( setsockopt( p_input->i_handle, IPPROTO_IP,IP_ADD_MEMBERSHIP,
+ (char*)&imr, sizeof(struct ip_mreq) ) == -1 )
+ {
+ intf_ErrMsg( "input error: failed to join IP multicast group (%s)",
+ strerror(errno) );
+ close( p_input->i_handle);
+ p_input->b_error = 1;
+ return;
+ }
+ }
+
/* Build socket for remote connection */
if ( network_BuildRemoteAddr( &sock, psz_server ) == -1 )
{
+ intf_ErrMsg( "input error: can't build remote address" );
close( p_input->i_handle );
p_input->b_error = 1;
return;
}
- /* And connect it ... should we really connect ? */
+ /* And connect it */
if( connect( p_input->i_handle, (struct sockaddr *) &sock,
sizeof( sock ) ) == (-1) )
{
- intf_ErrMsg( "NetworkOpen: can't connect socket : %s",
+ intf_ErrMsg( "input error: can't connect socket (%s)",
strerror(errno) );
close( p_input->i_handle );
p_input->b_error = 1;
return;
}
- /* We can't pace control, but FIXME : bug in meuuh's code to sync PCR
- * with the server. */
- p_input->stream.b_pace_control = 1;
+ p_input->stream.b_pace_control = 0;
p_input->stream.b_seekable = 0;
+
+ intf_WarnMsg( 3, "input: successfully opened network mode" );
return;
}
/*****************************************************************************
- * input_NetworkClose : close a network socket
+ * NetworkClose : close a network socket
*****************************************************************************/
-void input_NetworkClose( input_thread_t * p_input )
+static void NetworkClose( input_thread_t * p_input )
{
close( p_input->i_handle );
+
+#ifdef WIN32
+ WSACleanup();
+#endif
+
}
#endif
+
projects / vlc / blobdiff