dash: added downloader and bitrate to chunk

[vlc] / modules / stream_filter / decomp.c

diff --git a/modules/stream_filter/decomp.c b/modules/stream_filter/decomp.c
index fd5c1edd87233d79a8d742fb041d342c65cdb59a..7aef4f9c98383e843777d7297dbb98db995b45fb 100644 (file)
--- a/modules/stream_filter/decomp.c
+++ b/modules/stream_filter/decomp.c
@@ -3,19 +3,19 @@
  *****************************************************************************
  * 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.
+ * 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,6 +26,7 @@
 #include <vlc_plugin.h>
 #include <vlc_stream.h>
 #include <vlc_network.h>
+#include <vlc_fs.h>
 #include <assert.h>
 #include <unistd.h>
 #include <errno.h>
@@ -74,12 +75,6 @@ struct stream_sys_t
     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));
-}
-
 extern char **environ;
 
 static const size_t bufsize = 65536;
@@ -148,6 +143,9 @@ static void *Thread (void *data)
     while (!error);
 
     msg_Dbg (stream, "compressed stream at EOF");
+    /* Let child process know about EOF */
+    p_sys->write_fd = -1;
+    close (fd);
     return NULL;
 }
 
@@ -282,15 +280,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)
@@ -300,9 +296,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))
                 {
@@ -325,9 +319,7 @@ static int Open (stream_t *stream, const char *path)
                     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:
@@ -364,7 +356,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);