/*****************************************************************************
* Preamble
*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <vlc/vlc.h>
#include <vlc_input.h>
#include <vlc_access.h>
# include <unistd.h>
# include <poll.h>
#endif
-#ifdef HAVE_MMAP
-# include <sys/mman.h>
-#endif
#if defined( WIN32 ) && !defined( UNDER_CE )
# ifdef lseek
#define CACHING_LONGTEXT N_( \
"Caching value for files. This " \
"value should be set in milliseconds." )
-#define CAT_TEXT N_("Concatenate with additional files")
-#define CAT_LONGTEXT N_( \
- "Play split files as if they were part of a unique file. " \
- "You need to specify a comma-separated list of files." )
vlc_module_begin();
set_description( _("File input") );
* Exported prototypes
*****************************************************************************/
static int Seek( access_t *, int64_t );
-static int Read( access_t *, uint8_t *, int );
+static ssize_t Read( access_t *, uint8_t *, size_t );
static int Control( access_t *, int, va_list );
-static block_t *mmapBlock( access_t * );
static int open_file( access_t *, const char * );
#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)))
+ if (!S_ISREG (st.st_mode)
+ && !S_ISBLK (st.st_mode)
+ && !S_ISCHR (st.st_mode))
p_sys->b_seekable = VLC_FALSE;
-
-# ifdef HAVE_MMAP
- if (p_sys->b_pace_control && S_ISREG (st.st_mode))
- {
- p_access->pf_read = NULL;
- p_access->pf_block = mmapBlock;
- }
-# endif
#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;
}
/*****************************************************************************
* Read: standard read on a file descriptor.
*****************************************************************************/
-static int Read( access_t *p_access, uint8_t *p_buffer, int i_len )
+static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len )
{
access_sys_t *p_sys = p_access->p_sys;
- int i_ret;
+ ssize_t i_ret;
int fd = p_sys->fd;
#if !defined(WIN32) && !defined(UNDER_CE)
return i_ret;
}
-#ifdef HAVE_MMAP
-# define MMAP_SIZE (1 << 18)
-# ifndef MAP_POPULATE
-# define MAP_POPULATE 0
-# endif
-
-struct block_sys_t
-{
- block_t self;
- //vlc_object_t *owner;
- void *base_addr;
- size_t length;
-};
-
-static void mmapRelease (block_t *block)
-{
- block_sys_t *p_sys = (block_sys_t *)block;
-
- fprintf (stderr, "munmap (%p, %u)\n", p_sys->base_addr, MMAP_SIZE);
- munmap (p_sys->base_addr, p_sys->length);
- //vlc_object_release (p_sys->owner);
- free (p_sys);
-}
-
-static block_t *mmapBlock (access_t *p_access)
-{
- access_sys_t *p_sys = p_access->p_sys;
-
- const int flags = MAP_SHARED | MAP_POPULATE;
- const size_t pagesize = sysconf (_SC_PAGE_SIZE);
- off_t offset = p_access->info.i_pos & ~(pagesize - 1);
- size_t align = p_access->info.i_pos & (pagesize - 1);
- size_t length = (MMAP_SIZE > pagesize) ? MMAP_SIZE : pagesize;
- void *addr;
-
- /* File grown while being played? */
- if (offset + length >= p_access->info.i_size)
- {
- 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? */
- if (offset >= 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)
- length = p_access->info.i_size - offset;
-
- 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");
- msleep( INPUT_ERROR_SLEEP );
- return NULL;
- }
-
- p_access->info.i_pos = offset + length;
-
- msg_Dbg (p_access, "mapped %lu bytes at %p from offset %lu",
- (unsigned long)length, addr, (unsigned long)offset);
- block_sys_t *block = malloc (sizeof (*block));
- if (block == NULL)
- {
- munmap (addr, length);
- return NULL;
- }
-
- block_Init (&block->self, ((uint8_t *)addr) + align, length - align);
- block->self.pf_release = mmapRelease;
- block->base_addr = addr;
- block->length = length;
- //vlc_object_yield (block->owner = VLC_OBJECT (p_access));
-
- return &block->self;
-}
-#endif
/*****************************************************************************
* Seek: seek to a specific location in a file
*****************************************************************************/
static int Seek (access_t *p_access, int64_t i_pos)
{
- if (i_pos > p_access->info.i_size)
- {
- msg_Err (p_access, "seeking too far");
- i_pos = p_access->info.i_size;
- }
- else if (i_pos < 0)
- {
- msg_Err (p_access, "seeking too early");
- i_pos = 0;
- }
-
p_access->info.i_pos = i_pos;
p_access->info.b_eof = VLC_FALSE;
-#ifdef HAVE_MMAP
- if (p_access->pf_block == NULL)
- lseek (p_access->p_sys->fd, i_pos, SEEK_SET);
-#endif
+ lseek (p_access->p_sys->fd, i_pos, SEEK_SET);
return VLC_SUCCESS;
}
case ACCESS_SET_SEEKPOINT:
case ACCESS_SET_PRIVATE_ID_STATE:
case ACCESS_GET_META:
+ case ACCESS_GET_PRIVATE_ID_STATE:
case ACCESS_GET_CONTENT_TYPE:
return VLC_EGENERIC;
default:
- msg_Warn( p_access, "unimplemented query in control" );
+ msg_Warn( p_access, "unimplemented query %d in control", i_query );
return VLC_EGENERIC;
}
projects / vlc / blobdiff