Changeset 0af8501b1a2406ed103fd8ecacd26c9c209225ca

Timestamp:

09/09/07 13:22:16 (1 year ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1189336936 +0000

git-parent:

[af9789b6e9e2540a7666eb461754bc8e262bfa27]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1189336936 +0000

Message:

stream_out_rtp: Linux splice() support

Files:

• configure.ac (modified) (1 diff)
• modules/stream_out/rtp.c (modified) (4 diffs)

configure.ac

@@ -444 +444 @@
-AC_CHECK_FUNCS(strncasecmp,,[AC_CHECK_FUNCS(strnicmp)])
-AC_CHECK_FUNCS(strcasestr,,[AC_CHECK_FUNCS(stristr)])
+
+AS_IF([test "${SYS}" = "linux"], [
+  AC_CHECK_FUNCS(tee)
+])
-
-dnl Check for setlocal and langinfo

modules/stream_out/rtp.c

@@ -40 +40 @@
-
-#ifdef HAVE_UNISTD_H
+#   include <sys/types.h>
-#   include <unistd.h>
+#   include <fcntl.h>
+#   include <sys/stat.h>
-#endif
-
@@ -1305 +1308 @@
-    sout_stream_id_t *id = (sout_stream_id_t *)p_this;
-    unsigned i_caching = id->i_caching;
+#ifdef HAVE_TEE
+    int fd[5] = { -1, -1, -1, -1, -1 };
+
+    if( pipe( fd ) )
+        fd[0] = fd[1] = -1;
+    else
+    if( pipe( fd ) )
+        fd[2] = fd[3] = -1;
+    else
+        fd[4] = open( "/dev/null", O_WRONLY );
+#endif
-
-    while( !id->b_die )
@@ -1310 +1324 @@
-        block_t *out = block_FifoGet( id->p_fifo );
-        mtime_t  i_date = out->i_dts + i_caching;
-
+
+
+
+
+
+
+
+
-        mwait( i_date );
-
@@ -1316 +1337 @@
-        for( int i = 0; i < id->sinkc; i++ )
-        {
-            send( id->sinkv[i].rtp_fd, out->p_buffer, out->i_buffer, 0 );
-            SendRTCP( id->sinkv[i].rtcp, out );
+
+#ifdef HAVE_TEE
+            tee( fd[0], fd[3], len, 0 );
+            if( splice( fd[2], NULL, id->sinkv[i].rtp_fd, NULL, len,
+                        SPLICE_F_NONBLOCK ) >= 0 )
+                continue;
+
+            /* splice failed */
+            splice( fd[2], NULL, fd[4], NULL, len, 0 );
+#endif
+            send( id->sinkv[i].rtp_fd, out->p_buffer, len, 0 );
-        }
-        vlc_mutex_unlock( &id->lock_sink );
-
-        block_Release( out );
-
+
+
+
+
+
+
+
+
+
-}
-