diff options
| author | schmirl <schmirl> | 2009-02-13 10:39:20 +0000 |
|---|---|---|
| committer | schmirl <schmirl> | 2009-02-13 10:39:20 +0000 |
| commit | 78410ea5761eab03a7bc33852e85621594df7254 (patch) | |
| tree | 38b0238e9797d4ab97fee50c822518ff460def16 /server/streamer.c | |
| parent | c26b89f9c287d64915b94cc56fb0e4e709d235a4 (diff) | |
| download | vdr-plugin-streamdev-78410ea5761eab03a7bc33852e85621594df7254.tar.gz vdr-plugin-streamdev-78410ea5761eab03a7bc33852e85621594df7254.tar.bz2 | |
Added IGMP multicast server
Modified Files:
CONTRIBUTORS HISTORY Makefile README po/de_DE.po po/fi_FI.po
po/fr_FR.po po/it_IT.po po/ru_RU.po server/component.c
server/component.h server/connection.c server/connection.h
server/livefilter.c server/server.c server/setup.c
server/setup.h server/streamer.c server/streamer.h
streamdev/streamdevhosts.conf tools/socket.c tools/socket.h
Added Files:
patches/vdr-cap_net_raw.diff server/componentIGMP.c
server/componentIGMP.h server/connectionIGMP.c
server/connectionIGMP.h
Diffstat (limited to 'server/streamer.c')
| -rw-r--r-- | server/streamer.c | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/server/streamer.c b/server/streamer.c index 63776cf..9795cc6 100644 --- a/server/streamer.c +++ b/server/streamer.c @@ -1,5 +1,5 @@ /* - * $Id: streamer.c,v 1.17 2008/10/22 11:59:32 schmirl Exp $ + * $Id: streamer.c,v 1.18 2009/02/13 10:39:22 schmirl Exp $ */ #include <vdr/ringbuffer.h> @@ -55,16 +55,33 @@ void cStreamdevWriter::Action(void) if (sel.CanWrite(*m_Socket)) { int written; - if ((written = m_Socket->Write(block + offset, count)) == -1) { - esyslog("ERROR: streamdev-server: couldn't send data: %m"); + int pkgsize = count; + // SOCK_DGRAM indicates multicast + if (m_Socket->Type() == SOCK_DGRAM) { + // don't fragment multicast packets + // max. payload on standard local ethernet is 1416 to 1456 bytes + // and some STBs expect complete TS packets + // so let's always limit to 7 * TS_SIZE = 1316 + if (pkgsize > 7 * TS_SIZE) + pkgsize = 7 * TS_SIZE; + else + pkgsize -= pkgsize % TS_SIZE; + } + if ((written = m_Socket->Write(block + offset, pkgsize)) == -1) { + esyslog("ERROR: streamdev-server: couldn't send %d bytes: %m", pkgsize); break; } + + // statistics if (count > max) max = count; offset += written; count -= written; - if (count == 0) { + + // less than one TS packet left: + // delete what we've written so far and get next chunk + if (count < TS_SIZE) { m_Streamer->Del(offset); block = NULL; } |