debian/0000755000000000000000000000000011424702475007174 5ustar debian/ts_filter.10000644000000000000000000000143011424667675011263 0ustar .TH TS_FILTER 1 "29 July 2002" "Linux" "Debian" .SH NAME ts_filter \- extract a single stream from a multiplexed TS .SH SYNOPSIS .B ts_filter <\fIpid\fR> .SH DESCRIPTION .B ts_filter is a simple filter to extract a single MPEG stream from a multiplexed MPEG Transport stream. It may be used with \fBdvbstream\fR and other MPEG programs to extract a single stream for display. .PP .B ts_filter takes the PID of the stream to extract on the command line, and filters the standard input, outputting to standard output. .SH SEE ALSO .BR mpegtools(1), and .BR dvbstream(1). .SH AUTHORS .B dvbstream was written by Dave Chapman 2001, 2002. and is made available under the GNU Public License. .PP This man page was written by Alastair McKinstry, . debian/compat0000644000000000000000000000000211424671205010366 0ustar 7 debian/copyright0000644000000000000000000000256111424667675011147 0ustar This package was debianized by Alastair McKinstry on Mon, 7 July 2002 16:51:50 +0100. Originally: http://www.linuxstb.org/dvbstream Now available at: http://prdownloads.sourceforge.net/dvbtools/ dvbstream-0.5.tar.gz Upstream Authors: Dave Chapman Stephen Davies David Podeur Guenter Wildmann Marcus Metzler Copyright: Copyright (C) Dave Chapman 2001,2002 Copyright (C) 2000, 2001 Marcus Metzler License: This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This package 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. You should have received a copy of the GNU General Public License along with this package; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA On Debian systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL'. debian/other-patches/0000755000000000000000000000000011424677640011747 5ustar debian/other-patches/020_dvbstream_time.patch0000644000000000000000000000124411424667675016366 0ustar Patch by Paul Martin to fix the '-n secs' option. See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=325595 diff -ruN dvbstream-0.6+cvs20060501-old/dvbstream.c dvbstream-0.6+cvs20060501/dvbstream.c --- dvbstream-0.6+cvs20060501-old/dvbstream.c 2006-05-02 11:17:49.000000000 +0100 +++ dvbstream-0.6+cvs20060501/dvbstream.c 2006-05-02 11:20:55.000000000 +0100 @@ -934,7 +934,9 @@ } #endif - while ( !Interrupted) { + /* Set up timer */ + if (secs > 0) alarm(secs); + while ( !Interrupted && ((secs == 0) || (now < secs))) { // setup select descriptor set // we always wait on DVR device and // either the socket or telnet session debian/other-patches/010_poll.patch0000644000000000000000000001326711424667675014336 0ustar Patch by Adrian Bridgett that replaces the poll() call by a select() one, leading to typically 15% reduction in CPU usage. See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=360292 diff -ruN dvbstream-0.6+cvs20060501-old/CHANGES dvbstream-0.6+cvs20060501/CHANGES --- dvbstream-0.6+cvs20060501-old/CHANGES 2006-05-02 10:08:11.000000000 +0100 +++ dvbstream-0.6+cvs20060501/CHANGES 2006-05-02 11:06:41.000000000 +0100 @@ -1,3 +1,14 @@ +v0.5.1 - 31st March 2006: +------------------------- +Changed by Adrian Bridgett from poll() to select(). +Saves ~1500 accept() calls/second which translates into approx 15% CPU saving. + + +v0.5 - ?? +--------- +Unknown + + V0.4 - 29th October 2001: ------------------------- diff -ruN dvbstream-0.6+cvs20060501-old/dvbstream.c dvbstream-0.6+cvs20060501/dvbstream.c --- dvbstream-0.6+cvs20060501-old/dvbstream.c 2006-05-02 10:10:02.000000000 +0100 +++ dvbstream-0.6+cvs20060501/dvbstream.c 2006-05-02 11:13:40.000000000 +0100 @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include @@ -143,29 +143,16 @@ } } -void make_nonblock(int f) { - int oldflags; - - if ((oldflags=fcntl(f,F_GETFL,0)) < 0) { - perror("F_GETFL"); - } - oldflags|=O_NONBLOCK; - if (fcntl(f,F_SETFL,oldflags) < 0) { - perror("F_SETFL"); - } -} - typedef enum {STREAM_ON,STREAM_OFF} state_t; - int socketIn, ns; + int socketIn, ns = -1; int pids[MAX_CHANNELS]; int pestypes[MAX_CHANNELS]; unsigned char hi_mappids[8192]; unsigned char lo_mappids[8192]; int fd_frontend; int pid,pid2; - int connectionOpen; int fromlen; char hostname[64]; char in_ch; @@ -188,33 +175,31 @@ #define TS_SIZE 188 #define IN_SIZE TS_SIZE +int accept_telnet() { + /* Open a new telnet session if a client is trying to connect */ + if ((ns = accept(socketIn, (struct sockaddr *)&fsin, &fromlen)) < 0) { + perror ("server: accept"); + return -1; + } + + printf("Opened connection\n"); + writes(ns,"220-DVBSTREAM - "); + writes(ns,hostname); + writes(ns,"\r\nDONE\r\n"); + return 1; +} + int process_telnet() { - char cmd[1024]; - int cmd_i=0; + static char cmd[1024] = "\0"; + static int cmd_i=0; int i; char* ch; dmx_pes_type_t pestype; unsigned long freq=0; unsigned long srate=0; - /* Open a new telnet session if a client is trying to connect */ - if (ns==-1) { - if ((ns = accept(socketIn, (struct sockaddr *)&fsin, &fromlen)) > 0) { - make_nonblock(ns); - cmd_i=0; - cmd[0]=0; - printf("Opened connection\n"); - writes(ns,"220-DVBSTREAM - "); - writes(ns,hostname); - writes(ns,"\r\nDONE\r\n"); - connectionOpen=1; - } - } - - /* If a telnet session is open, receive and process any input */ - if (connectionOpen) { /* Read in at most a line of text - any ctrl character ends the line */ - while (read(ns,&in_ch,1)>0) { + while (recv(ns,&in_ch,1,MSG_DONTWAIT)>0) { if (in_ch < 32) break; /* Prevent buffer overflows */ if (cmd_i < 1024-1) { @@ -229,7 +214,6 @@ writes(ns,"DONE\r\n"); close(ns); ns=-1; - connectionOpen=0; printf("Closed connection\n"); } else if (strcasecmp(cmd,"STOP")==0) { writes(ns,"STOP\n"); @@ -320,7 +304,6 @@ writes(ns,"DONE\r\n"); } } - } return(0); } @@ -422,7 +405,8 @@ int fd_dvr; int i,j; unsigned char buf[MTU]; - struct pollfd pfds[2]; // DVR device and Telnet connection + fd_set select_fds; // DVR device, telnet socket and connection + int num_fds; unsigned int secs = -1; unsigned long freq=0; unsigned long srate=0; @@ -839,7 +823,6 @@ f = fopen(pids_map[i].filename, "w+b"); if (f != NULL) { pids_map[i].fd = fileno(f); - make_nonblock(pids_map[i].fd); fprintf(stderr, "Open file %s\n", pids_map[i].filename); } else { pids_map[i].fd = -1; @@ -945,30 +928,52 @@ exit(1); } - make_nonblock(socketIn); - if (listen(socketIn, 1) < 0) { perror("server: listen"); exit(1); } #endif - connectionOpen=0; - ns=-1; - pfds[0].fd=fd_dvr; - pfds[0].events=POLLIN|POLLPRI; - pfds[1].events=POLLIN|POLLPRI; - while ( !Interrupted) { - /* Poll the open file descriptors */ - if (ns==-1) { - poll(pfds,1,500); - } else { - pfds[1].fd=ns; // This can change - poll(pfds,2,500); + // setup select descriptor set + // we always wait on DVR device and + // either the socket or telnet session + // only one session at a time ATM + // in fact, process_telnet can only handle one session + FD_ZERO(&select_fds); + FD_SET(fd_dvr,&select_fds); + if (ns == -1) { + FD_SET(socketIn,&select_fds); + } else { + FD_SET(ns,&select_fds); + } + + num_fds = (socketIn >= ns) ? socketIn : ns; + num_fds++; + if (select(num_fds, &select_fds, NULL, NULL, NULL) < 0) { + if (errno == EINTR) { + continue; + } + perror("server: select"); + exit(1); + } + + if (FD_ISSET(socketIn, &select_fds)) { + if (ns != -1) { + fprintf(stderr,"Multiple telnets not supported"); + } else { + accept_telnet(); + } + } - process_telnet(); // See if there is an incoming telnet connection + if ((ns != -1) && FD_ISSET(ns, &select_fds)) { + process_telnet(); + } + + if (! FD_ISSET(fd_dvr, &select_fds)) { + continue; + } if (output_type==RTP_TS) { /* Attempt to read 188 bytes from /dev/ost/dvr */ debian/watch0000644000000000000000000000015511424702337010223 0ustar version=3 opts=dversionmangle=s/\+cvs.*// \ http://sf.net/dvbtools/dvbstream-(.*)\.tar\.gz debian uupdate debian/control0000644000000000000000000000106011424700507010566 0ustar Source: dvbstream Section: video Priority: optional Maintainer: Mark Purcell Build-Depends: debhelper (>= 7), linux-kernel-headers Standards-Version: 3.9.1 Homepage: http://sourceforge.net/projects/dvbtools/ Package: dvbstream Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Suggests: dvbtune, mpg123 Description: Broadcast a DVB Transport stream over a LAN DVBstream is based on the ts-rtp package available at http://www.linuxtv.org. It broadcasts a (subset of a) DVB transport stream over a LAN using the rtp protocol. debian/docs0000644000000000000000000000000711424671425010044 0ustar README debian/dvbstream.manpages0000644000000000000000000000001311424667675012706 0ustar debian/*.1 debian/dirs0000644000000000000000000000001011424667675010063 0ustar usr/bin debian/dvbstream.10000644000000000000000000001311211424667675011257 0ustar .TH DVBSTREAM "1" "4 March 2005" "Linux" "Debian" .SH NAME dvbstream \- Transmit a DVB transport stream via RTP .SH SYNOPSIS .B dvbstream [\fI \-f freq\fR] [\fI \-p v\|h\fR] [\fI \-s symbolrate\fR] [\fI \-c cardnum\fR] [\fI \-o \fR] [\fI \-ps \fR] [\fI \-i ipaddr \fR] [\fI \-r port\fR] [\fI\-a apid\fR] [\fI\ \-v vpid\fR] p\fI \-t ttpid\fR] [\fI\-n secs \fR] [\fI pid1 ... \fR] .SH DESCRIPTION .B dvbstream takes a TS (transport stream) from A DVB (Digital Video Broadcast, either DVB\-S for satellite cards, DVB\-C for cable, or DVB\-T for terrestrial) and broadcasts (a subset of) it over a LAN using the RTP protocol. .TP Some options are not available on Budget DVB cards. .SH OPTIONS .TP \fB\-f\fR The Frequency to tune into, in MHz. .TP \fB\-p\fR, \fI v|h\fR The polarisation; either \fIh\fR (horizontal) or \fIv\fR (vertical). .TP \fB\-s\fR \fIsymbolrate\fR The symbol rate of the DVB stream, typically 27500. .TP \fB\-c\fR \fIcardnum\fR Select which DVB card to use. The \fIcardnum\fR must be between 0 and 3. .TP \fB\-a\fR \fIapid\fR Select which audio PID to output on the TV\-OUT of the DVB card (Full cards only). .TP \fB\-v\fR \fIvpid\fR Select which video PID to output on the TV\-OUT of the DVB card (Full cards only). .TP .TP \fB\-t\fR \fIttpid\fR Select which Teletext PID to output on the TV\-OUT of the DVB card (Full cards only). \fB\-n\fR \fIsecs\fR Timeout and shut down after \fIsecs\fR seconds. .TP .TP \fB\-ps\fR Output a PS rather than a (default) PES stream. .TP \fB\-o\fR Output to stdout rather than broadcast. .TP \fB\-i ipaddr\fR IP Multicast port to output to (default is 224.0.1.2) .TP \fB\-r port\fR IP multicast port to outpu to (default is 5004). .SH SERVER USAGE If you wanted to broadcast TVC International from Astra 19E, you would type the following command: .sp dvbstream \-f 12441 \-p v \-s 27500 512 660 .sp You can specify up to 8 PIDs on the command-line to include in the multicasted transport stream. A 10MBit/s network should be able to handle one video and one audio stream, or eight audio streams. .PP If you also want to view the TV channel on the TV\-OUT of your DVB\-S card (or using xawtv or similar), then you can use the "\-v" and "\-a" flags before the video and audio PIDs respectively: .sp dvbstream \-f 12441 \-p v \-s 27500 \-v 512 \-a 660 .sp dvbstream also has the ability to map PIDS to different values before you stream it. For example, if you type .sp dvbstream \-f 12441 \-p v \-s 27500 \-v 512:1 \-a 660:2 .sp then the video stream will become "PID 1" and the audio stream will become "PID 2". .PP Also, with driver versions from October 2001 onwards, you can broadcast the entire transport stream (if you are using a budget card) with the command: .sp dvbstream 8192 .sp 8192 is a "dummy PID" (legal PIDS are in the range 0\-8191) and the driver interprets this to mean the entire TS. Obviously, it would make no sense to use the map feature on this "pid". .SH CLIENT USAGE To receive the stream on any other machine on your LAN, use the dumprtp utility (from ts\-rtp). An slightly improved version is included in this archive. e.g. .sp dumprtp > received.ts .sp If you have a DVB card on the second machine, you can use the rtpfeed command to decode the stream. Type "rtpfeed \-h" for usage information. rtpfeed was written by Guenter Wildmann \- please address any bugs or comments to Guenter. .PP If you don't have a DVB card on the client machine, You can use mpg123 and the mpegtools provided with the DVB driver for live audio decoding: .sp dumprtp | ts2es apid | mpg123 \- .sp This command line is included with dvbstream as the "rtpradio.sh" script. .PP If you only want audio, you can run dvbstream with eight audio PIDs, and then your clients can choose which PID to play. .PP For live TV channel playing, the best solution I have found is mplayer (http://www.mplayerhq.hu). Please install the latest CVS version \- mplayer is being rapidly improved. .PP You can then view TV being streamed over the network using the following command: .sp dumprtp | ts2ps vpid apid | mplayer \-cache 2048 \- .sp This command line is included with dvbstream as the "rtptv.sh" script. .SH MPLAYER "RTP\-PS" SUPPORT The file "mplayer\-libmpdemux\-network.c.patch" contains a patch for the current (31 Jan 2001) CVS version of mplayer to "enable" the experimental RTP support. To apply it, check out a fresh copy of mplayer using and change into the "main/libmpdemux" directory. .PP Then apply the command: .sp patch < /path_to/dvbstream\-0.4pre2/mplayer\-libmpdemux\-network.c.patch .sp You can then build mplayer as normal. To receive a RTP stream broadcast with dvbstream's "\-ps" option, you just need to type the following command on the client machine: .sp mplayer rtp://224.0.1.2:5004/ \-cache 2048 .sp .SH TELNET INTERFACE From v0.4 onwards, DVBstream incorporates a "telnet" interface to allow you to remotely start and stop the streaming, and tune the card to a different channel. .PP The following commands are supported: .PP .sp TUNE freq pol srate STOP ADDV pid[:map] ADDA pid[:map] ADDT pid[:map] ADD pid[:map] QUIT .sp .I STOP closes down all PIDs and stops the streaming. The other commands should be self-explanatory. See the scripts in the TELNET directory for example usage. x .SH HISTORY .B dvbstream fixes a number of bugs that were present in the original .B ts\-rtp application. .SH "SEE ALSO" .BR rtpfeed (1), .BR dumprtp (1), and .BR ts2es (1) .SH AUTHORS .B dvbstream was written by Dave Chapman 2001, 2002. and is made available under the GNU Public License. .PP This man page was written by Alastair McKinstry, . debian/dvbstream.examples0000644000000000000000000000001611424700073012710 0ustar TELNET/* *.sh debian/changelog0000644000000000000000000000720411424702125011041 0ustar dvbstream (0.6+cvs20090621-1) unstable; urgency=low * New Upstream CVS Snapshot * Update to Standards Version 3.9.1 - Switch to dh 7 - Fixes "stop build-depending on dbs" (Closes: #576046) - debian/compat -> 7 - Add get-orig-source target -- Mark Purcell Sat, 31 Jul 2010 11:08:24 +1000 dvbstream (0.6+cvs20060501-6) unstable; urgency=low * Update debian/watch - fixes debian-watch-file-missing-version - debian/watch fails to report upstream's version (Closes: #449818) * Add debian/compat - fixes debian-rules-sets-DH_COMPAT * Update debian/dvbstream.1 - fixes hyphen-used-as-minus-sign * Update debian/dirs - fixes package-contains-empty-directory * Add Homepage: to debian/control -- Mark Purcell Sun, 28 Sep 2008 12:02:58 +1000 dvbstream (0.6+cvs20060501-5) unstable; urgency=low * New maintainer. (Closes: #412480: ITA: dvbstream -- Broadcast a DVB Transport stream over a LAN - Debian Bug report logs) * Thanks to Alastair McKinstry for maintenance todate -- Mark Purcell Tue, 13 Mar 2007 22:17:49 +0000 dvbstream (0.6+cvs20060501-4) unstable; urgency=low * New maintainer. (Closes: #412480: ITA: dvbstream -- Broadcast a DVB Transport stream over a LAN - Debian Bug report logs) * Thanks to Alastair McKinstry for maintenance todate * Lintian cleanup: copyright-lists-upstream-authors-with-dh_make- boilerplate -- Mark Purcell Tue, 13 Mar 2007 21:06:45 +0000 dvbstream (0.6+cvs20060501-3) unstable; urgency=low * Use ts_filter rather than ts2es in radio scripts, as ts2es is no longer available. Closes: #357109. * Move to Standards-Version: 3.7.2. No changes required. * No longer Suggest: the dvb-mpegtools package, which is no longer supplied. Instead Suggest: dvbtune. -- Alastair McKinstry Fri, 22 Sep 2006 11:50:29 +0100 dvbstream (0.6+cvs20060501-2) unstable; urgency=low * Include Build-Depends: dbs. Closes: #365746, #365748. -- Alastair McKinstry Tue, 2 May 2006 20:40:30 +0100 dvbstream (0.6+cvs20060501-1) unstable; urgency=low * New upstream release: Include 0.6 + patches from CVS. * Build-depends: dvb-dev replaced by linux-kernel-headers. * Patches from sourceforge tracker: - Add defaults for Australia to source; - Add DVB-C tuning patch to avoid bug that causes tuning to fail in Finland. -- Alastair McKinstry Tue, 2 May 2006 11:37:00 +0100 dvbstream (0.5-2) unstable; urgency=low * Update the URL in debian/copyright to point to current location. Also update debian/watch. * Make dvbstream(1) match dvbstream binary. Closes: #325595. * Move to DH_COMPAT=5 * Move to Standards-Version: 3.6.2. No changes required. -- Alastair McKinstry Sun, 5 Mar 2006 18:17:44 +0000 dvbstream (0.5-1) unstable; urgency=low * New upstream release. -- Alastair McKinstry Sun, 15 Feb 2004 07:33:18 +0000 dvbstream (0.4pre2+cvs20030920-1) unstable; urgency=low * Build against the new dvb-dev. * New Upstream snapshot. * Move to Standards-Version: 3.6.1.0; no changes required. -- Alastair McKinstry Sat, 20 Sep 2003 22:22:46 +0100 dvbstream (0.4pre2-2) unstable; urgency=low * Change maintainer email to mckinstry@debian.org * Move to Standards-Version: 3.6.0; no changes required. -- Alastair McKinstry Wed, 30 Jul 2003 13:07:26 +0100 dvbstream (0.4pre2-1) unstable; urgency=low * Initial Release (Closes: #152084). -- Alastair McKinstry Mon, 29 Jul 2002 16:51:50 +0100 debian/patches/0000755000000000000000000000000011424702475010623 5ustar debian/patches/series0000644000000000000000000000012511424700215012024 0ustar 030_dvbstream_australia.patch 040_dvbc_tuning.patch debian-changes-0.6+cvs20090621-1 debian/patches/debian-changes-0.6+cvs20090621-10000644000000000000000000000323411424702475015452 0ustar Description: Upstream changes introduced in version 0.6+cvs20090621-1 This patch has been created by dpkg-source during the package build. Here's the last changelog entry, hopefully it gives details on why those changes were made: . dvbstream (0.6+cvs20090621-1) unstable; urgency=low . * New Upstream CVS Snapshot * Update to Standards Version 3.9.1 - Switch to dh 7 - Fixes "stop build-depending on dbs" (Closes: #576046) - debian/compat -> 7 - Add get-orig-source target . The person named in the Author field signed this changelog entry. Author: Mark Purcell Bug-Debian: http://bugs.debian.org/576046 --- The information above should follow the Patch Tagging Guidelines, please checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here are templates for supplementary fields that you might want to add: Origin: , Bug: Bug-Debian: http://bugs.debian.org/ Bug-Ubuntu: https://launchpad.net/bugs/ Forwarded: Reviewed-By: Last-Update: --- dvbstream-0.6+cvs20090621.orig/README +++ dvbstream-0.6+cvs20090621/README @@ -88,10 +88,9 @@ information. rtpfeed was written by Gue Guenter. If you don't have a DVB card on the client machine, You can use mpg123 -and the mpegtools provided with the DVB driver for live audio -decoding: +for live audio decoding: -dumprtp | ts2es apid | mpg123 - +dumprtp | ts_filter $apid | mpg123 - This command line is included with dvbstream as the "rtpradio.sh" script. debian/patches/050_radio.patch0000644000000000000000000000216511424667675013346 0ustar diff -ruN dvbstream-0.6+cvs20060501-old/README dvbstream-0.6+cvs20060501/README --- dvbstream-0.6+cvs20060501-old/README 2006-09-22 11:47:35.000000000 +0100 +++ dvbstream-0.6+cvs20060501/README 2006-09-22 11:49:43.000000000 +0100 @@ -88,10 +88,9 @@ Guenter. If you don't have a DVB card on the client machine, You can use mpg123 -and the mpegtools provided with the DVB driver for live audio -decoding: +for live audio decoding: -dumprtp | ts2es apid | mpg123 - +dumprtp | ts_filter $apid | mpg123 - This command line is included with dvbstream as the "rtpradio.sh" script. diff -ruN dvbstream-0.6+cvs20060501-old/rtpradio.sh dvbstream-0.6+cvs20060501/rtpradio.sh --- dvbstream-0.6+cvs20060501-old/rtpradio.sh 2006-05-02 10:08:11.000000000 +0100 +++ dvbstream-0.6+cvs20060501/rtpradio.sh 2006-09-22 11:48:40.000000000 +0100 @@ -1,9 +1,10 @@ #!/bin/sh DUMPRTP=dumprtp -#TS2ES is in the dvb-mpegtools package -TS2ES=ts2es +TSFILTER=ts_filter # MPG123 is in the mpg123 package + +# APID is the Audio PID of the radio station to listen to MPG123='mpg123 -' -$DUMPRTP | $TS2ES 2 | $MPG123 +$DUMPRTP | $TSFILTER $APID | $MPG123 debian/patches/040_dvbc_tuning.patch0000644000000000000000000000156611424667675014555 0ustar Ensure that tuning obeys the command-line parameter rather than hard-coded value in tune.c In tune.c, the QAM tuning parameter INVERSION_OFF causes tuning to fail (Cinergy 1200 DVB-C budget card, linux 2.6.12, HTV cable network in Finland). Patch from patch tracker in Sourceforge. thanks to anonymous. diff -ruN dvbstream-0.6+cvs20060501-old/tune.c dvbstream-0.6+cvs20060501/tune.c --- dvbstream-0.6+cvs20060501-old/tune.c 2006-05-02 10:13:09.000000000 +0100 +++ dvbstream-0.6+cvs20060501/tune.c 2006-05-02 11:32:33.000000000 +0100 @@ -269,7 +269,7 @@ case FE_QAM: fprintf(stderr,"tuning DVB-C to %d, srate=%d\n",freq,srate); feparams.frequency=freq; - feparams.inversion=INVERSION_OFF; + feparams.inversion=specInv; feparams.u.qam.symbol_rate = srate; feparams.u.qam.fec_inner = FEC_AUTO; feparams.u.qam.modulation = modulation; debian/patches/030_dvbstream_australia.patch0000644000000000000000000000434511424667675016304 0ustar Patch in Sourceforge patch tracker by Matthew Walker to add defaults for Australia. While not currently used, track them here and add a patch later to dvbstream to pick defaults based on current locale. -- amck, 2006502 diff -ruN dvbstream-0.6+cvs20060501-old/dvb_defaults.h dvbstream-0.6+cvs20060501/dvb_defaults.h --- dvbstream-0.6+cvs20060501-old/dvb_defaults.h 2006-05-02 10:10:02.000000000 +0100 +++ dvbstream-0.6+cvs20060501/dvb_defaults.h 2006-05-02 11:29:55.000000000 +0100 @@ -44,6 +44,7 @@ //#define UK //#define FINLAND //#define FINLAND2 +//#define AUSTRALIA /* UK defines are at the end, as a default option */ @@ -73,6 +74,20 @@ #endif +#ifdef AUSTRALIA + +/* Australian settings (well some are common) see: + * */ +#define DVB_T_LOCATION "in Australia" +#define BANDWIDTH_DEFAULT BANDWIDTH_7_MHZ +#define HP_CODERATE_DEFAULT FEC_3_4 +#define CONSTELLATION_DEFAULT QAM_64 +#define TRANSMISSION_MODE_DEFAULT TRANSMISSION_MODE_2K +#define GUARD_INTERVAL_DEFAULT GUARD_INTERVAL_1_16 +#define HIERARCHY_DEFAULT HIERARCHY_NONE + +#endif + #if defined (UK) && defined (HP_CODERATE_DEFAULT) #error Multible countries defined #endif diff -ruN dvbstream-0.6+cvs20060501-old/Makefile dvbstream-0.6+cvs20060501/Makefile --- dvbstream-0.6+cvs20060501-old/Makefile 2006-05-02 10:10:02.000000000 +0100 +++ dvbstream-0.6+cvs20060501/Makefile 2006-05-02 11:29:47.000000000 +0100 @@ -18,6 +18,10 @@ CFLAGS += -DFINLAND2 endif +ifdef AUSTRALIA + CFLAGS += -DAUSTRALIA +endif + all: $(OBJS) dvbstream: dvbstream.c rtp.o tune.o mpegtools/ctools.o mpegtools/remux.o mpegtools/transform.o mpegtools/ringbuffy.o diff -ruN dvbstream-0.6+cvs20060501-old/README dvbstream-0.6+cvs20060501/README --- dvbstream-0.6+cvs20060501-old/README 2006-05-02 10:10:02.000000000 +0100 +++ dvbstream-0.6+cvs20060501/README 2006-05-02 11:29:49.000000000 +0100 @@ -35,7 +35,8 @@ If you are using dvbtune for DVB-T in Finland, you should replace the "make" command with "make FINLAND=1". or "make FINLAND2=1" (see the -comments in the dvb_defaults.h file for details). +comments in the dvb_defaults.h file for details). If in Australia +use "make AUSTRALIA=1". USAGE - SERVER debian/source/0000755000000000000000000000000011424673727010503 5ustar debian/source/format0000644000000000000000000000001411424673727011711 0ustar 3.0 (quilt) debian/rules0000755000000000000000000000156411424673600010257 0ustar #!/usr/bin/make -f %: dh $@ package := dvbstream #date := $(shell date '+%Y%m%d') date := 20090621 orig_source_dir := ${package}-${date}.orig orig_source_tarball := ${package}_0.6+cvs${date}.orig.tar.gz cvs_repos := :pserver:anonymous@dvbtools.cvs.sourceforge.net:/cvsroot/dvbtools cvs_path := dvbstream cvs_top := $(shell echo ${cvs_path} | cut -d "/" -f 1 -) clean-orig-source: rm -rf ${cvs_top} ${orig_source_dir} rm -f ${orig_source_tarball} get-orig-source: clean-orig-source @@[ -d ../tarballs/. ]||mkdir -p ../tarballs @echo "Type as CVS password." cvs -d ${cvs_repos} login cvs -d ${cvs_repos} history -report -n ${package} cvs -d ${cvs_repos} export -D ${date} ${cvs_path} mv ${cvs_path} ${orig_source_dir} rm -f ${orig_source_dir}/*edict* tar c ${orig_source_dir} | gzip -9 > ../tarballs/${orig_source_tarball} rm -rf ${cvs_top} ${orig_source_dir} debian/dvbstream.install0000644000000000000000000000010411424670360012543 0ustar dvbstream usr/bin dumprtp usr/bin rtpfeed usr/bin ts_filter usr/bin debian/rtpfeed.10000644000000000000000000000325411424667675010727 0ustar .TH RTPFEED "1" "28 July 2002" "Linux" "Debian" .SH NAME rtpfeed \- Feed a DVB-S card with an RTP unicast/multicast/broacast stream .SH SYNOPSIS .B rtpfeed [\fI \-\-group group \fR] [\fI \-\-port port \fIR] [\fI \-\-vpid vpid \fR] [\fI \-\-apid apid \fR] .PP .B rtpfeed \fI\-\-help\fR .PP .B rtpfeed \fI\-\-version\fR .SH DESCRIPTION .B rtpfeed takes a unicast, multicast or broadcast RTP stream from a network (typically generated by .B dvbstream running on a server) and feeds it to a DVB-S card for decoding and display. .PP As an RTP transport stream from .B dvbstream can contain multiple (up to eight) video streams and audio streams, the streams to display may be explicitly named on the command line. .SH OPTIONS .TP \fB\-g\fR, \fB\-\-group\fR \fIaddr\fR The IP address of the RTP stream. By default, this is \fI224.0.1.2\fR. .TP \fB\-p\fR, \fB\-\-port\fR \fIportnum\fR The IP port of the RTP stream. By default, this is \fI5004\fR. .TP \fB\-v\fR, \fB\-\-vpid\fR \fIvpid\fR The Video PID of the video stream to display. If none is specified, all present are fed to the DVB card. .TP \fB\-v\fR, \fB\-\-apid\fR \fIapid\fR The Audio PID of the audio stream to display. If none is specified, all present are fed to the DVB card. .TP \fB\-\-help\fR display this help and exit .TP \fB\-\-version\fR output version information and exit .SH "SEE ALSO" .BR dvbstream (1), .BR dumprtp (1), and .BR ts2es (1) .SH HISTORY Parts of this program were taken from dumprtp.c by David Podeur. .SH AUTHORS .B rtpfeed was writteb by Guenter Wildmann, , with parts taken from dumprtp.c by David Podeur. .PP This man page was written by Alastair McKinstry, . debian/dumprtp.10000644000000000000000000000163711424667675010774 0ustar .TH DUMPRTP 1 "29 July 2002" "Linux" "Debian" .SH NAME dumprtp \- get an RTP unicast/multicast/broadcast stream and output it .SH SYNOPSIS .B ts_filter [\fIip_addr port\fR] .SH DESCRIPTION .B dumprtp fetches a unicast,broadcast or multicast stream from an IP address and outputs it to stdout. It may be used with \fBdvbstream\fR to broadcast, for example, DVB video and audio over a LAN. .PP With no arguments, \fBdumprtp\fR outputs from multicast address \fI224.0.1.2\fR, port \fI5004\fR by default (this is the default used by \fBdvbstream\fR. To change this, give the address and the port number on the command line. .SH SEE ALSO .BR mpegtools(1) and .BR dvbstream(1). .SH AUTHORS .B dumprtp was written by David Podeur () for Convergence integrated media GmbH and is made available under the GNU Public License. .PP This man page was written by Alastair McKinstry, .