#include <vlc_plugin.h>
#include <vlc_input.h>
#include <vlc_access.h>
-#include <vlc_interface.h>
+#include <vlc_dialog.h>
#include <assert.h>
#include <errno.h>
#ifdef HAVE_FCNTL_H
# include <fcntl.h>
#endif
+#if defined (__linux__)
+# include <sys/vfs.h>
+# include <linux/magic.h>
+# define HAVE_FSTATFS 1
+#elif defined (HAVE_SYS_MOUNT_H)
+# include <sys/mount.h>
+# define HAVE_FSTATFS 1
+#endif
#if defined( WIN32 )
# include <io.h>
# include <ctype.h>
+# include <shlwapi.h>
#else
# include <unistd.h>
# include <poll.h>
#elif defined( UNDER_CE )
/* FIXME the commandline on wince is a mess */
# define dup(a) -1
+# define PathIsNetworkPathW(wpath) (! wcsncmp(wpath, L"\\\\", 2))
#endif
#include <vlc_charset.h>
static int Open ( vlc_object_t * );
static void Close( vlc_object_t * );
-#define CACHING_TEXT N_("Caching value in ms")
+#define CACHING_TEXT N_("Caching value (ms)")
#define CACHING_LONGTEXT N_( \
- "Caching value for files. This " \
- "value should be set in milliseconds." )
-
-vlc_module_begin();
- set_description( N_("File input") );
- set_shortname( N_("File") );
- set_category( CAT_INPUT );
- set_subcategory( SUBCAT_INPUT_ACCESS );
- add_integer( "file-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, true );
- add_obsolete_string( "file-cat" );
- set_capability( "access", 50 );
- add_shortcut( "file" );
- add_shortcut( "stream" );
- set_callbacks( Open, Close );
-vlc_module_end();
+ "Caching value for files, in milliseconds." )
+
+#define NETWORK_CACHING_TEXT N_("Extra network caching value (ms)")
+#define NETWORK_CACHING_LONGTEXT N_( \
+ "Supplementary caching value for remote files, in milliseconds." )
+
+vlc_module_begin ()
+ set_description( N_("File input") )
+ set_shortname( N_("File") )
+ set_category( CAT_INPUT )
+ set_subcategory( SUBCAT_INPUT_ACCESS )
+ add_integer( "file-caching", DEFAULT_PTS_DELAY / 1000, NULL,
+ CACHING_TEXT, CACHING_LONGTEXT, true )
+ change_safe()
+ add_integer( "network-caching", 3 * DEFAULT_PTS_DELAY / 1000, NULL,
+ NETWORK_CACHING_TEXT, NETWORK_CACHING_LONGTEXT, true )
+ change_safe()
+ add_obsolete_string( "file-cat" )
+ set_capability( "access", 50 )
+ add_shortcut( "file" )
+ add_shortcut( "fd" )
+ add_shortcut( "stream" )
+ set_callbacks( Open, Close )
+vlc_module_end ()
/*****************************************************************************
* Exported prototypes
*****************************************************************************/
static int Seek( access_t *, int64_t );
+static int NoSeek( access_t *, int64_t );
static ssize_t Read( access_t *, uint8_t *, size_t );
static int Control( access_t *, int, va_list );
int fd;
/* */
- bool b_seekable;
+ unsigned caching;
bool b_pace_control;
};
+static bool IsRemote (int fd)
+{
+#ifdef HAVE_FSTATFS
+ struct statfs stf;
+
+ if (fstatfs (fd, &stf))
+ return false;
+
+#if defined(MNT_LOCAL)
+ return !(stf.f_flags & MNT_LOCAL);
+
+#elif defined (__linux__)
+ switch (stf.f_type)
+ {
+ case AFS_SUPER_MAGIC:
+ case CODA_SUPER_MAGIC:
+ case NCP_SUPER_MAGIC:
+ case NFS_SUPER_MAGIC:
+ case SMB_SUPER_MAGIC:
+ case 0xFF534D42 /*CIFS_MAGIC_NUMBER*/:
+ return true;
+ }
+ return false;
+
+#endif
+#else /* !HAVE_FSTATFS */
+ (void)fd;
+ return false;
+
+#endif
+}
+
+#ifndef HAVE_POSIX_FADVISE
+# define posix_fadvise(fd, off, len, adv) (0)
+#endif
+
/*****************************************************************************
* Open: open the file
*****************************************************************************/
{
access_t *p_access = (access_t*)p_this;
access_sys_t *p_sys;
-
- bool b_stdin = !strcmp (p_access->psz_path, "-");
-
- /* Update default_pts to a suitable value for file access */
- var_Create( p_access, "file-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+#ifdef WIN32
+ wchar_t wpath[MAX_PATH+1];
+ bool is_remote = false;
+#endif
STANDARD_READ_ACCESS_INIT;
p_sys->i_nb_reads = 0;
- int fd = p_sys->fd = -1;
-
- if (!strcasecmp (p_access->psz_access, "stream"))
- {
- p_sys->b_seekable = false;
- p_sys->b_pace_control = false;
- }
- else
- {
- p_sys->b_seekable = true;
- p_sys->b_pace_control = true;
- }
+ p_sys->b_pace_control = true;
/* Open file */
- msg_Dbg (p_access, "opening file `%s'", p_access->psz_path);
+ int fd = -1;
- if (b_stdin)
+ if (!strcasecmp (p_access->psz_access, "fd"))
+ fd = dup (atoi (p_access->psz_path));
+ else if (!strcmp (p_access->psz_path, "-"))
fd = dup (0);
else
+ {
+ msg_Dbg (p_access, "opening file `%s'", p_access->psz_path);
fd = open_file (p_access, p_access->psz_path);
+#ifdef WIN32
+ if (MultiByteToWideChar (CP_UTF8, 0, p_access->psz_path, -1,
+ wpath, MAX_PATH)
+ && PathIsNetworkPathW (wpath))
+ is_remote = true;
+# define IsRemote( fd ) ((void)fd, is_remote)
+#endif
+ }
+ if (fd == -1)
+ goto error;
#ifdef HAVE_SYS_STAT_H
struct stat st;
- while (fd != -1)
+ if (fstat (fd, &st))
{
- if (fstat (fd, &st))
- msg_Err (p_access, "fstat(%d): %m", fd);
- else
- if (S_ISDIR (st.st_mode))
- /* The directory plugin takes care of that */
- msg_Dbg (p_access, "file is a directory, aborting");
- else
- break; // success
-
- close (fd);
- fd = -1;
+ msg_Err (p_access, "failed to read (%m)");
+ goto error;
}
-#endif
-
- if (fd == -1)
+ /* Directories can be opened and read from, but only readdir() knows
+ * how to parse the data. The directory plugin will do it. */
+ if (S_ISDIR (st.st_mode))
{
- free (p_sys);
- return VLC_EGENERIC;
+ msg_Dbg (p_access, "ignoring directory");
+ goto error;
+ }
+ if (S_ISREG (st.st_mode))
+ p_access->info.i_size = st.st_size;
+ else if (!S_ISBLK (st.st_mode))
+ {
+ p_access->pf_seek = NoSeek;
+ p_sys->b_pace_control = strcasecmp (p_access->psz_access, "stream");
}
- p_sys->fd = fd;
-
-#ifdef HAVE_SYS_STAT_H
- p_access->info.i_size = st.st_size;
- if (!S_ISREG (st.st_mode))
- p_sys->b_seekable = false;
#else
- p_sys->b_seekable = !b_stdin;
# warning File size not known!
#endif
+ p_sys->caching = var_CreateGetInteger (p_access, "file-caching");
+ if (IsRemote(fd))
+ p_sys->caching += var_CreateGetInteger (p_access, "network-caching");
+
+ p_sys->fd = fd;
+
+ if (p_access->pf_seek != NoSeek)
+ {
+ /* Demuxers will need the beginning of the file for probing. */
+ posix_fadvise (fd, 0, 4096, POSIX_FADV_WILLNEED);
+ /* In most cases, we only read the file once. */
+ posix_fadvise (fd, 0, 0, POSIX_FADV_NOREUSE);
+ }
return VLC_SUCCESS;
+
+error:
+ if (fd != -1)
+ close (fd);
+ free (p_sys);
+ return VLC_EGENERIC;
}
/*****************************************************************************
ssize_t i_ret;
#ifndef WIN32
- i_ret = net_Read (p_access, fd, NULL, p_buffer, i_len, false);
-#else
- i_ret = read (fd, p_buffer, i_len);
+ if (p_access->pf_seek == NoSeek)
+ i_ret = net_Read (p_access, fd, NULL, p_buffer, i_len, false);
+ else
#endif
+ i_ret = read (fd, p_buffer, i_len);
if( i_ret < 0 )
{
break;
default:
- msg_Err (p_access, "read failed (%m)");
- intf_UserFatal (p_access, false, _("File reading failed"),
- _("VLC could not read the file."));
+ msg_Err (p_access, "failed to read (%m)");
+ dialog_Fatal (p_access, _("File reading failed"), "%s",
+ _("VLC could not read the file."));
+ p_access->info.b_eof = true;
return 0;
}
}
else if( i_ret > 0 )
p_access->info.i_pos += i_ret;
- else if( i_ret == 0 )
+ else
p_access->info.b_eof = true;
p_sys->i_nb_reads++;
-#ifdef HAVE_SYS_STAT_H
- if( p_access->info.i_size != 0 &&
- (p_sys->i_nb_reads % INPUT_FSTAT_NB_READS) == 0 )
+ if ((p_access->info.i_size && !(p_sys->i_nb_reads % INPUT_FSTAT_NB_READS))
+ || (p_access->info.i_pos > p_access->info.i_size))
{
+#ifdef HAVE_SYS_STAT_H
struct stat st;
if ((fstat (fd, &st) == 0)
p_access->info.i_size = st.st_size;
p_access->info.i_update |= INPUT_UPDATE_SIZE;
}
- }
#endif
+ /* Pre-fetch until the end (within memory limits) */
+ posix_fadvise (fd, p_access->info.i_pos, 0, POSIX_FADV_WILLNEED);
+ }
return i_ret;
}
return VLC_SUCCESS;
}
+static int NoSeek (access_t *p_access, int64_t i_pos)
+{
+ /* assert(0); ?? */
+ (void) p_access; (void) i_pos;
+ return VLC_EGENERIC;
+}
+
/*****************************************************************************
* Control:
*****************************************************************************/
static int Control( access_t *p_access, int i_query, va_list args )
{
access_sys_t *p_sys = p_access->p_sys;
- bool *pb_bool;
- int *pi_int;
- int64_t *pi_64;
+ bool *pb_bool;
+ int64_t *pi_64;
switch( i_query )
{
case ACCESS_CAN_SEEK:
case ACCESS_CAN_FASTSEEK:
pb_bool = (bool*)va_arg( args, bool* );
- *pb_bool = p_sys->b_seekable;
+ *pb_bool = (p_access->pf_seek != NoSeek);
break;
case ACCESS_CAN_PAUSE:
break;
/* */
- case ACCESS_GET_MTU:
- pi_int = (int*)va_arg( args, int * );
- *pi_int = 0;
- break;
-
case ACCESS_GET_PTS_DELAY:
pi_64 = (int64_t*)va_arg( args, int64_t * );
- *pi_64 = var_GetInteger( p_access, "file-caching" ) * INT64_C(1000);
+ *pi_64 = p_sys->caching * INT64_C(1000);
break;
/* */
if (fd == -1)
{
msg_Err (p_access, "cannot open file %s (%m)", path);
- intf_UserFatal (p_access, false, _("File reading failed"),
- _("VLC could not open the file \"%s\"."), path);
+ dialog_Fatal (p_access, _("File reading failed"),
+ _("VLC could not open the file \"%s\"."), path);
return -1;
}
-#if defined(HAVE_FCNTL_H)
+#if defined(HAVE_FCNTL)
/* We'd rather use any available memory for reading ahead
* than for caching what we've already seen/heard */
# if defined(F_RDAHEAD)
projects / vlc / blobdiff