X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fstream_filter%2Fdecomp.c;h=2b83310b391868c0a020ed20e888e23bf92b08f2;hb=47af7ca1a031c282717c8f679a9f626669e23334;hp=5171ea703d8e1e326044d601e58a6815c1cc0344;hpb=be19f7facceb129ef8977ed0ad2b41c593954629;p=vlc diff --git a/modules/stream_filter/decomp.c b/modules/stream_filter/decomp.c index 5171ea703d..2b83310b39 100644 --- a/modules/stream_filter/decomp.c +++ b/modules/stream_filter/decomp.c @@ -1,21 +1,21 @@ /***************************************************************************** * 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 + * 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 * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ #ifdef HAVE_CONFIG_H @@ -26,8 +26,10 @@ #include #include #include +#include #include #include +#include #ifndef _POSIX_SPAWN # define _POSIX_SPAWN (-1) #endif @@ -46,34 +48,49 @@ 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_description (N_("Decompression")) set_category (CAT_INPUT) set_subcategory (SUBCAT_INPUT_STREAM_FILTER) set_capability ("stream_filter", 20) + + set_description (N_("LZMA decompression")) + set_callbacks (OpenXZ, Close) + + add_submodule () + set_description (N_("Burrows-Wheeler decompression")) set_callbacks (OpenBzip2, Close) /* TODO: access shortnames for stream_UrlNew() */ add_submodule () + set_description (N_("gzip decompression")) set_callbacks (OpenGzip, Close) vlc_module_end () struct stream_sys_t { - block_t *peeked; - uint64_t offset; + /* Thread data */ + int write_fd; + + /* Shared data */ + vlc_cond_t wait; + vlc_mutex_t lock; + bool paused; + + /* Caller data */ vlc_thread_t thread; pid_t pid; - int write_fd, read_fd; -}; -static void cloexec (int fd) -{ - int flags = fcntl (fd, F_GETFD); - fcntl (fd, F_SETFD, FD_CLOEXEC | ((flags != -1) ? flags : 0)); -} + uint64_t offset; + block_t *peeked; + + int read_fd; + bool can_pace; + bool can_pause; + int64_t pts_delay; +}; extern char **environ; @@ -90,7 +107,7 @@ static void *Thread (void *data) stream_t *stream = data; stream_sys_t *p_sys = stream->p_sys; #ifdef HAVE_VMSPLICE - ssize_t page_mask = sysconf (_SC_PAGE_SIZE) - 1; + const ssize_t page_mask = sysconf (_SC_PAGE_SIZE) - 1; #endif int fd = p_sys->write_fd; bool error = false; @@ -102,12 +119,22 @@ static void *Thread (void *data) #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 + vlc_mutex_lock (&p_sys->lock); + while (p_sys->paused) /* practically always false, but... */ + vlc_cond_wait (&p_sys->wait, &p_sys->lock); len = stream_Read (stream->p_source, buf, bufsize); + vlc_mutex_unlock (&p_sys->lock); + vlc_restorecancel (canc); error = len <= 0; @@ -128,18 +155,20 @@ static void *Thread (void *data) { if (j == 0) errno = EPIPE; - msg_Err (stream, "cannot write data (%m)"); + msg_Err (stream, "cannot write data: %s", + vlc_strerror_c(errno)); error = true; break; } } -#ifdef HAVE_VMSPLICE - 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; } @@ -154,16 +183,19 @@ static int Peek (stream_t *, const uint8_t **, unsigned int); */ static int Read (stream_t *stream, void *buf, unsigned int buflen) { - stream_sys_t *p_sys = stream->p_sys; - block_t *peeked; - ssize_t length; + stream_sys_t *sys = stream->p_sys; + unsigned ret = 0; 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) + block_t *peeked = sys->peeked; + if (peeked != NULL) { /* dequeue peeked data */ - length = (buflen > peeked->i_buffer) ? peeked->i_buffer : buflen; + size_t length = peeked->i_buffer; + if (length > buflen) + length = buflen; + if (buf != NULL) { memcpy (buf, peeked->p_buffer, length); @@ -172,24 +204,25 @@ static int Read (stream_t *stream, void *buf, unsigned int buflen) buflen -= length; peeked->p_buffer += length; peeked->i_buffer -= length; + if (peeked->i_buffer == 0) { block_Release (peeked); - p_sys->peeked = NULL; + sys->peeked = NULL; } - p_sys->offset += length; - if (buflen > 0) - length += Read (stream, ((char *)buf) + length, buflen - length); - return length; + sys->offset += length; + ret += length; } assert ((buf != NULL) || (buflen == 0)); - length = net_Read (stream, p_sys->read_fd, NULL, buf, buflen, false); - if (length < 0) - return 0; - p_sys->offset += length; - return length; + ssize_t val = net_Read (stream, sys->read_fd, NULL, buf, buflen, false); + if (val > 0) + { + sys->offset += val; + ret += val; + } + return ret; } /** @@ -197,28 +230,36 @@ static int Read (stream_t *stream, void *buf, unsigned int buflen) */ static int Peek (stream_t *stream, const uint8_t **pbuf, unsigned int len) { - stream_sys_t *p_sys = stream->p_sys; - block_t *peeked = p_sys->peeked; - size_t curlen = 0; - int fd = p_sys->read_fd; + stream_sys_t *sys = stream->p_sys; + block_t *peeked = sys->peeked; + size_t curlen; - if (peeked == NULL) + if (peeked != NULL) + { + curlen = peeked->i_buffer; + if (curlen < len) + peeked = block_Realloc (peeked, 0, len); + } + else + { + curlen = 0; peeked = block_Alloc (len); - else if ((curlen = peeked->i_buffer) < len) - peeked = block_Realloc (peeked, 0, len); + } - if ((p_sys->peeked = peeked) == NULL) + sys->peeked = peeked; + if (unlikely(peeked == NULL)) return 0; - if (curlen < len) + while (curlen < len) { - ssize_t val = net_Read (stream, fd, NULL, peeked->p_buffer + curlen, - len - curlen, true); - if (val >= 0) - { - curlen += val; - peeked->i_buffer = curlen; - } + ssize_t val; + + val = net_Read (stream, sys->read_fd, NULL, + peeked->p_buffer + curlen, len - curlen, false); + if (val <= 0) + break; + curlen += val; + peeked->i_buffer = curlen; } *pbuf = peeked->p_buffer; return curlen; @@ -237,12 +278,32 @@ static int Control (stream_t *stream, int query, va_list args) case STREAM_CAN_FASTSEEK: *(va_arg (args, bool *)) = false; break; + case STREAM_CAN_PAUSE: + *(va_arg (args, bool *)) = p_sys->can_pause; + break; + case STREAM_CAN_CONTROL_PACE: + *(va_arg (args, bool *)) = p_sys->can_pace; + 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; + *(va_arg (args, uint64_t *)) = 0; + break; + case STREAM_GET_PTS_DELAY: + *va_arg (args, int64_t *) = p_sys->pts_delay; + break; + case STREAM_SET_PAUSE_STATE: + { + bool paused = va_arg (args, unsigned); + + vlc_mutex_lock (&p_sys->lock); + stream_Control (stream->p_source, STREAM_SET_PAUSE_STATE, paused); + p_sys->paused = paused; + vlc_cond_signal (&p_sys->wait); + vlc_mutex_unlock (&p_sys->lock); break; + } default: return VLC_EGENERIC; } @@ -263,9 +324,17 @@ static int Open (stream_t *stream, const char *path) stream->pf_read = Read; stream->pf_peek = Peek; stream->pf_control = Control; - p_sys->peeked = NULL; - p_sys->offset = 0; + + vlc_cond_init (&p_sys->wait); + vlc_mutex_init (&p_sys->lock); + p_sys->paused = false; p_sys->pid = -1; + p_sys->offset = 0; + p_sys->peeked = NULL; + stream_Control (stream->p_source, STREAM_CAN_PAUSE, &p_sys->can_pause); + stream_Control (stream->p_source, STREAM_CAN_CONTROL_PACE, + &p_sys->can_pace); + stream_Control (stream->p_source, STREAM_GET_PTS_DELAY, &p_sys->pts_delay); /* I am not a big fan of the pyramid style, but I cannot think of anything * better here. There are too many failure cases. */ @@ -274,15 +343,13 @@ static int Open (stream_t *stream, const char *path) /* We use two pipes rather than one stream socket pair, so that we can * use vmsplice() on Linux. */ - if (pipe (comp) == 0) + if (vlc_pipe (comp) == 0) { - cloexec (comp[1]); p_sys->write_fd = comp[1]; int uncomp[2]; - if (pipe (uncomp) == 0) + if (vlc_pipe (uncomp) == 0) { - cloexec (uncomp[0]); p_sys->read_fd = uncomp[0]; #if (_POSIX_SPAWN >= 0) @@ -292,9 +359,7 @@ static int Open (stream_t *stream, const char *path) char *const argv[] = { (char *)path, NULL }; if (!posix_spawn_file_actions_adddup2 (&actions, comp[0], 0) - && !posix_spawn_file_actions_addclose (&actions, comp[0]) && !posix_spawn_file_actions_adddup2 (&actions, uncomp[1], 1) - && !posix_spawn_file_actions_addclose (&actions, uncomp[1]) && !posix_spawnp (&p_sys->pid, path, &actions, NULL, argv, environ)) { @@ -304,7 +369,7 @@ static int Open (stream_t *stream, const char *path) } else { - msg_Err (stream, "Cannot execute %s", path); + msg_Err (stream, "cannot execute %s", path); p_sys->pid = -1; } posix_spawn_file_actions_destroy (&actions); @@ -313,13 +378,11 @@ static int Open (stream_t *stream, const char *path) switch (p_sys->pid = fork ()) { case -1: - msg_Err (stream, "Cannot fork (%m)"); + msg_Err (stream, "cannot fork: %s", vlc_strerror_c(errno)); 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: @@ -334,12 +397,17 @@ static int Open (stream_t *stream, const char *path) } close (comp[0]); if (ret != VLC_SUCCESS) - { close (comp[1]); - if (p_sys->pid != -1) - while (waitpid (p_sys->pid, &(int){ 0 }, 0) == -1); - } } + + if (ret == VLC_SUCCESS) + return VLC_SUCCESS; + + if (p_sys->pid != -1) + while (waitpid (p_sys->pid, &(int){ 0 }, 0) == -1); + vlc_mutex_destroy (&p_sys->lock); + vlc_cond_destroy (&p_sys->wait); + free (p_sys); return ret; } @@ -356,7 +424,9 @@ static void Close (vlc_object_t *obj) 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); @@ -364,6 +434,8 @@ static void Close (vlc_object_t *obj) if (p_sys->peeked) block_Release (p_sys->peeked); + vlc_mutex_destroy (&p_sys->lock); + vlc_cond_destroy (&p_sys->wait); free (p_sys); } @@ -407,3 +479,21 @@ static int OpenBzip2 (vlc_object_t *obj) 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"); +}