#ifdef HAVE_FCNTL_H
# include <fcntl.h>
#endif
+#if defined (__linux__)
+# include <sys/vfs.h>
+# include <linux/magic.h>
+#elif defined (HAVE_SYS_MOUNT_H)
+# include <sys/param.h>
+# include <sys/mount.h>
+#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." )
+ "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 )
+ 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" )
int fd;
/* */
+ 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;
-
- /* 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;
-
- if (!strcasecmp (p_access->psz_access, "stream"))
- p_sys->b_pace_control = false;
- else
- p_sys->b_pace_control = true;
+ p_sys->b_pace_control = true;
/* Open file */
int fd = -1;
{
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;
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");
+ }
#else
# 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:
default:
msg_Err (p_access, "failed to read (%m)");
- dialog_Fatal (p_access, _("File reading failed"),
+ dialog_Fatal (p_access, _("File reading failed"), "%s",
_("VLC could not read the file."));
p_access->info.b_eof = true;
return 0;
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
+ }
return i_ret;
}
/* */
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;
/* */
projects / vlc / blobdiff