* file.c: file input (file: access plug-in)
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
- * $Id: file.c,v 1.7 2002/12/31 01:54:35 massiot Exp $
+ * $Id: file.c,v 1.21 2003/06/09 09:29:12 massiot Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
#ifdef HAVE_SYS_STAT_H
# include <sys/stat.h>
#endif
#ifdef HAVE_UNISTD_H
# include <unistd.h>
-#elif defined( _MSC_VER ) && defined( _WIN32 ) && !defined( UNDER_CE )
+#elif defined( WIN32 ) && !defined( UNDER_CE )
# include <io.h>
#endif
+/* stat() support for large files on win32 */
+#if defined( WIN32 ) && !defined( UNDER_CE )
+#define stat(a,b) _stati64(a,b)
+#define fstat(a,b) _fstati64(a,b)
+#endif
+
/*****************************************************************************
* Exported prototypes
*****************************************************************************/
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-#define CACHING_TEXT N_("caching value in ms")
+#define CACHING_TEXT N_("Caching value in ms")
#define CACHING_LONGTEXT N_( \
"Allows you to modify the default caching value for file streams. This " \
"value should be set in miliseconds units." )
vlc_module_begin();
- set_description( _("Standard filesystem file reading") );
- add_category_hint( N_("file"), NULL );
- add_integer( "file-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT );
+ set_description( _("Standard filesystem file input") );
+ add_category_hint( N_("file"), NULL, VLC_TRUE );
+ add_integer( "file-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE );
set_capability( "access", 50 );
add_shortcut( "file" );
add_shortcut( "stream" );
+ add_shortcut( "kfir" );
set_callbacks( Open, Close );
vlc_module_end();
+/*****************************************************************************
+ * _input_socket_t: private access plug-in data, modified to add private
+ * fields
+ *****************************************************************************/
+typedef struct _input_socket_s
+{
+ input_socket_t _socket;
+
+ unsigned int i_nb_reads;
+ vlc_bool_t b_kfir;
+} _input_socket_t;
+
/*****************************************************************************
* Open: open the file
*****************************************************************************/
char * psz_name = p_input->psz_name;
#ifdef HAVE_SYS_STAT_H
int i_stat;
- struct stat stat_info;
+#if defined( WIN32 ) && !defined( UNDER_CE )
+ struct _stati64 stat_info;
+#else
+ struct stat stat_info;
+#endif
#endif
- input_socket_t * p_access_data;
- vlc_bool_t b_stdin;
+ _input_socket_t * p_access_data;
+ vlc_bool_t b_stdin, b_kfir = 0;
p_input->i_mtu = 0;
if( !b_stdin && (i_stat = stat( psz_name, &stat_info )) == (-1) )
{
# ifdef HAVE_ERRNO_H
- msg_Err( p_input, "cannot stat() file `%s' (%s)",
- psz_name, strerror(errno));
+ msg_Warn( p_input, "cannot stat() file `%s' (%s)",
+ psz_name, strerror(errno));
# else
- msg_Err( p_input, "cannot stat() file `%s'", psz_name );
+ msg_Warn( p_input, "cannot stat() file `%s'", psz_name );
# endif
return VLC_EGENERIC;
}
vlc_mutex_lock( &p_input->stream.stream_lock );
- p_input->stream.b_connected = 1;
if( *p_input->psz_access && !strncmp( p_input->psz_access, "stream", 7 ) )
{
/* stream:%s */
p_input->stream.b_seekable = 0;
p_input->stream.p_selected_area->i_size = 0;
}
+ else if( *p_input->psz_access &&
+ !strncmp( p_input->psz_access, "kfir", 7 ) )
+ {
+ /* stream:%s */
+ p_input->stream.b_pace_control = 0;
+ p_input->stream.b_seekable = 0;
+ p_input->stream.p_selected_area->i_size = 0;
+ b_kfir = 1;
+ }
else
{
/* file:%s or %s */
vlc_mutex_unlock( &p_input->stream.stream_lock );
msg_Dbg( p_input, "opening file `%s'", psz_name );
- p_access_data = malloc( sizeof(input_socket_t) );
+ p_access_data = malloc( sizeof(_input_socket_t) );
p_input->p_access_data = (void *)p_access_data;
if( p_access_data == NULL )
{
return VLC_ENOMEM;
}
+ p_access_data->i_nb_reads = 0;
+ p_access_data->b_kfir = b_kfir;
if( b_stdin )
{
- p_access_data->i_handle = 0;
+ p_access_data->_socket.i_handle = 0;
}
else
{
wchar_t psz_filename[MAX_PATH];
MultiByteToWideChar( CP_ACP, 0, psz_name, -1, psz_filename, MAX_PATH );
- p_access_data->i_handle = (int)CreateFile( psz_filename,
+ p_access_data->_socket.i_handle = (int)CreateFile( psz_filename,
GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING,
FILE_ATTRIBUTE_NORMAL, NULL );
- if( (HANDLE)p_access_data->i_handle == INVALID_HANDLE_VALUE )
+ if( (HANDLE)p_access_data->_socket.i_handle == INVALID_HANDLE_VALUE )
{
msg_Err( p_input, "cannot open file %s", psz_name );
free( p_access_data );
return VLC_EGENERIC;
}
p_input->stream.p_selected_area->i_size =
- GetFileSize( (HANDLE)p_access_data->i_handle, NULL );
+ GetFileSize( (HANDLE)p_access_data->_socket.i_handle, NULL );
#else
- p_access_data->i_handle = open( psz_name,
- O_NONBLOCK /*| O_LARGEFILE*/ );
- if( p_access_data->i_handle == -1 )
+ p_access_data->_socket.i_handle = open( psz_name,
+ O_NONBLOCK /*| O_LARGEFILE*/ );
+ if( p_access_data->_socket.i_handle == -1 )
{
# ifdef HAVE_ERRNO_H
msg_Err( p_input, "cannot open file %s (%s)", psz_name,
*****************************************************************************/
static ssize_t Read( input_thread_t * p_input, byte_t * p_buffer, size_t i_len )
{
- input_socket_t * p_access_data = (input_socket_t *)p_input->p_access_data;
+ _input_socket_t * p_access_data = (_input_socket_t *)p_input->p_access_data;
ssize_t i_ret;
#ifdef UNDER_CE
- if( !ReadFile( (HANDLE)p_access_data->i_handle, p_buffer, i_len,
+ if( !ReadFile( (HANDLE)p_access_data->_socket.i_handle, p_buffer, i_len,
(LPDWORD)&i_ret, NULL ) )
{
i_ret = -1;
}
#else
- i_ret = read( p_access_data->i_handle, p_buffer, i_len );
+#ifndef WIN32
+ if ( !p_input->stream.b_pace_control )
+ {
+ if ( !p_access_data->b_kfir )
+ {
+ /* Find if some data is available. This won't work under Windows. */
+ struct timeval timeout;
+ fd_set fds;
+
+ /* Initialize file descriptor set */
+ FD_ZERO( &fds );
+ FD_SET( p_access_data->_socket.i_handle, &fds );
+
+ /* We'll wait 0.5 second if nothing happens */
+ timeout.tv_sec = 0;
+ timeout.tv_usec = 500000;
+
+ /* Find if some data is available */
+ while( (i_ret = select( p_access_data->_socket.i_handle + 1, &fds,
+ NULL, NULL, &timeout )) == 0
+ || (i_ret < 0 && errno == EINTR) )
+ {
+ FD_ZERO( &fds );
+ FD_SET( p_access_data->_socket.i_handle, &fds );
+ timeout.tv_sec = 0;
+ timeout.tv_usec = 500000;
+
+ if( p_input->b_die || p_input->b_error )
+ {
+ return 0;
+ }
+ }
+
+ if( i_ret < 0 )
+ {
+ msg_Err( p_input, "select error (%s)", strerror(errno) );
+ return -1;
+ }
+
+ i_ret = read( p_access_data->_socket.i_handle, p_buffer, i_len );
+ }
+ else
+ {
+ /* b_kfir ; work around a buggy poll() driver implementation */
+ while ( (i_ret = read( p_access_data->_socket.i_handle, p_buffer,
+ i_len )) == 0 &&
+ !p_input->b_die && !p_input->b_error )
+ {
+ msleep(INPUT_ERROR_SLEEP);
+ }
+ }
+ }
+ else
+# endif
+ {
+ /* b_pace_control || WIN32 */
+ i_ret = read( p_access_data->_socket.i_handle, p_buffer, i_len );
+ }
#endif
if( i_ret < 0 )
{
-# ifdef HAVE_ERRNO_H
+#ifdef HAVE_ERRNO_H
if ( errno != EINTR && errno != EAGAIN )
msg_Err( p_input, "read failed (%s)", strerror(errno) );
-# else
+#else
msg_Err( p_input, "read failed" );
-# endif
+#endif
/* Delay a bit to avoid consuming all the CPU. This is particularly
* useful when reading from an unconnected FIFO. */
msleep( INPUT_ERROR_SLEEP );
}
+ p_access_data->i_nb_reads++;
+#ifdef HAVE_SYS_STAT_H
+ if ( p_input->stream.p_selected_area->i_size != 0
+ && (p_access_data->i_nb_reads % INPUT_FSTAT_NB_READS) == 0 )
+ {
+#if defined( WIN32 ) && !defined( UNDER_CE )
+ struct _stati64 stat_info;
+#else
+ struct stat stat_info;
+#endif
+ if ( fstat( p_access_data->_socket.i_handle, &stat_info ) == -1 )
+ {
+# ifdef HAVE_ERRNO_H
+ msg_Warn( p_input, "couldn't stat again the file (%s)",
+ strerror(errno) );
+# else
+ msg_Warn( p_input, "couldn't stat again the file" );
+# endif
+ }
+ else if ( p_input->stream.p_selected_area->i_size != stat_info.st_size )
+ {
+ p_input->stream.p_selected_area->i_size = stat_info.st_size;
+ p_input->stream.b_changed = 1;
+ }
+ }
+#endif
+
return i_ret;
}
#define S p_input->stream
input_socket_t * p_access_data = (input_socket_t *)p_input->p_access_data;
+#if defined( WIN32 ) && !defined( UNDER_CE )
+ _lseeki64( p_access_data->i_handle, i_pos, SEEK_SET );
+#else
lseek( p_access_data->i_handle, i_pos, SEEK_SET );
+#endif
vlc_mutex_lock( &S.stream_lock );
S.p_selected_area->i_tell = i_pos;
projects / vlc / blobdiff