[PATCH] dtv-scan-tables: update dvb-t/au-SunshineCoast
From: Brian Burch Update dvb-t/au-SunshineCoast as per Brian Burch's bug report on Ubuntu Launchpad: https://bugs.launchpad.net/ubuntu/+source/dtv-scan-tables/+bug/1415262 Signed-off-by: Jonathan McCrohan --- dvb-t/au-SunshineCoast | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dvb-t/au-SunshineCoast b/dvb-t/au-SunshineCoast index 5d22931..ff6f5dd 100644 --- a/dvb-t/au-SunshineCoast +++ b/dvb-t/au-SunshineCoast @@ -1,8 +1,8 @@ # Australia / Sunshine Coast -# SBS36 SBS *** +# SBS40 SBS *** [CHANNEL] DELIVERY_SYSTEM = DVBT - FREQUENCY = 585625000 + FREQUENCY = 61350 BANDWIDTH_HZ = 700 CODE_RATE_HP = 2/3 CODE_RATE_LP = NONE @@ -12,10 +12,10 @@ HIERARCHY = NONE INVERSION = AUTO -# TNQ47 10 *** +# TNQ44 10 *** [CHANNEL] DELIVERY_SYSTEM = DVBT - FREQUENCY = 662625000 + FREQUENCY = 64150 BANDWIDTH_HZ = 700 CODE_RATE_HP = 3/4 CODE_RATE_LP = NONE @@ -25,10 +25,10 @@ HIERARCHY = NONE INVERSION = AUTO -# ABQ62 ABC *** +# ABC41 ABC *** [CHANNEL] DELIVERY_SYSTEM = DVBT - FREQUENCY = 767625000 + FREQUENCY = 62050 BANDWIDTH_HZ = 700 CODE_RATE_HP = 3/4 CODE_RATE_LP = NONE @@ -38,10 +38,10 @@ HIERARCHY = NONE INVERSION = AUTO -# STQ65 7 *** +# STQ42 7 *** [CHANNEL] DELIVERY_SYSTEM = DVBT - FREQUENCY = 788625000 + FREQUENCY = 62750 BANDWIDTH_HZ = 700 CODE_RATE_HP = 3/4 CODE_RATE_LP = NONE @@ -51,10 +51,10 @@ HIERARCHY = NONE INVERSION = AUTO -# STQ68 WIN *** +# RTQ43 WIN *** [CHANNEL] DELIVERY_SYSTEM = DVBT - FREQUENCY = 80950 + FREQUENCY = 63450 BANDWIDTH_HZ = 700 CODE_RATE_HP = 3/4 CODE_RATE_LP = NONE -- 2.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] dtv-scan-tables: update dvb-t/au-Brisbane
From: Brian Burch Update dvb-t/au-Brisbane as per Brian Burch's bug report on Ubuntu Launchpad: https://bugs.launchpad.net/ubuntu/+source/dtv-scan-tables/+bug/1393280 Signed-off-by: Jonathan McCrohan --- dvb-t/au-Brisbane | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dvb-t/au-Brisbane b/dvb-t/au-Brisbane index 68bc1ac..a23cb9c 100644 --- a/dvb-t/au-Brisbane +++ b/dvb-t/au-Brisbane @@ -54,7 +54,7 @@ # SBS [CHANNEL] DELIVERY_SYSTEM = DVBT - FREQUENCY = 585625000 + FREQUENCY = 18450 BANDWIDTH_HZ = 700 CODE_RATE_HP = 2/3 CODE_RATE_LP = NONE @@ -67,7 +67,7 @@ # 31 Digital [CHANNEL] DELIVERY_SYSTEM = DVBT - FREQUENCY = 59950 + FREQUENCY = 52950 BANDWIDTH_HZ = 700 CODE_RATE_HP = 2/3 CODE_RATE_LP = NONE -- 2.1.3 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: Added channel parsers for DVB-S2 and DVB-T2 at libdvbv5 and found some issues at dtv-scan-tables
Hi Mauro, On Thu, Sep 04, 2014 at 11:56:03PM -0300, Mauro Carvalho Chehab wrote: > I added some improvements at libdvbv5 to parse the DVB-T2 and DVB-S2 lines > at dtv-scan-tables. > > It can now successully parse all correct files there. The patches for > it are already merged upstream at: > http://git.linuxtv.org/cgit.cgi/v4l-utils.git/ > > I also added there the Makefile from Jonathan that adds support > for converting from DVBv3 to DVBv5, and added myself some logic > there to convert back from DVBv5 into DVBv3 format. I've been away from my mail for a few days; many thanks for this work. I hope to upload a new version of dtv-scan-tables which incorporates these changes to Debian soon. Gregor has already uploaded the new version of v4l-utils [1]. Jon [1] https://packages.qa.debian.org/v/v4l-utils/news/20140909T180008Z.html pgpja7t5ZXGo5.pgp Description: PGP signature
Re: [PATCH 0/6] [dvb-apps] Various dvb-apps fixes and enhancements
Hi, On Sun, 4 May 2014 02:51:15 +0100, Jonathan McCrohan wrote: > The following patch set contains various fixes and enhancements found > during the packaging of the next version of Debian's dvb-apps package. > > A number of these patches have lived as Debian specific patches for a > long time, however, there is no reason not to upstream them for > everyone's benefit. Any thoughts on whether this patchset could be applied? Thanks, Jon pgp9WmiPpmC4h.pgp Description: PGP signature
Re: [PATCH 00/12] dvbv5 scan tables for Brazil
Hi Mauro, On Tue, 27 May 2014 13:50:20 -0300, Mauro Carvalho Chehab wrote: > This patch series add the DTV scan tables for Brazilian ISDB-T > and for the Brazilian Countys that have already digital TV. Thanks for the DVBv5 scan files. I had the attached draft patch sitting in my tree. I don't think it is ready to be committed yet, but probably worth sending now to discuss. How do we want to manage the migration from DVBv3 to DVBv5: 1) point in time migration from DVBv3 to DVBv5? 2) maintain both until DVBv5 is in widespread use? On a side note, I found a bug in dvb-format-convert; it cannot parse DVB-T2 DVBv3 scan files. Jon From fdcabb0802a4a40e257d54dbd5e5eba59b9820f7 Mon Sep 17 00:00:00 2001 From: Jonathan McCrohan Date: Fri, 30 May 2014 01:14:42 +0100 Subject: [PATCH] Add Makefile to convert DVBv3 files to DVBv5 Signed-off-by: Jonathan McCrohan --- Makefile | 25 + 1 file changed, 25 insertions(+) create mode 100644 Makefile diff --git a/Makefile b/Makefile new file mode 100644 index 000..fac40e7 --- /dev/null +++ b/Makefile @@ -0,0 +1,25 @@ +# Makefile for dtv-scan-tables (26 May 2014) +# Copyright 2014 Jonathan McCrohan + +# The vast majority of the DVB scan files contained in this repository +# are DVBv3 scan files. This format has been deprecated in favor of the +# DVBv5 scan format. +# +# Use this makefile to convert the existing DVBv3 scan files to DVBv5 +# scan files until such time as DVBv5 scan format is in widespread use. +# +# Requires dvb-format-convert from v4l-utils. + +MKDIR = mkdir -p +DVBFORMATCONVERT = dvb-format-convert + +DVBFORMATCONVERT_CHANNEL_DVBV5 = -ICHANNEL -ODVBV5 + +DVBV3DIRS = atsc dvb-c dvb-s dvb-t +DVBV3CHANNELFILES = $(foreach dir,$(DVBV3DIRS),$(wildcard $(dir)/*)) + +DVBV5OUTPUTDIR = dvbv5 + +makedvbv5: + @$(foreach var,$(DVBV3DIRS), $(MKDIR) $(DVBV5OUTPUTDIR)/$(var);) + @$(foreach var,$(DVBV3CHANNELFILES), $(DVBFORMATCONVERT) $(DVBFORMATCONVERT_CHANNEL_DVBV5) $(var) $(DVBV5OUTPUTDIR)/$(var);) -- 2.0.0.rc2 pgpFgPUWQ3RBO.pgp Description: PGP signature
[PATCH 5/6] [dvb-apps] alevt: fix FTBFS with libpng15
libpng15 no longer includes zlib.h; we must include it ourselves Bug-Debian: http://bugs.debian.org/742566 Signed-off-by: Jonathan McCrohan --- util/alevt/exp-gfx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/util/alevt/exp-gfx.c b/util/alevt/exp-gfx.c index e68167b..0f7ad0c 100644 --- a/util/alevt/exp-gfx.c +++ b/util/alevt/exp-gfx.c @@ -138,6 +138,7 @@ static int ppm_output(struct export *e, char *name, struct fmt_page *pg) #ifdef WITH_PNG #include +#include static int png_open(struct export *e); static int png_option(struct export *e, int opt, char *arg); static int png_output(struct export *e, char *name, struct fmt_page *pg); -- 1.9.2 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 6/6] [dvb-apps] dvb-apps: add man pages
Add man pages written by Uwe Bugla and Tobias Grimm. Add Makefile written by myself. Bug-Debian: http://bugs.debian.org/312570 Signed-off-by: Jonathan McCrohan --- Make.rules| 1 + Makefile | 1 + man/Makefile | 13 man/atsc_epg.1| 35 + man/av7110_loadkeys.1 | 26 man/azap.1| 35 + man/czap.1| 46 man/dib3000-watch.1 | 34 + man/dst_test.1| 41 + man/dvbdate.1 | 38 +++ man/dvbnet.1 | 38 +++ man/dvbscan.1 | 72 +++ man/dvbtraffic.1 | 26 man/femon.1 | 32 +++ man/gnutv.1 | 79 +++ man/gotox.1 | 33 man/lsdvb.1 | 9 ++ man/scan.1| 85 +++ man/szap.1| 57 ++ man/tzap.1| 56 + man/zap.1 | 44 ++ 21 files changed, 801 insertions(+) create mode 100644 man/Makefile create mode 100644 man/atsc_epg.1 create mode 100644 man/av7110_loadkeys.1 create mode 100644 man/azap.1 create mode 100644 man/czap.1 create mode 100644 man/dib3000-watch.1 create mode 100644 man/dst_test.1 create mode 100644 man/dvbdate.1 create mode 100644 man/dvbnet.1 create mode 100644 man/dvbscan.1 create mode 100644 man/dvbtraffic.1 create mode 100644 man/femon.1 create mode 100644 man/gnutv.1 create mode 100644 man/gotox.1 create mode 100644 man/lsdvb.1 create mode 100644 man/scan.1 create mode 100644 man/szap.1 create mode 100644 man/tzap.1 create mode 100644 man/zap.1 diff --git a/Make.rules b/Make.rules index 0726060..0b017af 100644 --- a/Make.rules +++ b/Make.rules @@ -33,6 +33,7 @@ bindir ?= $(prefix)/bin includedir ?= $(prefix)/include libdir ?= $(prefix)/lib sharedir ?= $(prefix)/share +mandir ?= $(prefix)/share/man/man1 ifneq ($(DESTDIR),) DESTDIR := $(DESTDIR)/ diff --git a/Makefile b/Makefile index 65a2273..21901ea 100644 --- a/Makefile +++ b/Makefile @@ -12,6 +12,7 @@ all clean install: $(MAKE) -C lib $@ $(MAKE) -C test $@ $(MAKE) -C util $@ + $(MAKE) -C man $@ update: @echo "Pulling changes & updating from master repository" diff --git a/man/Makefile b/man/Makefile new file mode 100644 index 000..e4c1e0d --- /dev/null +++ b/man/Makefile @@ -0,0 +1,13 @@ +manpages = *.1 +inst_man = $(manpages) + +.PHONY: install + +include ../Make.rules + +all: + +install:: + @echo installing manpages + @mkdir -p $(DESTDIR)$(mandir) + @install -m 644 $(inst_man) $(DESTDIR)$(mandir)/ diff --git a/man/atsc_epg.1 b/man/atsc_epg.1 new file mode 100644 index 000..1190d8c --- /dev/null +++ b/man/atsc_epg.1 @@ -0,0 +1,35 @@ +.TH atsc_epg 1 "February 14, 2010" +.SH NAME +atsc_epg \- an electronic program guide using ATSC devices. +.SH SYNOPSIS +.B atsc_epg +.RI [ options ] +.br +.SH DESCRIPTION +This manual page documents briefly the +.B atsc_epg +commands. +.PP +\fBatsc_epg\fP is an electronic program guide for ATSC devices. +.SH OPTIONS +.TP +.B \-a +adapter index to use, (default 0) +.TP +.B \-f +tuning frequency +.TP +.B \-h +print this help text +.TP +.B \-p +period in hours, (default 12) +.TP +.B \-m +modulation ATSC vsb_8|vsb_16 (default vsb_8) +.TP +.B \-t +enable ETT to receive program details, if available +.br +.PP +This manual page was written by Uwe Bugla . diff --git a/man/av7110_loadkeys.1 b/man/av7110_loadkeys.1 new file mode 100644 index 000..94dbfda --- /dev/null +++ b/man/av7110_loadkeys.1 @@ -0,0 +1,26 @@ +.TH av7110_loadkeys 1 "February 14, 2010" +.SH NAME +av7110_loadkeys \- a program to load keymaps. +.SH SYNOPSIS +.B av7110_loadkeys +.RI [ options ] keymap_filename.(rc5|rcmm +.br +.SH DESCRIPTION +This manual page documents briefly the +.B av7110_loadkeys +commands. +.PP +\fBav7110_loadkeys\fP is a program to load keymaps. +.SH OPTIONS +.TP +.B \-i +invert +.TP +.B \-a +address +.TP +.B \-h +print this help text +.br +.PP +This manual page was written by Uwe Bugla . diff --git a/man/azap.1 b/man/azap.1 new file mode 100644 index 000..ee85a12 --- /dev/null +++ b/man/azap.1 @@ -0,0 +1,35 @@ +.TH azap 1 "February 14, 2010" +.SH NAME +azap \- a program to process channels.conf files. +.SH SYNOPSIS +.B azap +.RI [ options ] +.br +.SH DESCRIPTION +This manual page documents briefly the +.B azap +commands. +.PP +\fBazap\fP is a program to process a channels.conf file. +.SH OPTIONS +.TP +.B \-a adapter_num +use given adapter (default 0) +.TP +.B \-f frontend_id +use given frontend (default 0) +.TP +.B \-d demux_id +use given de
[PATCH 4/6] [dvb-apps] dvb-apps: pass LDFLAGS to alevt and lib binaries
Based on patch by Tobias Grimm in Debian's dvb-apps 1.1.1+rev1500-1 package. Description: Use LDFLAGS passed in from dpkg-buildflags The alevt and lib binaries are not linked with the hardening options provided by dpkg-buildflags because LDFLAGS isn't used there. This patch simple adds the LDFLAGS to the Makefiles. Author: Tobias Grimm Date: Thu, 19 Sep 2013 23:04:58 +0200 Signed-off-by: Jonathan McCrohan --- Make.rules | 4 ++-- util/alevt/Makefile | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Make.rules b/Make.rules index 3410d7b..0726060 100644 --- a/Make.rules +++ b/Make.rules @@ -46,7 +46,7 @@ ifeq ($(V),1) %: %.c $(CC) $(CPPFLAGS) $(CFLAGS) -MMD $(LDFLAGS) -o $@ $< $(filter-out %.h %.c,$^) $(LOADLIBES) $(LDLIBS) %.so: - $(CC) -shared -o $@ $^ + $(CC) -shared $(LDFLAGS) -o $@ $^ %.a: $(AR) rcs $@ $^ clean:: @@ -76,7 +76,7 @@ else @$(CC) $(CPPFLAGS) $(CFLAGS) -MMD $(LDFLAGS) -o $@ $< $(filter-out %.h %.c,$^) $(LOADLIBES) $(LDLIBS) %.so: @echo CC $@ - @$(CC) -shared -o $@ $^ + @$(CC) -shared $(LDFLAGS) -o $@ $^ %.a: @echo AR $@ @$(AR) rcs $@ $^ diff --git a/util/alevt/Makefile b/util/alevt/Makefile index 2f7c8da..ac1996f 100644 --- a/util/alevt/Makefile +++ b/util/alevt/Makefile @@ -25,13 +25,13 @@ endif all: alevt alevt-date alevt-cap alevt.1 alevt-date.1 alevt-cap.1 alevt: $(OBJS) - $(CC) $(OPT) $(OBJS) -o alevt -L$(PREFIX)/lib -L$(PREFIX)/lib64 -lX11 $(EXPLIBS) + $(CC) $(OPT) $(OBJS) $(LDFLAGS) -o alevt -L$(PREFIX)/lib -L$(PREFIX)/lib64 -lX11 $(EXPLIBS) alevt-date: $(TOBJS) - $(CC) $(OPT) $(TOBJS) -o alevt-date $(ZVBILIB) + $(CC) $(OPT) $(TOBJS) $(LDFLAGS) -o alevt-date $(ZVBILIB) alevt-cap: $(COBJS) - $(CC) $(OPT) $(COBJS) -o alevt-cap $(EXPLIBS) + $(CC) $(OPT) $(COBJS) $(LDFLAGS) -o alevt-cap $(EXPLIBS) font.o: font1.xbm font2.xbm font3.xbm font4.xbm fontsize.h: font1.xbm font2.xbm font3.xbm font4.xbm -- 1.9.2 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 1/6] [dvb-apps] dvb-apps: fix typos throughout the dvb-apps tree
As found by Debian's Lintian tool. Signed-off-by: Jonathan McCrohan --- lib/libdvben50221/en50221_transport.c | 4 ++-- lib/libdvbsec/dvbsec_cfg.h| 2 +- util/alevt/exp-gfx.c | 2 +- util/dib3000-watch/dib3000-watch.c| 2 +- util/dvbscan/dvbscan.c| 2 +- util/scan/scan.c | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/libdvben50221/en50221_transport.c b/lib/libdvben50221/en50221_transport.c index f6f46db..e5babeb 100644 --- a/lib/libdvben50221/en50221_transport.c +++ b/lib/libdvben50221/en50221_transport.c @@ -929,7 +929,7 @@ static int en50221_tl_process_data(struct en50221_transport_layer *tl, break; default: print(LOG_LEVEL, ERROR, 1, - "Recieved unexpected TPDU tag %02x from module on slot %02x\n", + "Received unexpected TPDU tag %02x from module on slot %02x\n", tpdu_tag, slot_id); tl->error_slot = slot_id; tl->error = EN50221ERR_BADCAMDATA; @@ -1226,7 +1226,7 @@ static int en50221_tl_handle_sb(struct en50221_transport_layer *tl, // did we get enough data in the T_SB? if (data_length != 1) { print(LOG_LEVEL, ERROR, 1, - "Recieved T_SB with invalid length from module on slot %02x\n", + "Received T_SB with invalid length from module on slot %02x\n", slot_id); tl->error_slot = slot_id; tl->error = EN50221ERR_BADCAMDATA; diff --git a/lib/libdvbsec/dvbsec_cfg.h b/lib/libdvbsec/dvbsec_cfg.h index d4546de..81439bb 100644 --- a/lib/libdvbsec/dvbsec_cfg.h +++ b/lib/libdvbsec/dvbsec_cfg.h @@ -81,7 +81,7 @@ * * The cmd-- describes the SEC cmd string to use in advanced mode for each of the possible combinations of * frequency band and polarisation. If a certain combination is not required, it may be omitted. It consists of a - * space seperated combination of commands - those available are as follows: + * space separated combination of commands - those available are as follows: * * tone(<0|1>) - control the 22kHz tone 0:off, 1:on * voltage(<0|13|18>) - control the LNB voltage 0v, 13v, or 18v diff --git a/util/alevt/exp-gfx.c b/util/alevt/exp-gfx.c index 82ab218..e68167b 100644 --- a/util/alevt/exp-gfx.c +++ b/util/alevt/exp-gfx.c @@ -123,7 +123,7 @@ static int ppm_output(struct export *e, char *name, struct fmt_page *pg) { if (!fwrite(rgb1[(int) *(colour_matrix+n)], 3, 1, fp)) { - export_error("error while writting to file"); + export_error("error while writing to file"); free(colour_matrix); fclose(fp); return -1; diff --git a/util/dib3000-watch/dib3000-watch.c b/util/dib3000-watch/dib3000-watch.c index 16bccb7..300e000 100644 --- a/util/dib3000-watch/dib3000-watch.c +++ b/util/dib3000-watch/dib3000-watch.c @@ -285,7 +285,7 @@ int main (int argc, char * const argv[]) break; default: interrupted=1; - err("no monitoring writting for this demod, yet.\n"); + err("no monitoring writing for this demod, yet.\n"); } usleep((int) (intervall * 100)); } diff --git a/util/dvbscan/dvbscan.c b/util/dvbscan/dvbscan.c index 87751c4..f23411f 100644 --- a/util/dvbscan/dvbscan.c +++ b/util/dvbscan/dvbscan.c @@ -77,7 +77,7 @@ static void usage(void) " -inversion Specify inversion (default: auto) (note: this option is ignored).\n" " -uk-ordering Use UK DVB-T channel ordering if present (note: this option is ignored).\n" " -timeoutSpecify filter timeout to use (standard specced values will be used by default)\n" - " -filter Specify service filter, a comma seperated list of the following tokens:\n" + " -filter Specify service filter, a comma separated list of the following tokens:\n" "(If no filter is supplied, all services will be output)\n" "* tv - Output TV channels\n" "* radio - Output radio channels\n" diff --git a/util/scan/scan.c b/util/scan/scan.c index 71a20db..803efdf 100644 --- a/util/scan/scan.c +++ b/util/scan/scan.c @@ -1560,7 +1560,7 @@ static int parse_section (struct section_buf *s) buf += 8; /* past generic table header */ section_length -= 5 + 4;
[PATCH 3/6] [dvb-apps] dvb-apps: make zap flush stdout after status line
Bug-Debian: http://bugs.debian.org/357126 Signed-off-by: Jonathan McCrohan --- util/szap/czap.c | 3 ++- util/szap/szap.c | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/util/szap/czap.c b/util/szap/czap.c index f49c524..062545f 100644 --- a/util/szap/czap.c +++ b/util/szap/czap.c @@ -227,9 +227,10 @@ int monitor_frontend (int fe_fd, int human_readable) if (status & FE_HAS_LOCK) printf("FE_HAS_LOCK"); - usleep(100); printf("\n"); + fflush(stdout); + usleep(100); if (exit_after_tuning && (status & FE_HAS_LOCK)) break; diff --git a/util/szap/szap.c b/util/szap/szap.c index 90bdbfb..12f393c 100644 --- a/util/szap/szap.c +++ b/util/szap/szap.c @@ -204,6 +204,7 @@ static int monitor_frontend (int fe_fd, int dvr, int human_readable) if (exit_after_tuning && ((status & FE_HAS_LOCK) || (++timeout >= 10))) break; + fflush(stdout); usleep(100); } while (1); -- 1.9.2 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 2/6] [dvb-apps] dvbscan: fix infinite loop parsing arguments
Reproducible using 'dvbscan -out raw - some_file' Bug-Debian: http://bugs.debian.org/606728 Signed-off-by: Jonathan McCrohan --- util/dvbscan/dvbscan.c | 1 + 1 file changed, 1 insertion(+) diff --git a/util/dvbscan/dvbscan.c b/util/dvbscan/dvbscan.c index f23411f..462c275 100644 --- a/util/dvbscan/dvbscan.c +++ b/util/dvbscan/dvbscan.c @@ -198,6 +198,7 @@ int main(int argc, char *argv[]) } else if (!strcmp(argv[argpos], "-out")) { if ((argc - argpos) < 3) usage(); + argpos+=3; } else { if ((argc - argpos) != 1) usage(); -- 1.9.2 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 0/6] [dvb-apps] Various dvb-apps fixes and enhancements
Hi, The following patch set contains various fixes and enhancements found during the packaging of the next version of Debian's dvb-apps package. A number of these patches have lived as Debian specific patches for a long time, however, there is no reason not to upstream them for everyone's benefit. Jon Jonathan McCrohan (6): dvb-apps: fix typos throughout the dvb-apps tree dvbscan: fix infinite loop parsing arguments dvb-apps: make zap flush stdout after status line dvb-apps: pass LDFLAGS to alevt and lib binaries alevt: fix FTBFS with libpng15 dvb-apps: add man pages Make.rules| 5 ++- Makefile | 1 + lib/libdvben50221/en50221_transport.c | 4 +- lib/libdvbsec/dvbsec_cfg.h| 2 +- man/Makefile | 13 ++ man/atsc_epg.1| 35 +++ man/av7110_loadkeys.1 | 26 +++ man/azap.1| 35 +++ man/czap.1| 46 +++ man/dib3000-watch.1 | 34 ++ man/dst_test.1| 41 + man/dvbdate.1 | 38 man/dvbnet.1 | 38 man/dvbscan.1 | 72 + man/dvbtraffic.1 | 26 +++ man/femon.1 | 32 + man/gnutv.1 | 79 man/gotox.1 | 33 ++ man/lsdvb.1 | 9 man/scan.1| 85 +++ man/szap.1| 57 +++ man/tzap.1| 56 +++ man/zap.1 | 44 ++ util/alevt/Makefile | 6 +-- util/alevt/exp-gfx.c | 3 +- util/dib3000-watch/dib3000-watch.c| 2 +- util/dvbscan/dvbscan.c| 3 +- util/scan/scan.c | 2 +- util/szap/czap.c | 3 +- util/szap/szap.c | 1 + 30 files changed, 818 insertions(+), 13 deletions(-) create mode 100644 man/Makefile create mode 100644 man/atsc_epg.1 create mode 100644 man/av7110_loadkeys.1 create mode 100644 man/azap.1 create mode 100644 man/czap.1 create mode 100644 man/dib3000-watch.1 create mode 100644 man/dst_test.1 create mode 100644 man/dvbdate.1 create mode 100644 man/dvbnet.1 create mode 100644 man/dvbscan.1 create mode 100644 man/dvbtraffic.1 create mode 100644 man/femon.1 create mode 100644 man/gnutv.1 create mode 100644 man/gotox.1 create mode 100644 man/lsdvb.1 create mode 100644 man/scan.1 create mode 100644 man/szap.1 create mode 100644 man/tzap.1 create mode 100644 man/zap.1 -- 1.9.2 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Fwd: Bug#746404: dtv-scan-tables: /usr/share/dvb/dvb-t/fr-all file : invalid enum and no DVB-T services found
Hi Oliver, Please find Debian bug report from fredboboss regarding dtv-scan-tables below. Thanks, Jon On Tue, 29 Apr 2014 19:50:57 +0200, fredboboss wrote: > Package: dtv-scan-tables > Version: 0+git20140326.cfc2975-1 > Severity: normal > > Dear Maintainer, > > Dear Debian Maintainer, > > when performing a DVB-T frequency scan with the /usr/bin/scan utility > (dvb-apps package) and the /usr/share/dvb/dvb-t/fr-All frequency file > (dtv-scan-tables packages) the following 2 problems occur : > > 1) file parsing error : > ERROR: invalid enum value '8MHZ' > ERROR: invalid enum value '8K' > > 2) in the end no DVB-T services are found with a Hauppauge NOVA-TD-500 DVB-T > card. > > Those problems seem to come from the /usr/share/dvb/dvb-t/fr-All file. > > The following changes are proposed in this file : > > For 1) : > - 8MHZ changed by 8MHz > - 8K changed by 8k > > For 2) : > - change FEC_HI parameter by AUTO > > Thus the 1st frequency line of the file would be changed like that : > -T 47400 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 21 > +T 47400 8MHz AUTO NONE QAM64 8k 1/32 NONE #Channel UHF 21 > > (Please refer to the end of the mail for the complete modified file). > > Thanks to those modifications I successfully performed a DVB-T scan with the > NOVA TD-500 card. > > In case more information is needed don't hesitate to contact me. > > Best regards, > Fred > > -- System Information: > Debian Release: jessie/sid > APT prefers testing-updates > APT policy: (500, 'testing-updates'), (500, 'testing') > Architecture: amd64 (x86_64) > > Kernel: Linux 3.13-1-amd64 (SMP w/4 CPU cores) > Locale: LANG=C, LC_CTYPE=en_US.utf8 (charmap=UTF-8) > Shell: /bin/sh linked to /bin/dash > > -- no debconf information > > Modified file : > # France ALL (All channel 21 to 60) > # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy > T 47400 8MHz AUTO NONE QAM64 8k 1/32 NONE #Channel UHF 21 > T 48200 8MHz AUTO NONE QAM64 8k 1/32 NONE #Channel UHF 22 > T 49000 8MHz AUTO NONE QAM64 8k 1/32 NONE #Channel UHF 23 > T 49800 8MHz AUTO NONE QAM64 8k 1/32 NONE #Channel UHF 24 > T 50600 8MHz AUTO NONE QAM64 8k 1/32 NONE #Channel UHF 25 > T 51400 8MHz AUTO NONE QAM64 8k 1/32 NONE #Channel UHF 26 > T 52200 8MHz AUTO NONE QAM64 8k 1/32 NONE #Channel UHF 27 > T 53000 8MHz AUTO NONE QAM64 8k 1/32 NONE #Channel UHF 28 > T 53800 8MHz AUTO NONE QAM64 8k 1/32 NONE #Channel UHF 29 > T 54600 8MHz AUTO NONE QAM64 8k 1/32 NONE #Channel UHF 30 > T 55400 8MHz AUTO NONE QAM64 8k 1/32 NONE #Channel UHF 31 > T 56200 8MHz AUTO NONE QAM64 8k 1/32 NONE #Channel UHF 32 > T 57000 8MHz AUTO NONE QAM64 8k 1/32 NONE #Channel UHF 33 > T 57800 8MHz AUTO NONE QAM64 8k 1/32 NONE #Channel UHF 34 > T 58600 8MHz AUTO NONE QAM64 8k 1/32 NONE #Channel UHF 35 > T 59400 8MHz AUTO NONE QAM64 8k 1/32 NONE #Channel UHF 36 > T 60200 8MHz AUTO NONE QAM64 8k 1/32 NONE #Channel UHF 37 > T 61000 8MHz AUTO NONE QAM64 8k 1/32 NONE #Channel UHF 38 > T 61800 8MHz AUTO NONE QAM64 8k 1/32 NONE #Channel UHF 39 > T 62600 8MHz AUTO NONE QAM64 8k 1/32 NONE #Channel UHF 40 > T 63400 8MHz AUTO NONE QAM64 8k 1/32 NONE #Channel UHF 41 > T 64200 8MHz AUTO NONE QAM64 8k 1/32 NONE #Channel UHF 42 > T 65000 8MHz AUTO NONE QAM64 8k 1/32 NONE #Channel UHF 43 > T 65800 8MHz AUTO NONE QAM64 8k 1/32 NONE #Channel UHF 44 > T 66600 8MHz AUTO NONE QAM64 8k 1/32 NONE #Channel UHF 45 > T 67400 8MHz AUTO NONE QAM64 8k 1/32 NONE #Channel UHF 46 > T 68200 8MHz AUTO NONE QAM64 8k 1/32 NONE #Channel UHF 47 > T 69000 8MHz AUTO NONE QAM64 8k 1/32 NONE #Channel UHF 48 > T 69800 8MHz AUTO NONE QAM64 8k 1/32 NONE #Channel UHF 49 > T 70600 8MHz AUTO NONE QAM64 8k 1/32 NONE #Channel UHF 50 > T 71400 8MHz AUTO NONE QAM64 8k 1/32 NONE #Channel UHF 51 > T 72200 8MHz AUTO NONE QAM64 8k 1/32 NONE #Channel UHF 52 > T 73000 8MHz AUTO NONE QAM64 8k 1/32 NONE #Channel UHF 53 > T 73800 8MHz AUTO NONE QAM64 8k 1/32 NONE #Channel UHF 54 > T 74600 8MHz AUTO NONE QAM64 8k 1/32 NONE #Channel UHF 55 > T 75400 8MHz AUTO NONE QAM64 8k 1/32 NONE #Channel UHF 56 > T 76200 8MHz AUTO NONE QAM64 8k 1/32 NONE #Channel UHF 57 > T 77000 8MHz AUTO NONE QAM64 8k 1/32 NONE #Channel UHF 58 > T 77800 8MHz AUTO NONE QAM64 8k 1/32 NONE #Channel UHF 59 > T 78600 8MHz AUTO NONE QAM64 8k 1/32 NONE #Channel UHF 60 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: dvb-apps build failure
Hi Oliver, On Thu, 06 Feb 2014 09:25:14 +0100, Quentin Glidic wrote: > Hello, > > When building dvb-apps from the Mercurial repository, you hit the > following error: > install: cannot stat 'atsc/*': No such file or directory > > In the latest changeset > (http://linuxtv.org/hg/dvb-apps/rev/d40083fff895) scan files were > deleted from the repository but not their install rule. > > Could someone please remove the bottom part of util/scan/Makefile (from > line 31, > http://linuxtv.org/hg/dvb-apps/file/d40083fff895/util/scan/Makefile#l31) > to fix this issue? Ping on Quentin's behalf. I'd like to upload a new version of dvb-apps to Debian, but the build is currently broken after your recent patch. Would you be able to take a look? Thanks, Jon pgpL2AIeH5kLF.pgp Description: PGP signature
[PATCH] [TRIVIAL] [media] media_tree: Fix spelling errors
Fix various spelling errors in strings and comments throughout the media tree. The majority of these were found using Lucas De Marchi's codespell tool. Signed-off-by: Jonathan McCrohan --- drivers/media/common/siano/smscoreapi.h | 4 ++-- drivers/media/common/siano/smsdvb.h | 2 +- drivers/media/dvb-core/dvb_demux.c | 2 +- drivers/media/dvb-frontends/dib8000.c| 4 ++-- drivers/media/dvb-frontends/drxk_hard.c | 18 +- drivers/media/i2c/Kconfig| 2 +- drivers/media/i2c/adv7183.c | 2 +- drivers/media/i2c/adv7183_regs.h | 6 +++--- drivers/media/i2c/adv7604.c | 2 +- drivers/media/i2c/adv7842.c | 2 +- drivers/media/i2c/ir-kbd-i2c.c | 2 +- drivers/media/i2c/m5mols/m5mols_controls.c | 2 +- drivers/media/i2c/s5c73m3/s5c73m3-core.c | 4 ++-- drivers/media/i2c/s5c73m3/s5c73m3.h | 2 +- drivers/media/i2c/saa7115.c | 2 +- drivers/media/i2c/soc_camera/ov5642.c| 2 +- drivers/media/pci/cx18/cx18-driver.h | 2 +- drivers/media/pci/cx23885/cx23885-417.c | 2 +- drivers/media/pci/pluto2/pluto2.c| 2 +- drivers/media/platform/coda.c| 2 +- drivers/media/platform/exynos4-is/fimc-core.c| 2 +- drivers/media/platform/exynos4-is/media-dev.c| 2 +- drivers/media/platform/omap3isp/isp.c| 2 +- drivers/media/platform/s5p-mfc/regs-mfc.h| 2 +- drivers/media/platform/s5p-mfc/s5p_mfc.c | 12 ++-- drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c| 2 +- drivers/media/platform/s5p-tv/mixer.h| 2 +- drivers/media/platform/s5p-tv/mixer_video.c | 4 ++-- drivers/media/platform/soc_camera/omap1_camera.c | 2 +- drivers/media/platform/vivi.c| 4 ++-- drivers/media/platform/vsp1/vsp1_drv.c | 2 +- drivers/media/radio/radio-si476x.c | 4 ++-- drivers/media/rc/imon.c | 2 +- drivers/media/rc/redrat3.c | 2 +- drivers/media/tuners/mt2063.c| 4 ++-- drivers/media/tuners/tuner-xc2028-types.h| 2 +- drivers/media/usb/dvb-usb-v2/mxl111sf.c | 4 ++-- drivers/media/usb/gspca/gl860/gl860.c| 2 +- drivers/media/usb/gspca/pac207.c | 2 +- drivers/media/usb/gspca/pac7302.c| 2 +- drivers/media/usb/gspca/stv0680.c| 2 +- drivers/media/usb/gspca/zc3xx.c | 2 +- drivers/media/usb/pwc/pwc-if.c | 2 +- drivers/media/usb/uvc/uvc_video.c| 2 +- drivers/media/v4l2-core/v4l2-ctrls.c | 2 +- 45 files changed, 68 insertions(+), 68 deletions(-) diff --git a/drivers/media/common/siano/smscoreapi.h b/drivers/media/common/siano/smscoreapi.h index d0799e3..9c9063c 100644 --- a/drivers/media/common/siano/smscoreapi.h +++ b/drivers/media/common/siano/smscoreapi.h @@ -955,7 +955,7 @@ struct sms_rx_stats { u32 modem_state;/* from SMSHOSTLIB_DVB_MODEM_STATE_ET */ s32 SNR;/* dB */ u32 ber;/* Post Viterbi ber [1E-5] */ - u32 ber_error_count;/* Number of erronous SYNC bits. */ + u32 ber_error_count;/* Number of erroneous SYNC bits. */ u32 ber_bit_count; /* Total number of SYNC bits. */ u32 ts_per; /* Transport stream PER, 0x indicate N/A */ @@ -981,7 +981,7 @@ struct sms_rx_stats_ex { u32 modem_state;/* from SMSHOSTLIB_DVB_MODEM_STATE_ET */ s32 SNR;/* dB */ u32 ber;/* Post Viterbi ber [1E-5] */ - u32 ber_error_count;/* Number of erronous SYNC bits. */ + u32 ber_error_count;/* Number of erroneous SYNC bits. */ u32 ber_bit_count; /* Total number of SYNC bits. */ u32 ts_per; /* Transport stream PER, 0x indicate N/A */ diff --git a/drivers/media/common/siano/smsdvb.h b/drivers/media/common/siano/smsdvb.h index 92c413b..ae36d0a 100644 --- a/drivers/media/common/siano/smsdvb.h +++ b/drivers/media/common/siano/smsdvb.h @@ -95,7 +95,7 @@ struct RECEPTION_STATISTICS_PER_SLICES_S { u32 is_demod_locked;/* 0 - not locked, 1 - locked */ u32 ber_bit_count; /* Total number of SYNC bits. */ - u32 ber_error_count;/* Number of erronous SYNC bits. */ + u32 ber_error_count;/* Number of erroneous SYNC bits. */ s32 MRC_SNR;/* dB */ s32 mrc_in_band_pwr;/* In band power in dBM */ diff --git a/drivers/media/dvb-core/dvb_demux.c b/drivers/media/dvb-core/dvb_demux.c index 58de441..53ee319 100644 --- a/drivers/media/dvb-core/dvb_demux.c +++ b/drivers/media/dvb-core/dvb_de
Re: [RFC] Initial scan files troubles and brainstorming
On Thu, 10 Jan 2013 21:55:28 +0100, Oliver Schinagl wrote: > Actually, there's plenty of apps etc that depend on it. I know some > distro's install it into /usr/share/dvb for all to use. I think actually > only a very small handfull use their own scanfiles. Very small handfull > I belive ;) Indeed. I have just gone to file an Intent To Package bug for the dtv-scan-tables package in Debian, but I noticed that the COPYING and README files were not split out from the dvb-apps tree. Logically it would follow that dtv-scan-tables is also licenced under LGPL, the same as dvb-apps, but this needs to be stated explicitly. This is especially true for distributions which be redistributing dtv-scan-tables. Thanks, Jon signature.asc Description: Digital signature
[PATCH 0/2] update scan files for Ireland (ie-*)
Hi Oliver, Attached are two patches I've been trying to get applied to the tree for some time. Thanks, Jon Jonathan McCrohan (2): update scan files for Ireland (ie-*) update scan files for Ireland (ie-*) dvb-t/ie-CairnHill |6 +++--- dvb-t/ie-ClermontCarn |6 +++--- dvb-t/ie-Dungarvan |6 +++--- dvb-t/ie-HolywellHill |4 ++-- dvb-t/ie-Kippure |6 +++--- dvb-t/ie-Maghera |6 +++--- dvb-t/ie-MountLeinster |6 +++--- dvb-t/ie-Mullaghanish |6 +++--- dvb-t/ie-SpurHill |6 +++--- dvb-t/ie-ThreeRock |6 +++--- dvb-t/ie-Truskmore |6 +++--- dvb-t/ie-WoodcockHill |6 +++--- 12 files changed, 35 insertions(+), 35 deletions(-) -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 1/2] update scan files for Ireland (ie-*)
ASO frequency changes; effective 24th Oct 2012. Signed-off-by: Jonathan McCrohan --- dvb-t/ie-CairnHill |2 +- dvb-t/ie-ClermontCarn |6 +++--- dvb-t/ie-Dungarvan |2 +- dvb-t/ie-HolywellHill |4 ++-- dvb-t/ie-Kippure |2 +- dvb-t/ie-Maghera |2 +- dvb-t/ie-MountLeinster |6 +++--- dvb-t/ie-Mullaghanish |2 +- dvb-t/ie-SpurHill |2 +- dvb-t/ie-ThreeRock |6 +++--- dvb-t/ie-Truskmore |2 +- dvb-t/ie-WoodcockHill |2 +- 12 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dvb-t/ie-CairnHill b/dvb-t/ie-CairnHill index 002881a..5063ce9 100644 --- a/dvb-t/ie-CairnHill +++ b/dvb-t/ie-CairnHill @@ -1,5 +1,5 @@ # Ireland, Cairn Hill -# Generated from http://www.comreg.ie/_fileupload/File/Technical%20Parameters_20111004.xlsx +# Generated from http://www.comreg.ie/_fileupload/Broadcast_Technical_Parameters.xlsx # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy T 68200 8MHz 3/4 NONE QAM16 2k 1/32 NONE # CH47: Saorview MUX1 T 65800 8MHz 3/4 NONE QAM16 2k 1/32 NONE # CH44: Saorview MUX2 diff --git a/dvb-t/ie-ClermontCarn b/dvb-t/ie-ClermontCarn index 680ffce..df9d06b 100644 --- a/dvb-t/ie-ClermontCarn +++ b/dvb-t/ie-ClermontCarn @@ -1,5 +1,5 @@ # Ireland, Clermont Carn -# Generated from http://www.comreg.ie/_fileupload/File/Technical%20Parameters_20111004.xlsx +# Generated from http://www.comreg.ie/_fileupload/Broadcast_Technical_Parameters.xlsx # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy -T 73000 8MHz 3/4 NONE QAM16 2k 1/32 NONE # CH53: Saorview MUX1 -T 76200 8MHz 3/4 NONE QAM16 2k 1/32 NONE # CH57: Saorview MUX2 +T 72200 8MHz 3/4 NONE QAM16 2k 1/32 NONE # CH52: Saorview MUX1 +T 75400 8MHz 3/4 NONE QAM16 2k 1/32 NONE # CH56: Saorview MUX2 diff --git a/dvb-t/ie-Dungarvan b/dvb-t/ie-Dungarvan index 7f5d6a3..5bdf714 100644 --- a/dvb-t/ie-Dungarvan +++ b/dvb-t/ie-Dungarvan @@ -1,5 +1,5 @@ # Ireland, Dungarvan -# Generated from http://www.comreg.ie/_fileupload/File/Technical%20Parameters_20111004.xlsx +# Generated from http://www.comreg.ie/_fileupload/Broadcast_Technical_Parameters.xlsx # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy T 74600 8MHz 3/4 NONE QAM16 2k 1/32 NONE # CH55: Saorview MUX1 T 77800 8MHz 3/4 NONE QAM16 2k 1/32 NONE # CH59: Saorview MUX2 diff --git a/dvb-t/ie-HolywellHill b/dvb-t/ie-HolywellHill index 4557ec1..a3f55be 100644 --- a/dvb-t/ie-HolywellHill +++ b/dvb-t/ie-HolywellHill @@ -1,5 +1,5 @@ # Ireland, Holywell Hill -# Generated from http://www.comreg.ie/_fileupload/File/Technical%20Parameters_20111004.xlsx +# Generated from http://www.comreg.ie/_fileupload/Broadcast_Technical_Parameters.xlsx # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy T 54600 8MHz 3/4 NONE QAM16 2k 1/32 NONE # CH30: Saorview MUX1 -T 50600 8MHz 3/4 NONE QAM16 2k 1/32 NONE # CH25: Saorview MUX2 +T 57000 8MHz 3/4 NONE QAM16 2k 1/32 NONE # CH33: Saorview MUX2 diff --git a/dvb-t/ie-Kippure b/dvb-t/ie-Kippure index 723f7be..aeb5d8d 100644 --- a/dvb-t/ie-Kippure +++ b/dvb-t/ie-Kippure @@ -1,5 +1,5 @@ # Ireland, Kippure -# Generated from http://www.comreg.ie/_fileupload/File/Technical%20Parameters_20111004.xlsx +# Generated from http://www.comreg.ie/_fileupload/Broadcast_Technical_Parameters.xlsx # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy T 73800 8MHz 3/4 NONE QAM16 2k 1/32 NONE # CH54: Saorview MUX1 T 77000 8MHz 3/4 NONE QAM16 2k 1/32 NONE # CH58: Saorview MUX2 diff --git a/dvb-t/ie-Maghera b/dvb-t/ie-Maghera index 8144c38..a1da82a 100644 --- a/dvb-t/ie-Maghera +++ b/dvb-t/ie-Maghera @@ -1,5 +1,5 @@ # Ireland, Maghera -# Generated from http://www.comreg.ie/_fileupload/File/Technical%20Parameters_20111004.xlsx +# Generated from http://www.comreg.ie/_fileupload/Broadcast_Technical_Parameters.xlsx # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy T 69000 8MHz 3/4 NONE QAM16 2k 1/32 NONE # CH48: Saorview MUX1 T 74600 8MHz 3/4 NONE QAM16 2k 1/32 NONE # CH55: Saorview MUX2 diff --git a/dvb-t/ie-MountLeinster b/dvb-t/ie-MountLeinster index 780ac0a..e5515c2 100644 --- a/dvb-t/ie-MountLeinster +++ b/dvb-t/ie-MountLeinster @@ -1,5 +1,5 @@ # Ireland, Mount Leinster -# Generated from http://www.comreg.ie/_fileupload/File/Technical%20Parameters_20111004.xlsx +# Generated from http://www.comreg.ie/_fileupload/Broadcast_Technical_Parameters.xlsx # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy -T 66600 8MHz 3/4 NONE QAM16 2k 1/32 NONE # CH45: Saorview MUX1 -T 61800 8MHz 3/4 NONE QAM16 2k 1/32 NONE # CH39: Saorview MUX2 +T 49000 8MHz 3/4 NONE QAM16 2k 1/32 NONE # CH23: Saorview MUX1 +T 51400 8MHz 3/4 NONE QAM16 2k 1/32 NONE # CH26: Saorview MUX2 diff --git a/dvb-t/ie-Mullaghanish b/dvb-t/ie-Mullaghanish index aae3e97..73e6ffe 100644 --- a/dvb-t/ie-Mullaghanish
[PATCH 2/2] update scan files for Ireland (ie-*)
Fix erroneous transmission parameters Signed-off-by: Jonathan McCrohan --- dvb-t/ie-CairnHill|4 ++-- dvb-t/ie-Dungarvan|4 ++-- dvb-t/ie-Kippure |4 ++-- dvb-t/ie-Maghera |4 ++-- dvb-t/ie-Mullaghanish |4 ++-- dvb-t/ie-SpurHill |4 ++-- dvb-t/ie-Truskmore|4 ++-- dvb-t/ie-WoodcockHill |4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dvb-t/ie-CairnHill b/dvb-t/ie-CairnHill index 5063ce9..b36272f 100644 --- a/dvb-t/ie-CairnHill +++ b/dvb-t/ie-CairnHill @@ -1,5 +1,5 @@ # Ireland, Cairn Hill # Generated from http://www.comreg.ie/_fileupload/Broadcast_Technical_Parameters.xlsx # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy -T 68200 8MHz 3/4 NONE QAM16 2k 1/32 NONE # CH47: Saorview MUX1 -T 65800 8MHz 3/4 NONE QAM16 2k 1/32 NONE # CH44: Saorview MUX2 +T 68200 8MHz 3/4 NONE QAM64 8k 1/32 NONE # CH47: Saorview MUX1 +T 65800 8MHz 3/4 NONE QAM64 8k 1/32 NONE # CH44: Saorview MUX2 diff --git a/dvb-t/ie-Dungarvan b/dvb-t/ie-Dungarvan index 5bdf714..f415097 100644 --- a/dvb-t/ie-Dungarvan +++ b/dvb-t/ie-Dungarvan @@ -1,5 +1,5 @@ # Ireland, Dungarvan # Generated from http://www.comreg.ie/_fileupload/Broadcast_Technical_Parameters.xlsx # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy -T 74600 8MHz 3/4 NONE QAM16 2k 1/32 NONE # CH55: Saorview MUX1 -T 77800 8MHz 3/4 NONE QAM16 2k 1/32 NONE # CH59: Saorview MUX2 +T 74600 8MHz 3/4 NONE QAM64 8k 1/32 NONE # CH55: Saorview MUX1 +T 77800 8MHz 3/4 NONE QAM64 8k 1/32 NONE # CH59: Saorview MUX2 diff --git a/dvb-t/ie-Kippure b/dvb-t/ie-Kippure index aeb5d8d..56ad12a 100644 --- a/dvb-t/ie-Kippure +++ b/dvb-t/ie-Kippure @@ -1,5 +1,5 @@ # Ireland, Kippure # Generated from http://www.comreg.ie/_fileupload/Broadcast_Technical_Parameters.xlsx # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy -T 73800 8MHz 3/4 NONE QAM16 2k 1/32 NONE # CH54: Saorview MUX1 -T 77000 8MHz 3/4 NONE QAM16 2k 1/32 NONE # CH58: Saorview MUX2 +T 73800 8MHz 3/4 NONE QAM64 8k 1/32 NONE # CH54: Saorview MUX1 +T 77000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # CH58: Saorview MUX2 diff --git a/dvb-t/ie-Maghera b/dvb-t/ie-Maghera index a1da82a..11c08b7 100644 --- a/dvb-t/ie-Maghera +++ b/dvb-t/ie-Maghera @@ -1,5 +1,5 @@ # Ireland, Maghera # Generated from http://www.comreg.ie/_fileupload/Broadcast_Technical_Parameters.xlsx # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy -T 69000 8MHz 3/4 NONE QAM16 2k 1/32 NONE # CH48: Saorview MUX1 -T 74600 8MHz 3/4 NONE QAM16 2k 1/32 NONE # CH55: Saorview MUX2 +T 69000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # CH48: Saorview MUX1 +T 74600 8MHz 3/4 NONE QAM64 8k 1/32 NONE # CH55: Saorview MUX2 diff --git a/dvb-t/ie-Mullaghanish b/dvb-t/ie-Mullaghanish index 73e6ffe..35dc5dd 100644 --- a/dvb-t/ie-Mullaghanish +++ b/dvb-t/ie-Mullaghanish @@ -1,5 +1,5 @@ # Ireland, Mullaghanish # Generated from http://www.comreg.ie/_fileupload/Broadcast_Technical_Parameters.xlsx # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy -T 47400 8MHz 3/4 NONE QAM16 2k 1/32 NONE # CH21: Saorview MUX1 -T 49800 8MHz 3/4 NONE QAM16 2k 1/32 NONE # CH24: Saorview MUX2 +T 47400 8MHz 3/4 NONE QAM64 8k 1/32 NONE # CH21: Saorview MUX1 +T 49800 8MHz 3/4 NONE QAM64 8k 1/32 NONE # CH24: Saorview MUX2 diff --git a/dvb-t/ie-SpurHill b/dvb-t/ie-SpurHill index a211e93..7566d82 100644 --- a/dvb-t/ie-SpurHill +++ b/dvb-t/ie-SpurHill @@ -1,5 +1,5 @@ # Ireland, Spur Hill # Generated from http://www.comreg.ie/_fileupload/Broadcast_Technical_Parameters.xlsx # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy -T 66600 8MHz 3/4 NONE QAM16 2k 1/32 NONE # CH45: Saorview MUX1 -T 69800 8MHz 3/4 NONE QAM16 2k 1/32 NONE # CH49: Saorview MUX2 +T 66600 8MHz 3/4 NONE QAM64 8k 1/32 NONE # CH45: Saorview MUX1 +T 69800 8MHz 3/4 NONE QAM64 8k 1/32 NONE # CH49: Saorview MUX2 diff --git a/dvb-t/ie-Truskmore b/dvb-t/ie-Truskmore index db71c31..178bfe3 100644 --- a/dvb-t/ie-Truskmore +++ b/dvb-t/ie-Truskmore @@ -1,5 +1,5 @@ # Ireland, Truskmore # Generated from http://www.comreg.ie/_fileupload/Broadcast_Technical_Parameters.xlsx # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy -T 73000 8MHz 3/4 NONE QAM16 2k 1/32 NONE # CH53: Saorview MUX1 -T 76200 8MHz 3/4 NONE QAM16 2k 1/32 NONE # CH57: Saorview MUX2 +T 73000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # CH53: Saorview MUX1 +T 76200 8MHz 3/4 NONE QAM64 8k 1/32 NONE # CH57: Saorview MUX2 diff --git a/dvb-t/ie-WoodcockHill b/dvb-t/ie-WoodcockHill index 513dda5..08c1d5b 100644 --- a/dvb-t/ie-WoodcockHill +++ b/dvb-t/ie-WoodcockHill @@ -1,5 +1,5 @@ # Ireland, Woodcock Hill # Generated from http://www.comreg.ie/_fileupload/Broadcast_Technical_Parameters.xlsx # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy -T
Re: [RFC] Initial scan files troubles and brainstorming
Hi Christoph, On Mon, 7 Jan 2013 13:53:25 +0100, Christoph Pfister wrote: > I've been updating the scan data for the past few years, but found > barely no time in the last (many!) months. This won't change in > future, so I've decided to step down from the task; may others do what > is necessary ... Thanks for your work over the past few years. If nobody else is willing, I'd be happy to take over this role, and if Oliver's offer still stands, I'd be happy to share DVB scanfile maintenance with him. Jon signature.asc Description: Digital signature
dvb-apps: add scan files for Ireland (ie-*)
# HG changeset patch # User Jonathan McCrohan # Date 1328407970 0 # Node ID 068772e2c579c9e8c32c81d2e7b5b6978e6afe7f # Parent 69fc03702a6489ae46c50a3a5514df714d3832e8 add scan files for Ireland (ie-*) Signed-off-by: Jonathan McCrohan diff -r 69fc03702a64 -r 068772e2c579 util/scan/dvb-t/ie-CairnHill --- /dev/null Thu Jan 01 00:00:00 1970 + +++ b/util/scan/dvb-t/ie-CairnHill Sun Feb 05 02:12:50 2012 + @@ -0,0 +1,4 @@ +# Ireland, Cairn Hill +# Generated from http://www.rtenl.ie/wp-content/uploads/2011/12/SAORVIEW-Frequencies-Rev-1.0.pdf +# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy +T 68200 8MHz 3/4 NONE QAM16 2k 1/32 NONE # CH47: Saorview diff -r 69fc03702a64 -r 068772e2c579 util/scan/dvb-t/ie-ClermontCarn --- /dev/null Thu Jan 01 00:00:00 1970 + +++ b/util/scan/dvb-t/ie-ClermontCarn Sun Feb 05 02:12:50 2012 + @@ -0,0 +1,4 @@ +# Ireland, Clermont Carn +# Generated from http://www.rtenl.ie/wp-content/uploads/2011/12/SAORVIEW-Frequencies-Rev-1.0.pdf +# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy +T 73000 8MHz 3/4 NONE QAM16 2k 1/32 NONE # CH53: Saorview diff -r 69fc03702a64 -r 068772e2c579 util/scan/dvb-t/ie-Dungarvan --- /dev/null Thu Jan 01 00:00:00 1970 + +++ b/util/scan/dvb-t/ie-Dungarvan Sun Feb 05 02:12:50 2012 + @@ -0,0 +1,4 @@ +# Ireland, Dungarvan +# Generated from http://www.rtenl.ie/wp-content/uploads/2011/12/SAORVIEW-Frequencies-Rev-1.0.pdf +# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy +T 74600 8MHz 3/4 NONE QAM16 2k 1/32 NONE # CH55: Saorview diff -r 69fc03702a64 -r 068772e2c579 util/scan/dvb-t/ie-HolywellHill --- /dev/null Thu Jan 01 00:00:00 1970 + +++ b/util/scan/dvb-t/ie-HolywellHill Sun Feb 05 02:12:50 2012 + @@ -0,0 +1,4 @@ +# Ireland, Holywell Hill +# Generated from http://www.rtenl.ie/wp-content/uploads/2011/12/SAORVIEW-Frequencies-Rev-1.0.pdf +# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy +T 54600 8MHz 3/4 NONE QAM16 2k 1/32 NONE # CH30: Saorview diff -r 69fc03702a64 -r 068772e2c579 util/scan/dvb-t/ie-Kippure --- /dev/null Thu Jan 01 00:00:00 1970 + +++ b/util/scan/dvb-t/ie-KippureSun Feb 05 02:12:50 2012 + @@ -0,0 +1,4 @@ +# Ireland, Kippure +# Generated from http://www.rtenl.ie/wp-content/uploads/2011/12/SAORVIEW-Frequencies-Rev-1.0.pdf +# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy +T 73800 8MHz 3/4 NONE QAM16 2k 1/32 NONE # CH54: Saorview diff -r 69fc03702a64 -r 068772e2c579 util/scan/dvb-t/ie-Maghera --- /dev/null Thu Jan 01 00:00:00 1970 + +++ b/util/scan/dvb-t/ie-MagheraSun Feb 05 02:12:50 2012 + @@ -0,0 +1,4 @@ +# Ireland, Maghera +# Generated from http://www.rtenl.ie/wp-content/uploads/2011/12/SAORVIEW-Frequencies-Rev-1.0.pdf +# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy +T 69000 8MHz 3/4 NONE QAM16 2k 1/32 NONE # CH48: Saorview diff -r 69fc03702a64 -r 068772e2c579 util/scan/dvb-t/ie-MountLeinster --- /dev/null Thu Jan 01 00:00:00 1970 + +++ b/util/scan/dvb-t/ie-MountLeinster Sun Feb 05 02:12:50 2012 + @@ -0,0 +1,4 @@ +# Ireland, Mount Leinster +# Generated from http://www.rtenl.ie/wp-content/uploads/2011/12/SAORVIEW-Frequencies-Rev-1.0.pdf +# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy +T 66600 8MHz 3/4 NONE QAM16 2k 1/32 NONE # CH45: Saorview diff -r 69fc03702a64 -r 068772e2c579 util/scan/dvb-t/ie-Mullaghanish --- /dev/null Thu Jan 01 00:00:00 1970 + +++ b/util/scan/dvb-t/ie-Mullaghanish Sun Feb 05 02:12:50 2012 + @@ -0,0 +1,4 @@ +# Ireland, Mullaghanish +# Generated from http://www.rtenl.ie/wp-content/uploads/2011/12/SAORVIEW-Frequencies-Rev-1.0.pdf +# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy +T 47400 8MHz 3/4 NONE QAM16 2k 1/32 NONE # CH21: Saorview diff -r 69fc03702a64 -r 068772e2c579 util/scan/dvb-t/ie-SpurHill --- /dev/null Thu Jan 01 00:00:00 1970 + +++ b/util/scan/dvb-t/ie-SpurHill Sun Feb 05 02:12:50 2012 + @@ -0,0 +1,4 @@ +# Ireland, Spur Hill +# Generated from http://www.rtenl.ie/wp-content/uploads/2011/12/SAORVIEW-Frequencies-Rev-1.0.pdf +# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy +T 66600 8MHz 3/4 NONE QAM16 2k 1/32 NONE # CH45: Saorview diff -r 69fc03702a64 -r 068772e2c579 util/scan/dvb-t/ie-ThreeRock --- /dev/null Thu Jan 01 00:00:00 1970 + +++ b/util/scan/dvb-t/ie-ThreeRock Sun Feb 05 02:12:50 2012 + @@ -0,0 +1,4 @@ +# Ireland, Three Rock +# Generated from http://www.rtenl.ie/wp-content/uploads/2011/12/SAORVIEW-Frequencies-Rev-1.0.pdf +# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy +T 73800 8MHz 3/4 NONE QAM16 2k 1/32 NONE # CH54: Saorview diff -r 69fc03702a64 -r 068772e2c579 util/scan/dvb-t/ie-Truskmore --- /dev/null Thu Jan 01 00:00:00 1970 + +++ b/util/scan/dvb-t/ie-Truskmore