# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_input.h>
#include <vlc_access.h>
#include <vlc_interface.h>
#if defined( WIN32 ) && !defined( UNDER_CE )
# include <io.h>
+# include <ctype.h>
#else
# include <unistd.h>
# include <poll.h>
#endif
-#ifdef HAVE_MMAP
-# include <sys/mman.h>
-#endif
#if defined( WIN32 ) && !defined( UNDER_CE )
# ifdef lseek
"value should be set in milliseconds." )
vlc_module_begin();
- set_description( _("File input") );
- set_shortname( _("File") );
+ 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, VLC_TRUE );
+ add_integer( "file-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, true );
add_obsolete_string( "file-cat" );
- set_capability( "access2", 50 );
+ set_capability( "access", 50 );
add_shortcut( "file" );
add_shortcut( "stream" );
- add_shortcut( "kfir" );
set_callbacks( Open, Close );
vlc_module_end();
static int Seek( access_t *, int64_t );
static ssize_t Read( access_t *, uint8_t *, size_t );
static int Control( access_t *, int, va_list );
-#ifdef HAVE_MMAP
-static block_t *mmapBlock( access_t * );
-#endif
static int open_file( access_t *, const char * );
struct access_sys_t
{
- uint64_t pagemask;
unsigned int i_nb_reads;
- vlc_bool_t b_kfir;
int fd;
/* */
- vlc_bool_t b_seekable;
- vlc_bool_t b_pace_control;
+ bool b_seekable;
+ bool b_pace_control;
};
/*****************************************************************************
access_t *p_access = (access_t*)p_this;
access_sys_t *p_sys;
- vlc_bool_t b_stdin = !strcmp (p_access->psz_path, "-");
+ 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 );
STANDARD_READ_ACCESS_INIT;
p_sys->i_nb_reads = 0;
- p_sys->b_kfir = VLC_FALSE;
int fd = p_sys->fd = -1;
if (!strcasecmp (p_access->psz_access, "stream"))
{
- p_sys->b_seekable = VLC_FALSE;
- p_sys->b_pace_control = VLC_FALSE;
- }
- else if (!strcasecmp (p_access->psz_access, "kfir"))
- {
- p_sys->b_seekable = VLC_FALSE;
- p_sys->b_pace_control = VLC_FALSE;
- p_sys->b_kfir = VLC_TRUE;
+ p_sys->b_seekable = false;
+ p_sys->b_pace_control = false;
}
else
{
- p_sys->b_seekable = VLC_TRUE;
- p_sys->b_pace_control = VLC_TRUE;
+ p_sys->b_seekable = true;
+ p_sys->b_pace_control = true;
}
/* Open file */
#ifdef HAVE_SYS_STAT_H
p_access->info.i_size = st.st_size;
- if (!S_ISREG (st.st_mode) && !S_ISBLK (st.st_mode)
- && (!S_ISCHR (st.st_mode) || (st.st_size == 0)))
- p_sys->b_seekable = VLC_FALSE;
-
-# ifdef HAVE_MMAP
- p_sys->pagemask = sysconf (_SC_PAGE_SIZE) - 1;
-
- /* Autodetect mmap() support */
- if (p_sys->b_pace_control && S_ISREG (st.st_mode) && (st.st_size > 0))
- {
- /* TODO: Do not allow PROT_WRITE, we should not need it.
- * However, this far, "block" ownership seems such that whoever
- * "receives" a block can freely modify its content. Hence we _may_
- * need PROT_WRITE not to default memory protection.
- * NOTE: With MAP_PRIVATE, changes are not committed to the underlying
- * file, write open permission is not required.
- */
- void *addr = mmap (NULL, 1, PROT_READ|PROT_WRITE, MAP_PRIVATE, fd, 0);
- if (addr != MAP_FAILED)
- {
- /* Does the file system support mmap? */
- munmap (addr, 1);
- p_access->pf_read = NULL;
- p_access->pf_block = mmapBlock;
- msg_Dbg (p_this, "mmap enabled");
- }
- else
- msg_Dbg (p_this, "mmap disabled (%m)");
- }
- else
- msg_Dbg (p_this, "mmap disabled (non regular file)");
-# endif
+ if (!S_ISREG (st.st_mode))
+ p_sys->b_seekable = false;
#else
p_sys->b_seekable = !b_stdin;
# warning File size not known!
#endif
- if (p_sys->b_seekable && (p_access->info.i_size == 0))
- {
- /* FIXME that's bad because all others access will be probed */
- msg_Err (p_access, "file is empty, aborting");
- Close (p_this);
- return VLC_EGENERIC;
- }
-
return VLC_SUCCESS;
}
int fd = p_sys->fd;
#if !defined(WIN32) && !defined(UNDER_CE)
- if( !p_sys->b_pace_control )
+ if( !p_sys->b_seekable )
{
- if( !p_sys->b_kfir )
- {
- /* Find if some data is available. This won't work under Windows. */
- do
- {
- struct pollfd ufd;
-
- if( p_access->b_die )
- return 0;
-
- memset (&ufd, 0, sizeof (ufd));
- ufd.fd = fd;
- ufd.events = POLLIN;
-
- i_ret = poll (&ufd, 1, 500);
- }
- while (i_ret <= 0);
-
- i_ret = read (fd, p_buffer, i_len);
- }
- else
- {
- /* b_kfir ; work around a buggy poll() driver implementation */
- while (((i_ret = read (fd, p_buffer, i_len)) == 0)
- && !p_access->b_die)
- {
- msleep( INPUT_ERROR_SLEEP );
- }
- }
+ /* Note that POSIX regular files (b_seekable) opened for read are
+ * guaranteed to always set POLLIN immediately, so we can spare
+ * poll()ing them. */
+ /* Wait until some data is available. Impossible on Windows. */
+ struct pollfd ufd[2] = {
+ { .fd = fd, .events = POLLIN, },
+ { .fd = vlc_object_waitpipe (p_access), .events = POLLIN, },
+ };
+
+ if (poll (ufd, 2, -1) < 0 || ufd[1].revents)
+ return -1;
}
- else
#endif /* WIN32 || UNDER_CE */
- /* b_pace_control || WIN32 */
- i_ret = read( fd, p_buffer, i_len );
+ i_ret = read (fd, p_buffer, i_len);
if( i_ret < 0 )
{
switch (errno)
default:
msg_Err (p_access, "read failed (%m)");
- intf_UserFatal (p_access, VLC_FALSE, _("File reading failed"),
+ intf_UserFatal (p_access, false, _("File reading failed"),
_("VLC could not read the file."));
}
-
- /* Delay a bit to avoid consuming all the CPU. This is particularly
- * useful when reading from an unconnected FIFO. */
- msleep( INPUT_ERROR_SLEEP );
}
+ else if( i_ret > 0 )
+ p_access->info.i_pos += i_ret;
+ else if( i_ret == 0 )
+ p_access->info.b_eof = true;
p_sys->i_nb_reads++;
}
}
#endif
-
- if( i_ret > 0 )
- p_access->info.i_pos += i_ret;
- else if( i_ret == 0 )
- p_access->info.b_eof = VLC_TRUE;
-
return i_ret;
}
-#ifdef HAVE_MMAP
-# define MMAP_SIZE (1 << 20)
-
-static block_t *mmapBlock (access_t *p_access)
-{
- access_sys_t *p_sys = p_access->p_sys;
-
- const int flags = MAP_SHARED;
- off_t offset = p_access->info.i_pos & ~p_sys->pagemask;
- size_t align = p_access->info.i_pos & p_sys->pagemask;
- size_t length = (MMAP_SIZE > p_sys->pagemask) ? MMAP_SIZE : (p_sys->pagemask + 1);
- void *addr;
-
-#ifndef NDEBUG
- int64_t dbgpos = lseek (p_sys->fd, 0, SEEK_CUR);
- if (dbgpos != p_access->info.i_pos)
- msg_Err (p_access, "position: 0x%08llx instead of 0x%08llx",
- p_access->info.i_pos, dbgpos);
-#endif
-
- if (p_access->info.i_pos >= p_access->info.i_size)
- {
- /* End of file - check if file size changed... */
- struct stat st;
-
- if ((fstat (p_sys->fd, &st) == 0)
- && (st.st_size != p_access->info.i_size))
- {
- p_access->info.i_size = st.st_size;
- p_access->info.i_update |= INPUT_UPDATE_SIZE;
- }
-
- /* Really at end of file then */
- if (p_access->info.i_pos >= p_access->info.i_size)
- {
- p_access->info.b_eof = VLC_TRUE;
- msg_Dbg (p_access, "at end of memory mapped file");
- return NULL;
- }
- }
-
- if (offset + length > p_access->info.i_size)
- /* Don't mmap beyond end of file */
- length = p_access->info.i_size - offset;
-
- assert (offset <= p_access->info.i_pos); /* and */
- assert (p_access->info.i_pos < p_access->info.i_size); /* imply */
- assert (offset < p_access->info.i_size); /* imply */
- assert (length > 0);
-
- addr = mmap (NULL, length, PROT_READ, flags, p_sys->fd, offset);
- if (addr == MAP_FAILED)
- {
- msg_Err (p_access, "memory mapping failed (%m)");
- intf_UserFatal (p_access, VLC_FALSE, _("File reading failed"),
- _("VLC could not read the file."));
- msleep( INPUT_ERROR_SLEEP );
- return NULL;
- }
-
- p_access->info.i_pos = offset + length;
-
- block_t *block = block_mmap_Alloc (addr, length);
- if (block == NULL)
- return NULL;
-
- block->p_buffer += align;
- block->i_buffer -= align;
-
-#ifndef NDEBUG
- msg_Dbg (p_access, "mapped 0x%lx bytes at %p from offset 0x%lx",
- (unsigned long)length, addr, (unsigned long)offset);
-
- /* Compare normal I/O with memory mapping */
- char *buf = malloc (block->i_buffer);
- ssize_t i_read = read (p_sys->fd, buf, block->i_buffer);
-
- if (i_read != (ssize_t)block->i_buffer)
- msg_Err (p_access, "read %u instead of %u bytes", (unsigned)i_read,
- (unsigned)block->i_buffer);
- if (memcmp (buf, block->p_buffer, block->i_buffer))
- msg_Err (p_access, "inconsistent data buffer");
- free (buf);
-#endif
-
- return block;
-}
-#endif
/*****************************************************************************
* Seek: seek to a specific location in a file
*****************************************************************************/
static int Seek (access_t *p_access, int64_t i_pos)
{
- /* FIXME: i_size should really be unsigned */
- if ((uint64_t)i_pos > (uint64_t)p_access->info.i_size)
- {
- /* This should only happen with corrupted/truncated files. */
- msg_Err (p_access, "seeking too far (0x"I64Fx" / 0x"I64Fx")",
- i_pos, p_access->info.i_size);
- i_pos = p_access->info.i_size;
- }
-
p_access->info.i_pos = i_pos;
- p_access->info.b_eof = VLC_FALSE;
+ p_access->info.b_eof = false;
-#if defined (HAVE_MMAP) && defined (NDEBUG)
- if (p_access->pf_block == NULL)
-#endif
- lseek (p_access->p_sys->fd, i_pos, SEEK_SET);
+ lseek (p_access->p_sys->fd, i_pos, SEEK_SET);
return VLC_SUCCESS;
}
static int Control( access_t *p_access, int i_query, va_list args )
{
access_sys_t *p_sys = p_access->p_sys;
- vlc_bool_t *pb_bool;
+ bool *pb_bool;
int *pi_int;
int64_t *pi_64;
/* */
case ACCESS_CAN_SEEK:
case ACCESS_CAN_FASTSEEK:
- pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* );
+ pb_bool = (bool*)va_arg( args, bool* );
*pb_bool = p_sys->b_seekable;
break;
case ACCESS_CAN_PAUSE:
case ACCESS_CAN_CONTROL_PACE:
- pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* );
+ pb_bool = (bool*)va_arg( args, bool* );
*pb_bool = p_sys->b_pace_control;
break;
case ACCESS_GET_PTS_DELAY:
pi_64 = (int64_t*)va_arg( args, int64_t * );
- *pi_64 = var_GetInteger( p_access, "file-caching" ) * I64C(1000);
+ *pi_64 = var_GetInteger( p_access, "file-caching" ) * INT64_C(1000);
break;
/* */
return VLC_SUCCESS;
}
-
-static char *expand_path (const access_t *p_access, const char *path)
-{
- if (strncmp (path, "~/", 2) == 0)
- {
- char *res;
-
- // TODO: we should also support the ~cmassiot/ syntax
- if (asprintf (&res, "%s/%s", p_access->p_libvlc->psz_homedir, path + 2) == -1)
- return NULL;
- return res;
- }
-
-#if defined(WIN32)
- if (!strcasecmp (p_access->psz_access, "file")
- && ('/' == path[0]) && path[1] && (':' == path[2]) && ('/' == path[3]))
- // Explorer can open path such as file:/C:/ or file:///C:/
- // hence remove leading / if found
- return strdup (path + 1);
-#endif
-
- return strdup (path);
-}
-
-
/*****************************************************************************
* open_file: Opens a specific file
*****************************************************************************/
-static int open_file (access_t *p_access, const char *psz_name)
+static int open_file (access_t *p_access, const char *path)
{
- char *path = expand_path (p_access, psz_name);
+#if defined(WIN32)
+ if (!strcasecmp (p_access->psz_access, "file")
+ && ('/' == path[0]) && isalpha (path[1])
+ && (':' == path[2]) && ('/' == path[3]))
+ /* Explorer can open path such as file:/C:/ or file:///C:/
+ * hence remove leading / if found */
+ path++;
+#endif
#ifdef UNDER_CE
p_sys->fd = utf8_fopen( path, "rb" );
if ( !p_sys->fd )
{
- msg_Err( p_access, "cannot open file %s", psz_name );
- intf_UserFatal( p_access, VLC_FALSE, _("File reading failed"),
- _("VLC could not open the file \"%s\"."), psz_name );
- free (path);
+ msg_Err( p_access, "cannot open file %s", path );
+ intf_UserFatal( p_access, false, _("File reading failed"),
+ _("VLC could not open the file \"%s\"."), path );
return VLC_EGENERIC;
}
fseek( p_sys->fd, 0, SEEK_SET );
#else
int fd = utf8_open (path, O_RDONLY | O_NONBLOCK /* O_LARGEFILE*/, 0666);
- free (path);
if (fd == -1)
{
- msg_Err (p_access, "cannot open file %s (%m)", psz_name);
- intf_UserFatal (p_access, VLC_FALSE, _("File reading failed"),
- _("VLC could not open the file \"%s\"."), psz_name);
+ 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);
return -1;
}
projects / vlc / blobdiff