Changeset a9b034cf7998a55b8403858e83ad481a803cf79d

Timestamp:

05/03/08 22:07:15 (2 months ago)

Author:

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

git-committer:

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

git-parent:

[976b9f6dc9259e4532a01502d00aa91c95f455e8]

git-author:

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

Message:

Remove splice support - it does not quite help for UDP & DCCP

(at least currently)

Files:

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

configure.ac

@@ -474 +474 @@
-
-AC_CHECK_FUNCS(mmap, [VLC_ADD_PLUGIN([access_mmap])])
-
-AS_IF([test "${SYS}" = "linux"], [
-  AC_CHECK_FUNCS(tee)
-])
-
-dnl Check for setlocal and langinfo

modules/stream_out/rtp.c

@@ -1362 +1362 @@
-    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 )
@@ -1383 +1372 @@
-        ssize_t  len = out->i_buffer;
-
-#ifdef HAVE_TEE
-        if( fd[4] != -1 )
-            len = write( fd[1], out->p_buffer, len);
-        if( len == -1 )
-            continue; /* Uho - should not happen */
-#endif
-        mwait( i_date );
-
@@ -1399 +1382 @@
-            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;
-            if( errno == EAGAIN )
-                continue;
-
-            /* splice failed */
-            splice( fd[2], NULL, fd[4], NULL, len, 0 );
-#else
-            if( send( id->sinkv[i].rtp_fd, out->p_buffer, len, 0 ) >= 0 )
-                continue;
-#endif
-            /* Retry sending to root out soft-errors */
-            if( send( id->sinkv[i].rtp_fd, out->p_buffer, len, 0 ) >= 0 )
@@ -1420 +1391 @@
-        }
-        vlc_mutex_unlock( &id->lock_sink );
-
-        block_Release( out );
-#ifdef HAVE_TEE
-        splice( fd[0], NULL, fd[4], NULL, len, 0 );
-#endif
-
-        for( unsigned i = 0; i < deadc; i++ )
@@ -1442 +1409 @@
-        }
-    }
-
-#ifdef HAVE_TEE
-    for( unsigned i = 0; i < 5; i++ )
-        close( fd[i] );
-#endif
-}
-