/*****************************************************************************
* decomp.c : Decompression module for vlc
*****************************************************************************
- * Copyright © 2008 Rémi Denis-Courmont
+ * Copyright © 2008-2009 Rémi Denis-Courmont
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
#include <vlc_plugin.h>
#include <vlc_stream.h>
#include <vlc_network.h>
+#include <assert.h>
#include <unistd.h>
+#include <errno.h>
+#ifndef _POSIX_SPAWN
+# define _POSIX_SPAWN (-1)
+#endif
#include <fcntl.h>
-#include <spawn.h>
+#if (_POSIX_SPAWN >= 0)
+# include <spawn.h>
+#endif
#include <sys/wait.h>
#include <sys/ioctl.h>
-#ifdef __linux__
+#if defined (__linux__) && defined (HAVE_VMSPLICE)
# include <sys/uio.h>
# include <sys/mman.h>
+#else
+# undef HAVE_VMSPLICE
#endif
-#include <assert.h>
-
static int OpenGzip (vlc_object_t *);
static int OpenBzip2 (vlc_object_t *);
+static int OpenXZ (vlc_object_t *);
static void Close (vlc_object_t *);
vlc_module_begin ()
set_category (CAT_INPUT)
set_subcategory (SUBCAT_INPUT_STREAM_FILTER)
set_capability ("stream_filter", 20)
+ set_callbacks (OpenXZ, Close)
+
+ add_submodule ()
set_callbacks (OpenBzip2, Close)
/* TODO: access shortnames for stream_UrlNew() */
extern char **environ;
static const size_t bufsize = 65536;
+#ifdef HAVE_VMSPLICE
static void cleanup_mmap (void *addr)
{
munmap (addr, bufsize);
}
-
+#endif
static void *Thread (void *data)
{
stream_t *stream = data;
stream_sys_t *p_sys = stream->p_sys;
+#ifdef HAVE_VMSPLICE
+ const ssize_t page_mask = sysconf (_SC_PAGE_SIZE) - 1;
+#endif
int fd = p_sys->write_fd;
bool error = false;
{
ssize_t len;
int canc = vlc_savecancel ();
-#ifdef __linux__
+#ifdef HAVE_VMSPLICE
unsigned char *buf = mmap (NULL, bufsize, PROT_READ|PROT_WRITE,
MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
+ if (unlikely(buf == MAP_FAILED))
+ break;
vlc_cleanup_push (cleanup_mmap, buf);
#else
- unsigned char buf[bufsize];
+ unsigned char *buf = malloc (bufsize);
+ if (unlikely(buf == NULL))
+ break;
+ vlc_cleanup_push (free, buf);
#endif
len = stream_Read (stream->p_source, buf, bufsize);
vlc_restorecancel (canc);
+ error = len <= 0;
- if (len <= 0)
- break;
-
- for (ssize_t i = 0, j = 0; i < len; i += j)
+ for (ssize_t i = 0, j; i < len; i += j)
{
- struct iovec iov[1] = { { buf + i, len - i, } };
-
-#ifdef __linux__
- j = vmsplice (fd, iov, 1, SPLICE_F_GIFT);
-#else
- j = writev (fd, iov, 1);
+#ifdef HAVE_VMSPLICE
+ if ((len - i) <= page_mask) /* incomplete last page */
+ j = write (fd, buf + i, len - i);
+ else
+ {
+ struct iovec iov = { buf + i, (len - i) & ~page_mask, };
+ j = vmsplice (fd, &iov, 1, SPLICE_F_GIFT);
+ }
+ if (j == -1 && errno == ENOSYS) /* vmsplice() not supported */
#endif
+ j = write (fd, buf + i, len - i);
if (j <= 0)
{
if (j == 0)
break;
}
}
-#ifdef __linux__
- vlc_cleanup_run (); /* munmap (buf, bufsize) */
-#endif
+ vlc_cleanup_run (); /* free (buf) */
}
while (!error);
msg_Dbg (stream, "compressed stream at EOF");
+ /* Let child process know about EOF */
+ p_sys->write_fd = -1;
+ close (fd);
return NULL;
}
+static int Peek (stream_t *, const uint8_t **, unsigned int);
+
#define MIN_BLOCK (1 << 10)
#define MAX_BLOCK (1 << 20)
/**
{
stream_sys_t *p_sys = stream->p_sys;
block_t *peeked;
- size_t bonus = 0;
ssize_t length;
+ if (buf == NULL) /* caller skips data, get big enough peek buffer */
+ buflen = Peek (stream, &(const uint8_t *){ NULL }, buflen);
+
if ((peeked = p_sys->peeked) != NULL)
- {
- bonus = (buflen > peeked->i_buffer) ? peeked->i_buffer : buflen;
- memcpy (buf, peeked->p_buffer, bonus);
- peeked->p_buffer += bonus;
- peeked->i_buffer -= bonus;
+ { /* dequeue peeked data */
+ length = (buflen > peeked->i_buffer) ? peeked->i_buffer : buflen;
+ if (buf != NULL)
+ {
+ memcpy (buf, peeked->p_buffer, length);
+ buf = ((char *)buf) + length;
+ }
+ buflen -= length;
+ peeked->p_buffer += length;
+ peeked->i_buffer -= length;
if (peeked->i_buffer == 0)
{
block_Release (peeked);
p_sys->peeked = NULL;
}
+ p_sys->offset += length;
+
+ if (buflen > 0)
+ length += Read (stream, ((char *)buf) + length, buflen - length);
+ return length;
}
+ assert ((buf != NULL) || (buflen == 0));
length = net_Read (stream, p_sys->read_fd, NULL, buf, buflen, false);
if (length < 0)
return 0;
- length += bonus;
p_sys->offset += length;
return length;
}
*(va_arg (args, bool *)) = false;
break;
case STREAM_GET_POSITION:
- *(va_arg (args, int64_t *)) = p_sys->offset;
+ *(va_arg (args, uint64_t *)) = p_sys->offset;
break;
case STREAM_GET_SIZE:
- *(va_arg (args, int64_t *)) = 0;
- break;
- case STREAM_GET_MTU:
- *(va_arg (args, int *)) = 0;
+ *(va_arg (args, uint64_t *)) = 0;
break;
default:
return VLC_EGENERIC;
int ret = VLC_EGENERIC;
int comp[2];
+ /* We use two pipes rather than one stream socket pair, so that we can
+ * use vmsplice() on Linux. */
if (pipe (comp) == 0)
{
cloexec (comp[1]);
cloexec (uncomp[0]);
p_sys->read_fd = uncomp[0];
+#if (_POSIX_SPAWN >= 0)
posix_spawn_file_actions_t actions;
if (posix_spawn_file_actions_init (&actions) == 0)
{
}
posix_spawn_file_actions_destroy (&actions);
}
+#else /* _POSIX_SPAWN */
+ switch (p_sys->pid = fork ())
+ {
+ case -1:
+ msg_Err (stream, "Cannot fork (%m)");
+ break;
+ case 0:
+ dup2 (comp[0], 0);
+ close (comp[0]);
+ dup2 (uncomp[1], 1);
+ close (uncomp[1]);
+ execlp (path, path, (char *)NULL);
+ exit (1); /* if we get, execlp() failed! */
+ default:
+ if (vlc_clone (&p_sys->thread, Thread, stream,
+ VLC_THREAD_PRIORITY_INPUT) == 0)
+ ret = VLC_SUCCESS;
+ }
+#endif /* _POSIX_SPAWN < 0 */
close (uncomp[1]);
if (ret != VLC_SUCCESS)
close (uncomp[0]);
vlc_cancel (p_sys->thread);
close (p_sys->read_fd);
vlc_join (p_sys->thread, NULL);
- close (p_sys->write_fd);
+ if (p_sys->write_fd != -1)
+ /* Killed before EOF? */
+ close (p_sys->write_fd);
msg_Dbg (obj, "waiting for PID %u", (unsigned)p_sys->pid);
while (waitpid (p_sys->pid, &status, 0) == -1);
return Open (stream, "bzcat");
}
+/**
+ * Detects xz file format
+ */
+static int OpenXZ (vlc_object_t *obj)
+{
+ stream_t *stream = (stream_t *)obj;
+ const uint8_t *peek;
+
+ /* (Try to) parse the xz stream header */
+ if (stream_Peek (stream->p_source, &peek, 8) < 8)
+ return VLC_EGENERIC;
+
+ if (memcmp (peek, "\xfd\x37\x7a\x58\x5a", 6))
+ return VLC_EGENERIC;
+
+ msg_Dbg (obj, "detected xz compressed stream");
+ return Open (stream, "xzcat");
+}
projects / vlc / blobdiff