diff options
| author | Jonathan McCrohan <jmccrohan@gmail.com> | 2013-09-17 00:36:05 +0100 |
|---|---|---|
| committer | Jonathan McCrohan <jmccrohan@gmail.com> | 2013-09-17 00:36:05 +0100 |
| commit | 60584e13787af008063469fba29334090d56d8d4 (patch) | |
| tree | 0cc62ecfe2e6b91d5b758f8813b0374c098b0541 | |
| parent | 5501530a778ad588a8ccd3f1584ea58f74c0cec9 (diff) | |
| download | linux-dvb-apps-upstream.tar.gz | |
Imported Upstream version 1.1.1+rev1500upstream/1.1.1+rev1500upstream
56 files changed, 914 insertions, 356 deletions
diff --git a/.hg_archival.txt b/.hg_archival.txt index 718abe9..b6e1ea9 100644 --- a/.hg_archival.txt +++ b/.hg_archival.txt @@ -1,5 +1,5 @@ repo: d9fe7e17226f8e321aa80a015fc8d53f33b265d7 -node: 4030c51d6e7baef760e65d4ff2e8f61af91bec02 +node: 3ee111da5b3a36b9f696a421064e0563d365d5c2 branch: default latesttag: null -latesttagdistance: 1484 +latesttagdistance: 1501 diff --git a/lib/libucsi/dvb/mosaic_descriptor.h b/lib/libucsi/dvb/mosaic_descriptor.h index 6da1e95..ef2b7aa 100644 --- a/lib/libucsi/dvb/mosaic_descriptor.h +++ b/lib/libucsi/dvb/mosaic_descriptor.h @@ -129,7 +129,6 @@ static inline struct dvb_mosaic_descriptor* struct dvb_mosaic_info *e = (struct dvb_mosaic_info*) (buf+pos); struct dvb_mosaic_info_part2 *e2; - struct dvb_mosaic_linkage *linkage; if ((pos + sizeof(struct dvb_mosaic_info)) > len) return NULL; @@ -149,8 +148,6 @@ static inline struct dvb_mosaic_descriptor* if (pos > len) return NULL; - linkage = (struct dvb_mosaic_linkage*) (buf+pos); - switch(e2->cell_linkage_info) { case 0x01: if ((pos + sizeof(struct dvb_mosaic_linkage_01)) > len) diff --git a/test/libesg/testesg.c b/test/libesg/testesg.c index f2183ac..c9788ae 100644 --- a/test/libesg/testesg.c +++ b/test/libesg/testesg.c @@ -199,7 +199,7 @@ int main(int argc, char *argv[]) { struct esg_namespace_prefix *namespace_prefix = NULL; struct esg_xml_fragment_type *xml_fragment_type = NULL; struct esg_bim_encoding_parameters *bim_encoding_parameters = NULL; - struct esg_bim_decoder_init *bim_decoder_init = NULL; +// struct esg_bim_decoder_init *bim_decoder_init = NULL; struct esg_session_partition_declaration *partition = NULL; struct esg_session_field *field = NULL; struct esg_session_ip_stream *ip_stream = NULL; diff --git a/test/libucsi/testucsi.c b/test/libucsi/testucsi.c index e0a16c1..1e17104 100644 --- a/test/libucsi/testucsi.c +++ b/test/libucsi/testucsi.c @@ -2022,9 +2022,8 @@ void parse_dvb_descriptor(struct descriptor *d, int indent, int data_type) int network_id = dvb_linkage_data_08_network_id(dx, d08); int initial_service_id = dvb_linkage_data_08_initial_service_id(dx, d08); int length = 0; - uint8_t *data; - data = dvb_linkage_data_08_data(dx, d08, &length); + dvb_linkage_data_08_data(dx, d08, &length); iprintf(indent, "DSC hand_over_type:%i origin_type:%i\n", d08->hand_over_type, d08->origin_type); if (network_id != -1) { diff --git a/test/lock_s.c b/test/lock_s.c index 7bbab59..b3bcd70 100644 --- a/test/lock_s.c +++ b/test/lock_s.c @@ -451,7 +451,7 @@ int main(int argc, char *argv[]) { int opt; int ret, fd, adapter=0, frontend=0, pos; - int simple; +// int simple; struct lnb_types_st lnb; struct sec_params sec; @@ -486,7 +486,7 @@ int main(int argc, char *argv[]) } break; case 'H': - simple = 1; /* human readable */ +// simple = 1; /* human readable */ break; } } diff --git a/test/test_av_play.c b/test/test_av_play.c index b7ad867..2b342db 100644 --- a/test/test_av_play.c +++ b/test/test_av_play.c @@ -245,7 +245,7 @@ static void copy_to_dvb(int vfd, int afd, int cfd, const uint8_t* ptr, const uns { struct pollfd pfd[NFD]; unsigned short pos = 0; - int stopped = 0; +// int stopped = 0; pfd[0].fd = STDIN_FILENO; pfd[0].events = POLLIN; @@ -284,7 +284,7 @@ static void copy_to_dvb(int vfd, int afd, int cfd, const uint8_t* ptr, const uns } deviceClear(afd, -1); printf("playback frozen\n"); - stopped = 1; +// stopped = 1; break; case 's': @@ -296,7 +296,7 @@ static void copy_to_dvb(int vfd, int afd, int cfd, const uint8_t* ptr, const uns deviceClear(afd, vfd); } printf("playback stopped\n"); - stopped = 1; +// stopped = 1; break; case 'c': @@ -310,7 +310,7 @@ static void copy_to_dvb(int vfd, int afd, int cfd, const uint8_t* ptr, const uns videoContinue(vfd); } printf("playback continued\n"); - stopped = 0; +// stopped = 0; break; case 'p': @@ -326,7 +326,7 @@ static void copy_to_dvb(int vfd, int afd, int cfd, const uint8_t* ptr, const uns } audioSetMute(afd, 0); printf("playback started\n"); - stopped = 0; +// stopped = 0; break; case 'f': @@ -336,21 +336,21 @@ static void copy_to_dvb(int vfd, int afd, int cfd, const uint8_t* ptr, const uns videoFastForward(vfd,0); } printf("fastforward\n"); - stopped = 0; +// stopped = 0; break; case 'm': audioSetAVSync(afd, 0); audioSetMute(afd, 1); printf("mute\n"); - stopped = 0; +// stopped = 0; break; case 'u': audioSetAVSync(afd, 1); audioSetMute(afd, 0); printf("unmute\n"); - stopped = 0; +// stopped = 0; break; case 'd': @@ -367,7 +367,7 @@ static void copy_to_dvb(int vfd, int afd, int cfd, const uint8_t* ptr, const uns videoSlowMotion(vfd,2); } printf("slowmotion\n"); - stopped = 0; +// stopped = 0; break; case 'q': diff --git a/test/test_video.c b/test/test_video.c index fe2f440..286b1d1 100644 --- a/test/test_video.c +++ b/test/test_video.c @@ -229,7 +229,7 @@ void play_file_video(int filefd, int fd) int count; int written; struct pollfd pfd[NFD]; - int stopped = 0; +// int stopped = 0; pfd[0].fd = STDIN_FILENO; pfd[0].events = POLLIN; @@ -258,37 +258,37 @@ void play_file_video(int filefd, int fd) case 'z': videoFreeze(fd); printf("playback frozen\n"); - stopped = 1; +// stopped = 1; break; case 's': videoStop(fd); printf("playback stopped\n"); - stopped = 1; +// stopped = 1; break; case 'c': videoContinue(fd); printf("playback continued\n"); - stopped = 0; +// stopped = 0; break; case 'p': videoPlay(fd); printf("playback started\n"); - stopped = 0; +// stopped = 0; break; case 'f': videoFastForward(fd,0); printf("fastforward\n"); - stopped = 0; +// stopped = 0; break; case 'm': videoSlowMotion(fd,2); printf("slowmotion\n"); - stopped = 0; +// stopped = 0; break; case 'q': diff --git a/util/lsdvb/lsdvb.c b/util/lsdvb/lsdvb.c index 7a206aa..065a844 100644 --- a/util/lsdvb/lsdvb.c +++ b/util/lsdvb/lsdvb.c @@ -139,7 +139,7 @@ int read_device_uevent(char *uevent, char line[128]; char *token = NULL; char *tmp; - int i; + unsigned int i; /* get uevent file */ sprintf(uf_name, "%s/%s", uevent, "device/uevent"); diff --git a/util/scan/Makefile b/util/scan/Makefile index 32d1f1c..ac7fb6e 100644 --- a/util/scan/Makefile +++ b/util/scan/Makefile @@ -14,7 +14,7 @@ inst_bin = $(binaries) removing = atsc_psip_section.c atsc_psip_section.h -CPPFLAGS += -DDATADIR=\"$(prefix)/share\" +CPPFLAGS += -Wno-packed-bitfield-compat -D__KERNEL_STRICT_NAMES .PHONY: all diff --git a/util/scan/dvb-t/ar-Argentina b/util/scan/dvb-t/ar-Argentina new file mode 100644 index 0000000..fb2e3d0 --- /dev/null +++ b/util/scan/dvb-t/ar-Argentina @@ -0,0 +1,63 @@ +# ISDB-T channel frequencies as defined in Brazil +# By ABNT NBR 15608-1 +# VHF channels 7 to 13 are also specified but not in usage yet +# +# UHF channels 14 to 69 +# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy +T 473142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 14 +T 479142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 15 +T 485142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 16 +T 491142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 17 +T 497142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 18 +T 503142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 19 +T 509142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 20 +T 515142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 21 +T 521142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 22 +T 527142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 23 +T 533142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 24 +T 539142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 25 +T 545142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 26 +T 551142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 27 +T 557142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 28 +T 563142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 29 +T 569142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 30 +T 575142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 31 +T 581142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 32 +T 587142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 33 +T 593142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 34 +T 599142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 35 +T 605142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 36 +# channel 37 not used +T 617142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 38 +T 623142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 39 +T 629142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 40 +T 635142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 41 +T 641142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 42 +T 647142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 43 +T 653142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 44 +T 659142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 45 +T 665142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 46 +T 671142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 47 +T 677142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 48 +T 683142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 49 +T 689142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 50 +T 695142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 51 +T 701142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 52 +T 707142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 53 +T 713142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 54 +T 719142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 55 +T 725142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 56 +T 731142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 57 +T 737142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 58 +T 743142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 59 +T 749142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 60 +T 755142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 61 +T 761142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 62 +T 767142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 63 +T 773142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 64 +T 779142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 65 +T 785142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 66 +T 791142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 67 +T 797142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 68 +T 803142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 69 + diff --git a/util/scan/dvb-t/br-Brazil b/util/scan/dvb-t/br-Brazil new file mode 100644 index 0000000..fb2e3d0 --- /dev/null +++ b/util/scan/dvb-t/br-Brazil @@ -0,0 +1,63 @@ +# ISDB-T channel frequencies as defined in Brazil +# By ABNT NBR 15608-1 +# VHF channels 7 to 13 are also specified but not in usage yet +# +# UHF channels 14 to 69 +# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy +T 473142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 14 +T 479142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 15 +T 485142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 16 +T 491142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 17 +T 497142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 18 +T 503142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 19 +T 509142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 20 +T 515142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 21 +T 521142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 22 +T 527142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 23 +T 533142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 24 +T 539142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 25 +T 545142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 26 +T 551142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 27 +T 557142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 28 +T 563142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 29 +T 569142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 30 +T 575142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 31 +T 581142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 32 +T 587142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 33 +T 593142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 34 +T 599142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 35 +T 605142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 36 +# channel 37 not used +T 617142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 38 +T 623142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 39 +T 629142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 40 +T 635142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 41 +T 641142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 42 +T 647142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 43 +T 653142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 44 +T 659142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 45 +T 665142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 46 +T 671142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 47 +T 677142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 48 +T 683142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 49 +T 689142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 50 +T 695142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 51 +T 701142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 52 +T 707142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 53 +T 713142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 54 +T 719142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 55 +T 725142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 56 +T 731142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 57 +T 737142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 58 +T 743142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 59 +T 749142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 60 +T 755142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 61 +T 761142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 62 +T 767142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 63 +T 773142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 64 +T 779142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 65 +T 785142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 66 +T 791142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 67 +T 797142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 68 +T 803142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 69 + diff --git a/util/scan/dvb-t/cz-All b/util/scan/dvb-t/cz-All index 7c6d601..29875b1 100644 --- a/util/scan/dvb-t/cz-All +++ b/util/scan/dvb-t/cz-All @@ -3,39 +3,50 @@ # and http://www.digizone.cz/texty/mapy-pokryti-multiplex-2-radiokomunikace/ # and http://www.digizone.cz/texty/mapy-pokryti-multiplex-3-czech-digital-group/ # and http://www.digizone.cz/texty/mapy-pokryti-multiplex-4-telefonica-o2/ +# and http://www.digitalnitelevize.cz/informace/dvb-t/vysilaci-sit-1.html +# and http://www.digitalnitelevize.cz/informace/dvb-t/vysilaci-sit-2.html # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy -T 482000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE +# multiplexes 1+2 T 506000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE T 538000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE -T 546000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE T 562000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE T 570000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE T 578000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE T 586000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE T 594000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE T 602000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE +T 610000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE T 618000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE T 626000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE T 634000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE -T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE T 650000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE -T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE -T 666000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE -T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE +T 674000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE T 690000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE T 698000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE -T 706000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE -T 714000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE T 722000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE T 730000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE T 738000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE -T 746000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE +T 762000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE T 770000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE -T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE -T 786000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE T 794000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE -T 802000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE -T 810000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE -T 818000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE -T 826000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE +# multiplex 3 +T 482000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE +T 506000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE +T 546000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE +T 578000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE +T 698000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE +T 714000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE +T 722000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE +T 746000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE +T 778000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE +T 786000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE +# multiplex 4 +T 506000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE +T 546000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE +T 642000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE +T 658000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE +T 666000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE +T 754000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE +T 810000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE +T 818000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE diff --git a/util/scan/dvb-t/hu-Bekescsaba b/util/scan/dvb-t/hu-Bekescsaba index e906111..61aed7b 100644 --- a/util/scan/dvb-t/hu-Bekescsaba +++ b/util/scan/dvb-t/hu-Bekescsaba @@ -1,17 +1,21 @@ # Hungary / Bekescsaba # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy # -# A.multiplex UHF-54: -# FREE -------------------------------------------------------------------------------- -# m1 HD, m2 HD, RTL Klub, TV2, Euronews EN Teszt, Euronews FR Teszt, Euronews GER Teszt -# Radio DVB-T Teszt 1, Radio DVB-T Teszt 2,Radio DVB-T Teszt 3 -# NON-FREE ---------------------------------------------------------------------------- -# ATV, HirTV -T 738000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE +# A.multiplex UHF-38: +# FREE ----------------------------------------------------------------------------------- +# m1 HD, m2 HD, Duna World, Duna HD, MR1 Kossuth Radio, MR2 Petofi Radio, MR3 Bartok Radio +T 610000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE +# +# B.multiplex UHF-54: +# NON-FREE -------------------------------------------------------------------------------- +# PRO4, VIASAT3, Prizma TV, Muzsika TV, Universal Channel, Comedy Central, Minimax, +# Cartoon Network, Spektrum, History, Sport1, Sport2, Dorcel TV +T 738000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # # C.multiplex UHF-65: # FREE -------------------------------------------------------------------------------- -# DunaTV HD, Autonomia +# RTL Klub, TV2, Euronews Test, Info csatorna, Neo FM # NON-FREE ---------------------------------------------------------------------------- -# Cool, Film+, Sportklub, National Geographic, Disney, AXN, FEM3, Private spice -T 826000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE +# Cool, Film+, HBO, National Geographic, Disney Channel, AXN, FEM3, Private spice, ATV, +# HirTV, Sportklub +T 826000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE diff --git a/util/scan/dvb-t/hu-Budapest b/util/scan/dvb-t/hu-Budapest index 09796a9..f890986 100644 --- a/util/scan/dvb-t/hu-Budapest +++ b/util/scan/dvb-t/hu-Budapest @@ -1,17 +1,21 @@ # Hungary / Budapest # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy # -# A.multiplex UHF-55: -# FREE -------------------------------------------------------------------------------- -# m1 HD, m2 HD, RTL Klub, TV2, Euronews EN Teszt, Euronews FR Teszt, Euronews GER Teszt -# Radio DVB-T Teszt 1, Radio DVB-T Teszt 2,Radio DVB-T Teszt 3 -# NON-FREE ---------------------------------------------------------------------------- -# ATV, HirTV -T 746000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE +# A.multiplex UHF-38: +# FREE ----------------------------------------------------------------------------------- +# m1 HD, m2 HD, Duna World, Duna HD, MR1 Kossuth Radio, MR2 Petofi Radio, MR3 Bartok Radio +T 610000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE +# +# B.multiplex UHF-55: +# NON-FREE -------------------------------------------------------------------------------- +# PRO4, VIASAT3, Prizma TV, Muzsika TV, Universal Channel, Comedy Central, Minimax, +# Cartoon Network, Spektrum, History, Sport1, Sport2, Dorcel TV +T 746000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # # C.multiplex UHF-62: # FREE -------------------------------------------------------------------------------- -# DunaTV HD, Autonomia +# RTL Klub, TV2, Euronews Test, Info csatorna, Neo FM # NON-FREE ---------------------------------------------------------------------------- -# Cool, Film+, Sportklub, National Geographic, Disney, AXN, FEM3, Private spice -T 802000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE +# Cool, Film+, HBO, National Geographic, Disney Channel, AXN, FEM3, Private spice, ATV, +# HirTV, Sportklub +T 802000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE diff --git a/util/scan/dvb-t/hu-Csavoly-Kiskoros b/util/scan/dvb-t/hu-Csavoly-Kiskoros index 8091798..f17d75b 100644 --- a/util/scan/dvb-t/hu-Csavoly-Kiskoros +++ b/util/scan/dvb-t/hu-Csavoly-Kiskoros @@ -2,16 +2,20 @@ # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy # # A.multiplex UHF-45: -# FREE -------------------------------------------------------------------------------- -# m1 HD, m2 HD, RTL Klub, TV2, Euronews EN Teszt, Euronews FR Teszt, Euronews GER Teszt -# Radio DVB-T Teszt 1, Radio DVB-T Teszt 2,Radio DVB-T Teszt 3 -# NON-FREE ---------------------------------------------------------------------------- -# ATV, HirTV -T 666000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE +# FREE ----------------------------------------------------------------------------------- +# m1 HD, m2 HD, Duna World, Duna HD, MR1 Kossuth Radio, MR2 Petofi Radio, MR3 Bartok Radio +T 666000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE +# +# B.multiplex UHF-00: +# NON-FREE -------------------------------------------------------------------------------- +# PRO4, VIASAT3, Prizma TV, Muzsika TV, Universal Channel, Comedy Central, Minimax, +# Cartoon Network, Spektrum, History, Sport1, Sport2, Dorcel TV +# T 746000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # # C.multiplex UHF-68: # FREE -------------------------------------------------------------------------------- -# DunaTV HD, Autonomia +# RTL Klub, TV2, Euronews Test, Info csatorna, Neo FM # NON-FREE ---------------------------------------------------------------------------- -# Cool, Film+, Sportklub, National Geographic, Disney, AXN, FEM3, Private spice -T 850000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE +# Cool, Film+, HBO, National Geographic, Disney Channel, AXN, FEM3, Private spice, ATV, +# HirTV, Sportklub +T 850000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE diff --git a/util/scan/dvb-t/hu-Debrecen-Komadi b/util/scan/dvb-t/hu-Debrecen-Komadi new file mode 100644 index 0000000..fd2d49b --- /dev/null +++ b/util/scan/dvb-t/hu-Debrecen-Komadi @@ -0,0 +1,21 @@ +# Hungary / Debrecen-Komadi +# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy +# +# A.multiplex UHF-46: +# FREE ----------------------------------------------------------------------------------- +# m1 HD, m2 HD, Duna World, Duna HD, MR1 Kossuth Radio, MR2 Petofi Radio, MR3 Bartok Radio +T 674000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE +# +# B.multiplex UHF-51: +# NON-FREE -------------------------------------------------------------------------------- +# PRO4, VIASAT3, Prizma TV, Muzsika TV, Universal Channel, Comedy Central, Minimax, +# Cartoon Network, Spektrum, History, Sport1, Sport2, Dorcel TV +T 714000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE +# +# C.multiplex UHF-62: +# FREE -------------------------------------------------------------------------------- +# RTL Klub, TV2, Euronews Test, Info csatorna, Neo FM +# NON-FREE ---------------------------------------------------------------------------- +# Cool, Film+, HBO, National Geographic, Disney Channel, AXN, FEM3, Private spice, ATV, +# HirTV, Sportklub +T 802000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE diff --git a/util/scan/dvb-t/hu-Fehergyarmat b/util/scan/dvb-t/hu-Fehergyarmat new file mode 100644 index 0000000..e9b27af --- /dev/null +++ b/util/scan/dvb-t/hu-Fehergyarmat @@ -0,0 +1,21 @@ +# Hungary / Fehergyarmat +# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy +# +# A.multiplex UHF-58: +# FREE ----------------------------------------------------------------------------------- +# m1 HD, m2 HD, Duna World, Duna HD, MR1 Kossuth Radio, MR2 Petofi Radio, MR3 Bartok Radio +T 770000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE +# +# B.multiplex UHF-00: +# NON-FREE -------------------------------------------------------------------------------- +# PRO4, VIASAT3, Prizma TV, Muzsika TV, Universal Channel, Comedy Central, Minimax, +# Cartoon Network, Spektrum, History, Sport1, Sport2, Dorcel TV +# T 714000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE +# +# C.multiplex UHF-38: +# FREE -------------------------------------------------------------------------------- +# RTL Klub, TV2, Euronews Test, Info csatorna, Neo FM +# NON-FREE ---------------------------------------------------------------------------- +# Cool, Film+, HBO, National Geographic, Disney Channel, AXN, FEM3, Private spice, ATV, +# HirTV, Sportklub +T 610000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE diff --git a/util/scan/dvb-t/hu-Gerecse b/util/scan/dvb-t/hu-Gerecse deleted file mode 100644 index ee8a0c4..0000000 --- a/util/scan/dvb-t/hu-Gerecse +++ /dev/null @@ -1,17 +0,0 @@ -# Hungary / Gerecse -# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy -# -# A.multiplex UHF-64: -# FREE -------------------------------------------------------------------------------- -# m1 HD, m2 HD, RTL Klub, TV2, Euronews EN Teszt, Euronews FR Teszt, Euronews GER Teszt -# Radio DVB-T Teszt 1, Radio DVB-T Teszt 2,Radio DVB-T Teszt 3 -# NON-FREE ---------------------------------------------------------------------------- -# ATV, HirTV -T 818000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE -# -# C.multiplex UHF-63: -# FREE -------------------------------------------------------------------------------- -# DunaTV HD, Autonomia -# NON-FREE ---------------------------------------------------------------------------- -# Cool, Film+, Sportklub, National Geographic, Disney, AXN, FEM3, Private spice -T 810000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE diff --git a/util/scan/dvb-t/hu-Gerecse-Dorog-Tatabanya b/util/scan/dvb-t/hu-Gerecse-Dorog-Tatabanya new file mode 100644 index 0000000..2030a21 --- /dev/null +++ b/util/scan/dvb-t/hu-Gerecse-Dorog-Tatabanya @@ -0,0 +1,21 @@ +# Hungary / Gerecse-Dorog-Tatabanya +# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy +# +# A.multiplex UHF-64: +# FREE ----------------------------------------------------------------------------------- +# m1 HD, m2 HD, Duna World, Duna HD, MR1 Kossuth Radio, MR2 Petofi Radio, MR3 Bartok Radio +T 818000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE +# +# B.multiplex UHF-29: +# NON-FREE -------------------------------------------------------------------------------- +# PRO4, VIASAT3, Prizma TV, Muzsika TV, Universal Channel, Comedy Central, Minimax, +# Cartoon Network, Spektrum, History, Sport1, Sport2, Dorcel TV +T 538000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE +# +# C.multiplex UHF-63: +# FREE -------------------------------------------------------------------------------- +# RTL Klub, TV2, Euronews Test, Info csatorna, Neo FM +# NON-FREE ---------------------------------------------------------------------------- +# Cool, Film+, HBO, National Geographic, Disney Channel, AXN, FEM3, Private spice, ATV, +# HirTV, Sportklub +T 810000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE diff --git a/util/scan/dvb-t/hu-Gyor b/util/scan/dvb-t/hu-Gyor new file mode 100644 index 0000000..9b7d0dd --- /dev/null +++ b/util/scan/dvb-t/hu-Gyor @@ -0,0 +1,21 @@ +# Hungary / Gyor +# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy +# +# A.multiplex UHF-42: +# FREE ----------------------------------------------------------------------------------- +# m1 HD, m2 HD, Duna World, Duna HD, MR1 Kossuth Radio, MR2 Petofi Radio, MR3 Bartok Radio +T 642000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE +# +# B.multiplex UHF-25: +# NON-FREE -------------------------------------------------------------------------------- +# PRO4, VIASAT3, Prizma TV, Muzsika TV, Universal Channel, Comedy Central, Minimax, +# Cartoon Network, Spektrum, History, Sport1, Sport2, Dorcel TV +T 506000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE +# +# C.multiplex UHF-61: +# FREE -------------------------------------------------------------------------------- +# RTL Klub, TV2, Euronews Test, Info csatorna, Neo FM +# NON-FREE ---------------------------------------------------------------------------- +# Cool, Film+, HBO, National Geographic, Disney Channel, AXN, FEM3, Private spice, ATV, +# HirTV, Sportklub +T 794000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE diff --git a/util/scan/dvb-t/hu-Gyor-Tatabanya b/util/scan/dvb-t/hu-Gyor-Tatabanya deleted file mode 100644 index 3ed9bdf..0000000 --- a/util/scan/dvb-t/hu-Gyor-Tatabanya +++ /dev/null @@ -1,17 +0,0 @@ -# Hungary / Gyor-Tatabanya -# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy -# -# A.multiplex UHF-42: -# FREE -------------------------------------------------------------------------------- -# m1 HD, m2 HD, RTL Klub, TV2, Euronews EN Teszt, Euronews FR Teszt, Euronews GER Teszt -# Radio DVB-T Teszt 1, Radio DVB-T Teszt 2,Radio DVB-T Teszt 3 -# NON-FREE ---------------------------------------------------------------------------- -# ATV, HirTV -T 642000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE -# -# C.multiplex UHF-61: -# FREE -------------------------------------------------------------------------------- -# DunaTV HD, Autonomia -# NON-FREE ---------------------------------------------------------------------------- -# Cool, Film+, Sportklub, National Geographic, Disney, AXN, FEM3, Private spice -T 794000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE diff --git a/util/scan/dvb-t/hu-Kabhegy-Kaposvar-Tamasi b/util/scan/dvb-t/hu-Kabhegy-Kaposvar-Tamasi new file mode 100644 index 0000000..54a52b0 --- /dev/null +++ b/util/scan/dvb-t/hu-Kabhegy-Kaposvar-Tamasi @@ -0,0 +1,21 @@ +# Hungary / Kabhegy-Kaposvar-Tamasi +# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy +# +# A.multiplex UHF-64: +# FREE ----------------------------------------------------------------------------------- +# m1 HD, m2 HD, Duna World, Duna HD, MR1 Kossuth Radio, MR2 Petofi Radio, MR3 Bartok Radio +T 818000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE +# +# B.multiplex UHF-00: +# NON-FREE -------------------------------------------------------------------------------- +# PRO4, VIASAT3, Prizma TV, Muzsika TV, Universal Channel, Comedy Central, Minimax, +# Cartoon Network, Spektrum, History, Sport1, Sport2, Dorcel TV +# T 506000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE +# +# C.multiplex UHF-61: +# FREE -------------------------------------------------------------------------------- +# RTL Klub, TV2, Euronews Test, Info csatorna, Neo FM +# NON-FREE ---------------------------------------------------------------------------- +# Cool, Film+, HBO, National Geographic, Disney Channel, AXN, FEM3, Private spice, ATV, +# HirTV, Sportklub +T 794000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE diff --git a/util/scan/dvb-t/hu-Kabhegy-Mor-Siofok b/util/scan/dvb-t/hu-Kabhegy-Mor-Siofok deleted file mode 100644 index 706a134..0000000 --- a/util/scan/dvb-t/hu-Kabhegy-Mor-Siofok +++ /dev/null @@ -1,17 +0,0 @@ -# Hungary / Kabhegy-Mor-Siofok -# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy -# -# A.multiplex UHF-64: -# FREE -------------------------------------------------------------------------------- -# m1 HD, m2 HD, RTL Klub, TV2, Euronews EN Teszt, Euronews FR Teszt, Euronews GER Teszt -# Radio DVB-T Teszt 1, Radio DVB-T Teszt 2,Radio DVB-T Teszt 3 -# NON-FREE ---------------------------------------------------------------------------- -# ATV, HirTV -T 818000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE -# -# C.multiplex UHF-61: -# FREE -------------------------------------------------------------------------------- -# DunaTV HD, Autonomia -# NON-FREE ---------------------------------------------------------------------------- -# Cool, Film+, Sportklub, National Geographic, Disney, AXN, FEM3, Private spice -T 794000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE diff --git a/util/scan/dvb-t/hu-Karancs-Nagy-Hideg-hegy-Balassagyarmat-Godollo-Salgotarjan-Vac b/util/scan/dvb-t/hu-Karancs-Nagy-Hideg-hegy-Balassagyarmat-Godollo-Salgotarjan-Vac new file mode 100644 index 0000000..6054377 --- /dev/null +++ b/util/scan/dvb-t/hu-Karancs-Nagy-Hideg-hegy-Balassagyarmat-Godollo-Salgotarjan-Vac @@ -0,0 +1,21 @@ +# Hungary / Karancs-Nagy-Hideg-hegy-Balassagyarmat-Godollo-Salgotarjan-Vac +# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy +# +# A.multiplex UHF-38: +# FREE ----------------------------------------------------------------------------------- +# m1 HD, m2 HD, Duna World, Duna HD, MR1 Kossuth Radio, MR2 Petofi Radio, MR3 Bartok Radio +T 610000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE +# +# B.multiplex UHF-55: +# NON-FREE -------------------------------------------------------------------------------- +# PRO4, VIASAT3, Prizma TV, Muzsika TV, Universal Channel, Comedy Central, Minimax, +# Cartoon Network, Spektrum, History, Sport1, Sport2, Dorcel TV +T 746000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE +# +# C.multiplex UHF-62: +# FREE -------------------------------------------------------------------------------- +# RTL Klub, TV2, Euronews Test, Info csatorna, Neo FM +# NON-FREE ---------------------------------------------------------------------------- +# Cool, Film+, HBO, National Geographic, Disney Channel, AXN, FEM3, Private spice, ATV, +# HirTV, Sportklub +T 802000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE diff --git a/util/scan/dvb-t/hu-Karcag b/util/scan/dvb-t/hu-Karcag index 9c2b909..7a70d0e 100644 --- a/util/scan/dvb-t/hu-Karcag +++ b/util/scan/dvb-t/hu-Karcag @@ -2,16 +2,20 @@ # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy # # A.multiplex UHF-46: -# FREE -------------------------------------------------------------------------------- -# m1 HD, m2 HD, RTL Klub, TV2, Euronews EN Teszt, Euronews FR Teszt, Euronews GER Teszt -# Radio DVB-T Teszt 1, Radio DVB-T Teszt 2,Radio DVB-T Teszt 3 -# NON-FREE ---------------------------------------------------------------------------- -# ATV, HirTV -T 674000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE +# FREE ----------------------------------------------------------------------------------- +# m1 HD, m2 HD, Duna World, Duna HD, MR1 Kossuth Radio, MR2 Petofi Radio, MR3 Bartok Radio +T 674000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE +# +# B.multiplex UHF-30: +# NON-FREE -------------------------------------------------------------------------------- +# PRO4, VIASAT3, Prizma TV, Muzsika TV, Universal Channel, Comedy Central, Minimax, +# Cartoon Network, Spektrum, History, Sport1, Sport2, Dorcel TV +T 546000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # # C.multiplex UHF-64: # FREE -------------------------------------------------------------------------------- -# DunaTV HD, Autonomia +# RTL Klub, TV2, Euronews Test, Info csatorna, Neo FM # NON-FREE ---------------------------------------------------------------------------- -# Cool, Film+, Sportklub, National Geographic, Disney, AXN, FEM3, Private spice -T 818000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE +# Cool, Film+, HBO, National Geographic, Disney Channel, AXN, FEM3, Private spice, ATV, +# HirTV, Sportklub +T 818000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE diff --git a/util/scan/dvb-t/hu-Kecskemet b/util/scan/dvb-t/hu-Kecskemet new file mode 100644 index 0000000..37ab7c0 --- /dev/null +++ b/util/scan/dvb-t/hu-Kecskemet @@ -0,0 +1,21 @@ +# Hungary / Kecskemet +# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy +# +# A.multiplex UHF-56: +# FREE ----------------------------------------------------------------------------------- +# m1 HD, m2 HD, Duna World, Duna HD, MR1 Kossuth Radio, MR2 Petofi Radio, MR3 Bartok Radio +T 754000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE +# +# B.multiplex UHF-39: +# NON-FREE -------------------------------------------------------------------------------- +# PRO4, VIASAT3, Prizma TV, Muzsika TV, Universal Channel, Comedy Central, Minimax, +# Cartoon Network, Spektrum, History, Sport1, Sport2, Dorcel TV +T 618000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE +# +# C.multiplex UHF-68: +# FREE -------------------------------------------------------------------------------- +# RTL Klub, TV2, Euronews Test, Info csatorna, Neo FM +# NON-FREE ---------------------------------------------------------------------------- +# Cool, Film+, HBO, National Geographic, Disney Channel, AXN, FEM3, Private spice, ATV, +# HirTV, Sportklub +T 850000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE diff --git a/util/scan/dvb-t/hu-Kekes-Cegled-Eger-Miskolctapolca-Ozd b/util/scan/dvb-t/hu-Kekes-Cegled-Eger-Miskolctapolca-Ozd new file mode 100644 index 0000000..6ad14bc --- /dev/null +++ b/util/scan/dvb-t/hu-Kekes-Cegled-Eger-Miskolctapolca-Ozd @@ -0,0 +1,21 @@ +# Hungary / Kekes-Cegled-Miskolctapolca +# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy +# +# A.multiplex UHF-44: +# FREE ----------------------------------------------------------------------------------- +# m1 HD, m2 HD, Duna World, Duna HD, MR1 Kossuth Radio, MR2 Petofi Radio, MR3 Bartok Radio +T 658000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE +# +# B.multiplex UHF-39: +# NON-FREE -------------------------------------------------------------------------------- +# PRO4, VIASAT3, Prizma TV, Muzsika TV, Universal Channel, Comedy Central, Minimax, +# Cartoon Network, Spektrum, History, Sport1, Sport2, Dorcel TV +T 618000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE +# +# C.multiplex UHF-69: +# FREE -------------------------------------------------------------------------------- +# RTL Klub, TV2, Euronews Test, Info csatorna, Neo FM +# NON-FREE ---------------------------------------------------------------------------- +# Cool, Film+, HBO, National Geographic, Disney Channel, AXN, FEM3, Private spice, ATV, +# HirTV, Sportklub +T 858000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE diff --git a/util/scan/dvb-t/hu-Kekes-Ozd b/util/scan/dvb-t/hu-Kekes-Ozd deleted file mode 100644 index a943652..0000000 --- a/util/scan/dvb-t/hu-Kekes-Ozd +++ /dev/null @@ -1,17 +0,0 @@ -# Hungary / Kekes-Ozd -# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy -# -# A.multiplex UHF-44: -# FREE -------------------------------------------------------------------------------- -# m1 HD, m2 HD, RTL Klub, TV2, Euronews EN Teszt, Euronews FR Teszt, Euronews GER Teszt -# Radio DVB-T Teszt 1, Radio DVB-T Teszt 2,Radio DVB-T Teszt 3 -# NON-FREE ---------------------------------------------------------------------------- -# ATV, HirTV -T 658000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE -# -# C.multiplex UHF-69: -# FREE -------------------------------------------------------------------------------- -# DunaTV HD, Autonomia -# NON-FREE ---------------------------------------------------------------------------- -# Cool, Film+, Sportklub, National Geographic, Disney, AXN, FEM3, Private spice -T 858000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE diff --git a/util/scan/dvb-t/hu-Kiskoros b/util/scan/dvb-t/hu-Kiskoros deleted file mode 100644 index 82cc97e..0000000 --- a/util/scan/dvb-t/hu-Kiskoros +++ /dev/null @@ -1,17 +0,0 @@ -# Hungary / Kiskoros -# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy -# -# A.multiplex UHF-45: -# FREE -------------------------------------------------------------------------------- -# m1 HD, m2 HD, RTL Klub, TV2, Euronews EN Teszt, Euronews FR Teszt, Euronews GER Teszt -# Radio DVB-T Teszt 1, Radio DVB-T Teszt 2,Radio DVB-T Teszt 3 -# NON-FREE ---------------------------------------------------------------------------- -# ATV, HirTV -T 666000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE -# -# C.multiplex UHF-68: -# FREE -------------------------------------------------------------------------------- -# DunaTV HD, Autonomia -# NON-FREE ---------------------------------------------------------------------------- -# Cool, Film+, Sportklub, National Geographic, Disney, AXN, FEM3, Private spice -T 850000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE diff --git a/util/scan/dvb-t/hu-Komadi-Debrecen b/util/scan/dvb-t/hu-Komadi-Debrecen deleted file mode 100644 index 12f903e..0000000 --- a/util/scan/dvb-t/hu-Komadi-Debrecen +++ /dev/null @@ -1,17 +0,0 @@ -# Hungary / Debrecen-Komadi -# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy -# -# A.multiplex UHF-46: -# FREE -------------------------------------------------------------------------------- -# m1 HD, m2 HD, RTL Klub, TV2, Euronews EN Teszt, Euronews FR Teszt, Euronews GER Teszt -# Radio DVB-T Teszt 1, Radio DVB-T Teszt 2,Radio DVB-T Teszt 3 -# NON-FREE ---------------------------------------------------------------------------- -# ATV, HirTV -T 674000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE -# -# C.multiplex UHF-62: -# FREE -------------------------------------------------------------------------------- -# DunaTV HD, Autonomia -# NON-FREE ---------------------------------------------------------------------------- -# Cool, Film+, Sportklub, National Geographic, Disney, AXN, FEM3, Private spice -T 802000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE diff --git a/util/scan/dvb-t/hu-Miskolc-Aggtelek-Fony b/util/scan/dvb-t/hu-Miskolc-Aggtelek-Fony new file mode 100644 index 0000000..c287a95 --- /dev/null +++ b/util/scan/dvb-t/hu-Miskolc-Aggtelek-Fony @@ -0,0 +1,21 @@ +# Hungary / Miskolc-Aggtelek-Fony +# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy +# +# A.multiplex UHF-45: +# FREE ----------------------------------------------------------------------------------- +# m1 HD, m2 HD, Duna World, Duna HD, MR1 Kossuth Radio, MR2 Petofi Radio, MR3 Bartok Radio +T 666000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE +# +# B.multiplex UHF-31: +# NON-FREE -------------------------------------------------------------------------------- +# PRO4, VIASAT3, Prizma TV, Muzsika TV, Universal Channel, Comedy Central, Minimax, +# Cartoon Network, Spektrum, History, Sport1, Sport2, Dorcel TV +T 554000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE +# +# C.multiplex UHF-63: +# FREE -------------------------------------------------------------------------------- +# RTL Klub, TV2, Euronews Test, Info csatorna, Neo FM +# NON-FREE ---------------------------------------------------------------------------- +# Cool, Film+, HBO, National Geographic, Disney Channel, AXN, FEM3, Private spice, ATV, +# HirTV, Sportklub +T 810000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE diff --git a/util/scan/dvb-t/hu-Mor-Siofok-Veszprem-Zirc b/util/scan/dvb-t/hu-Mor-Siofok-Veszprem-Zirc new file mode 100644 index 0000000..2ac4cec --- /dev/null +++ b/util/scan/dvb-t/hu-Mor-Siofok-Veszprem-Zirc @@ -0,0 +1,21 @@ +# Hungary / Mor-Siofok-Veszprem-Zirc +# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy +# +# A.multiplex UHF-64: +# FREE ----------------------------------------------------------------------------------- +# m1 HD, m2 HD, Duna World, Duna HD, MR1 Kossuth Radio, MR2 Petofi Radio, MR3 Bartok Radio +T 818000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE +# +# B.multiplex UHF-29: +# NON-FREE ---------------------------------------------------------------------------- +# PRO4, VIASAT3, Prizma TV, Muzsika TV, Universal Channel, Comedy Central, Minimax, +# Cartoon Network, Spektrum, History, Sport1, Sport2, Dorcel TV +T 538000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE +# +# C.multiplex UHF-61: +# FREE -------------------------------------------------------------------------------- +# RTL Klub, TV2, Euronews Test, Info csatorna, Neo FM +# NON-FREE ---------------------------------------------------------------------------- +# Cool, Film+, HBO, National Geographic, Disney Channel, AXN, FEM3, Private spice, ATV, +# HirTV, Sportklub +T 794000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE diff --git a/util/scan/dvb-t/hu-Nagykanizsa-Barcs-Keszthely b/util/scan/dvb-t/hu-Nagykanizsa-Barcs-Keszthely new file mode 100644 index 0000000..5b2a455 --- /dev/null +++ b/util/scan/dvb-t/hu-Nagykanizsa-Barcs-Keszthely @@ -0,0 +1,21 @@ +# Hungary / Nagykanizsa-Barcs-Keszthely +# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy +# +# A.multiplex UHF-24: +# FREE ----------------------------------------------------------------------------------- +# m1 HD, m2 HD, Duna World, Duna HD, MR1 Kossuth Radio, MR2 Petofi Radio, MR3 Bartok Radio +T 498000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE +# +# B.multiplex UHF-55: +# NON-FREE -------------------------------------------------------------------------------- +# PRO4, VIASAT3, Prizma TV, Muzsika TV, Universal Channel, Comedy Central, Minimax, +# Cartoon Network, Spektrum, History, Sport1, Sport2, Dorcel TV +T 746000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE +# +# C.multiplex UHF-65: +# FREE -------------------------------------------------------------------------------- +# RTL Klub, TV2, Euronews Test, Info csatorna, Neo FM +# NON-FREE ---------------------------------------------------------------------------- +# Cool, Film+, HBO, National Geographic, Disney Channel, AXN, FEM3, Private spice, ATV, +# HirTV, Sportklub +T 826000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE diff --git a/util/scan/dvb-t/hu-Nagykanizsa-Kaposvar b/util/scan/dvb-t/hu-Nagykanizsa-Kaposvar deleted file mode 100644 index 7a7c24f..0000000 --- a/util/scan/dvb-t/hu-Nagykanizsa-Kaposvar +++ /dev/null @@ -1,17 +0,0 @@ -# Hungary / Kaposvar-Nagykanizsa -# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy -# -# A.multiplex UHF-24: -# FREE -------------------------------------------------------------------------------- -# m1 HD, m2 HD, RTL Klub, TV2, Euronews EN Teszt, Euronews FR Teszt, Euronews GER Teszt -# Radio DVB-T Teszt 1, Radio DVB-T Teszt 2,Radio DVB-T Teszt 3 -# NON-FREE ---------------------------------------------------------------------------- -# ATV, HirTV -T 498000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE -# -# C.multiplex UHF-65: -# FREE -------------------------------------------------------------------------------- -# DunaTV HD, Autonomia -# NON-FREE ---------------------------------------------------------------------------- -# Cool, Film+, Sportklub, National Geographic, Disney, AXN, FEM3, Private spice -T 826000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE diff --git a/util/scan/dvb-t/hu-Nyiregyhaza-Tokaj-Kazincbarcika-Saly-Satoraljaujhely b/util/scan/dvb-t/hu-Nyiregyhaza-Tokaj-Kazincbarcika-Saly-Satoraljaujhely new file mode 100644 index 0000000..2f3eedd --- /dev/null +++ b/util/scan/dvb-t/hu-Nyiregyhaza-Tokaj-Kazincbarcika-Saly-Satoraljaujhely @@ -0,0 +1,21 @@ +# Hungary / Nyíregyhaza-Tokaj-Kzincbarcika-Saly-Satoraljaujhely +# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy +# +# A.multiplex UHF-68: +# FREE ----------------------------------------------------------------------------------- +# m1 HD, m2 HD, Duna World, Duna HD, MR1 Kossuth Radio, MR2 Petofi Radio, MR3 Bartok Radio +T 850000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE +# +# B.multiplex UHF-31: +# NON-FREE -------------------------------------------------------------------------------- +# PRO4, VIASAT3, Prizma TV, Muzsika TV, Universal Channel, Comedy Central, Minimax, +# Cartoon Network, Spektrum, History, Sport1, Sport2, Dorcel TV +T 554000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE +# +# C.multiplex UHF-63: +# FREE -------------------------------------------------------------------------------- +# RTL Klub, TV2, Euronews Test, Info csatorna, Neo FM +# NON-FREE ---------------------------------------------------------------------------- +# Cool, Film+, HBO, National Geographic, Disney Channel, AXN, FEM3, Private spice, ATV, +# HirTV, Sportklub +T 810000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE diff --git a/util/scan/dvb-t/hu-Pecs-Siklos b/util/scan/dvb-t/hu-Pecs-Siklos new file mode 100644 index 0000000..d78ba84 --- /dev/null +++ b/util/scan/dvb-t/hu-Pecs-Siklos @@ -0,0 +1,21 @@ +# Hungary / Pecs-Siklos +# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy +# +# A.multiplex UHF-52: +# FREE ----------------------------------------------------------------------------------- +# m1 HD, m2 HD, Duna World, Duna HD, MR1 Kossuth Radio, MR2 Petofi Radio, MR3 Bartok Radio +T 722000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE +# +# B.multiplex UHF-00: +# NON-FREE -------------------------------------------------------------------------------- +# PRO4, VIASAT3, Prizma TV, Muzsika TV, Universal Channel, Comedy Central, Minimax, +# Cartoon Network, Spektrum, History, Sport1, Sport2, Dorcel TV +# T 554000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE +# +# C.multiplex UHF-67: +# FREE -------------------------------------------------------------------------------- +# RTL Klub, TV2, Euronews Test, Info csatorna, Neo FM +# NON-FREE ---------------------------------------------------------------------------- +# Cool, Film+, HBO, National Geographic, Disney Channel, AXN, FEM3, Private spice, ATV, +# HirTV, Sportklub +T 842000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE diff --git a/util/scan/dvb-t/hu-Pecs-Uzd b/util/scan/dvb-t/hu-Pecs-Uzd deleted file mode 100644 index 188711b..0000000 --- a/util/scan/dvb-t/hu-Pecs-Uzd +++ /dev/null @@ -1,17 +0,0 @@ -# Hungary / Pecs-Uzd -# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy -# -# A.multiplex UHF-52: -# FREE -------------------------------------------------------------------------------- -# m1 HD, m2 HD, RTL Klub, TV2, Euronews EN Teszt, Euronews FR Teszt, Euronews GER Teszt -# Radio DVB-T Teszt 1, Radio DVB-T Teszt 2,Radio DVB-T Teszt 3 -# NON-FREE ---------------------------------------------------------------------------- -# ATV, HirTV -T 722000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE -# -# C.multiplex UHF-67: -# FREE -------------------------------------------------------------------------------- -# DunaTV HD, Autonomia -# NON-FREE ---------------------------------------------------------------------------- -# Cool, Film+, Sportklub, National Geographic, Disney, AXN, FEM3, Private spice -T 842000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE diff --git a/util/scan/dvb-t/hu-Salgotarjan b/util/scan/dvb-t/hu-Salgotarjan deleted file mode 100644 index dbd4870..0000000 --- a/util/scan/dvb-t/hu-Salgotarjan +++ /dev/null @@ -1,17 +0,0 @@ -# Hungary / Salgotarjan -# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy -# -# A.multiplex UHF-55: -# FREE -------------------------------------------------------------------------------- -# m1 HD, m2 HD, RTL Klub, TV2, Euronews EN Teszt, Euronews FR Teszt, Euronews GER Teszt -# Radio DVB-T Teszt 1, Radio DVB-T Teszt 2,Radio DVB-T Teszt 3 -# NON-FREE ---------------------------------------------------------------------------- -# ATV, HirTV -T 746000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE -# -# C.multiplex UHF-62: -# FREE -------------------------------------------------------------------------------- -# DunaTV HD, Autonomia -# NON-FREE ---------------------------------------------------------------------------- -# Cool, Film+, Sportklub, National Geographic, Disney, AXN, FEM3, Private spice -T 802000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE diff --git a/util/scan/dvb-t/hu-Sopron b/util/scan/dvb-t/hu-Sopron deleted file mode 100644 index 07b1037..0000000 --- a/util/scan/dvb-t/hu-Sopron +++ /dev/null @@ -1,17 +0,0 @@ -# Hungary / Sopron -# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy -# -# A.multiplex UHF-42: -# FREE -------------------------------------------------------------------------------- -# m1 HD, m2 HD, RTL Klub, TV2, Euronews EN Teszt, Euronews FR Teszt, Euronews GER Teszt -# Radio DVB-T Teszt 1, Radio DVB-T Teszt 2,Radio DVB-T Teszt 3 -# NON-FREE ---------------------------------------------------------------------------- -# ATV, HirTV -T 642000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE -# -# C.multiplex UHF-68: -# FREE -------------------------------------------------------------------------------- -# DunaTV HD, Autonomia -# NON-FREE ---------------------------------------------------------------------------- -# Cool, Film+, Sportklub, National Geographic, Disney, AXN, FEM3, Private spice -T 850000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE diff --git a/util/scan/dvb-t/hu-Sopron-Koszeg b/util/scan/dvb-t/hu-Sopron-Koszeg new file mode 100644 index 0000000..297390c --- /dev/null +++ b/util/scan/dvb-t/hu-Sopron-Koszeg @@ -0,0 +1,21 @@ +# Hungary / Sopron-Koszeg +# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy +# +# A.multiplex UHF-42: +# FREE ----------------------------------------------------------------------------------- +# m1 HD, m2 HD, Duna World, Duna HD, MR1 Kossuth Radio, MR2 Petofi Radio, MR3 Bartok Radio +T 642000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE +# +# B.multiplex UHF-40: +# NON-FREE -------------------------------------------------------------------------------- +# PRO4, VIASAT3, Prizma TV, Muzsika TV, Universal Channel, Comedy Central, Minimax, +# Cartoon Network, Spektrum, History, Sport1, Sport2, Dorcel TV +T 626000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE +# +# C.multiplex UHF-68: +# FREE -------------------------------------------------------------------------------- +# RTL Klub, TV2, Euronews Test, Info csatorna, Neo FM +# NON-FREE ---------------------------------------------------------------------------- +# Cool, Film+, HBO, National Geographic, Disney Channel, AXN, FEM3, Private spice, ATV, +# HirTV, Sportklub +T 850000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE diff --git a/util/scan/dvb-t/hu-Szeged b/util/scan/dvb-t/hu-Szeged new file mode 100644 index 0000000..6dcc0e4 --- /dev/null +++ b/util/scan/dvb-t/hu-Szeged @@ -0,0 +1,21 @@ +# Hungary / Szeged +# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy +# +# A.multiplex UHF-60: +# FREE ----------------------------------------------------------------------------------- +# m1 HD, m2 HD, Duna World, Duna HD, MR1 Kossuth Radio, MR2 Petofi Radio, MR3 Bartok Radio +T 786000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE +# +# B.multiplex UHF-22: +# NON-FREE -------------------------------------------------------------------------------- +# PRO4, VIASAT3, Prizma TV, Muzsika TV, Universal Channel, Comedy Central, Minimax, +# Cartoon Network, Spektrum, History, Sport1, Sport2, Dorcel TV +T 482000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE +# +# C.multiplex UHF-65: +# FREE -------------------------------------------------------------------------------- +# RTL Klub, TV2, Euronews Test, Info csatorna, Neo FM +# NON-FREE ---------------------------------------------------------------------------- +# Cool, Film+, HBO, National Geographic, Disney Channel, AXN, FEM3, Private spice, ATV, +# HirTV, Sportklub +T 826000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE diff --git a/util/scan/dvb-t/hu-Szekesfehervar b/util/scan/dvb-t/hu-Szekesfehervar new file mode 100644 index 0000000..a68f357 --- /dev/null +++ b/util/scan/dvb-t/hu-Szekesfehervar @@ -0,0 +1,21 @@ +# Hungary / Szekesfehervar +# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy +# +# A.multiplex UHF-30: +# FREE ----------------------------------------------------------------------------------- +# m1 HD, m2 HD, Duna World, Duna HD, MR1 Kossuth Radio, MR2 Petofi Radio, MR3 Bartok Radio +T 546000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE +# +# B.multiplex UHF-29: +# NON-FREE -------------------------------------------------------------------------------- +# PRO4, VIASAT3, Prizma TV, Muzsika TV, Universal Channel, Comedy Central, Minimax, +# Cartoon Network, Spektrum, History, Sport1, Sport2, Dorcel TV +T 538000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE +# +# C.multiplex UHF-63: +# FREE -------------------------------------------------------------------------------- +# RTL Klub, TV2, Euronews Test, Info csatorna, Neo FM +# NON-FREE ---------------------------------------------------------------------------- +# Cool, Film+, HBO, National Geographic, Disney Channel, AXN, FEM3, Private spice, ATV, +# HirTV, Sportklub +T 810000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE diff --git a/util/scan/dvb-t/hu-Szentes-Battonya b/util/scan/dvb-t/hu-Szentes-Battonya new file mode 100644 index 0000000..cfc683b --- /dev/null +++ b/util/scan/dvb-t/hu-Szentes-Battonya @@ -0,0 +1,21 @@ +# Hungary / Szentes-Battonya +# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy +# +# A.multiplex UHF-60: +# FREE ----------------------------------------------------------------------------------- +# m1 HD, m2 HD, Duna World, Duna HD, MR1 Kossuth Radio, MR2 Petofi Radio, MR3 Bartok Radio +T 786000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE +# +# B.multiplex UHF-00: +# NON-FREE ---------------------------------------------------------------------------- +# PRO4, VIASAT3, Prizma TV, Muzsika TV, Universal Channel, Comedy Central, Minimax, +# Cartoon Network, Spektrum, History, Sport1, Sport2, Dorcel TV +# T 538000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE +# +# C.multiplex UHF-65: +# FREE -------------------------------------------------------------------------------- +# RTL Klub, TV2, Euronews Test, Info csatorna, Neo FM +# NON-FREE ---------------------------------------------------------------------------- +# Cool, Film+, HBO, National Geographic, Disney Channel, AXN, FEM3, Private spice, ATV, +# HirTV, Sportklub +T 826000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE diff --git a/util/scan/dvb-t/hu-Szentes-Szeged b/util/scan/dvb-t/hu-Szentes-Szeged deleted file mode 100644 index 864c1b9..0000000 --- a/util/scan/dvb-t/hu-Szentes-Szeged +++ /dev/null @@ -1,17 +0,0 @@ -# Hungary / Szentes-Szeged -# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy -# -# A.multiplex UHF-60: -# FREE -------------------------------------------------------------------------------- -# m1 HD, m2 HD, RTL Klub, TV2, Euronews EN Teszt, Euronews FR Teszt, Euronews GER Teszt -# Radio DVB-T Teszt 1, Radio DVB-T Teszt 2,Radio DVB-T Teszt 3 -# NON-FREE ---------------------------------------------------------------------------- -# ATV, HirTV -T 786000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE -# -# C.multiplex UHF-65: -# FREE -------------------------------------------------------------------------------- -# DunaTV HD, Autonomia -# NON-FREE ---------------------------------------------------------------------------- -# Cool, Film+, Sportklub, National Geographic, Disney, AXN, FEM3, Private spice -T 826000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE diff --git a/util/scan/dvb-t/hu-Szolnok b/util/scan/dvb-t/hu-Szolnok new file mode 100644 index 0000000..98da473 --- /dev/null +++ b/util/scan/dvb-t/hu-Szolnok @@ -0,0 +1,21 @@ +# Hungary / Szolnok +# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy +# +# A.multiplex UHF-56: +# FREE ----------------------------------------------------------------------------------- +# m1 HD, m2 HD, Duna World, Duna HD, MR1 Kossuth Radio, MR2 Petofi Radio, MR3 Bartok Radio +T 754000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE +# +# B.multiplex UHF-30: +# NON-FREE ---------------------------------------------------------------------------- +# PRO4, VIASAT3, Prizma TV, Muzsika TV, Universal Channel, Comedy Central, Minimax, +# Cartoon Network, Spektrum, History, Sport1, Sport2, Dorcel TV +T 546000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE +# +# C.multiplex UHF-64: +# FREE -------------------------------------------------------------------------------- +# RTL Klub, TV2, Euronews Test, Info csatorna, Neo FM +# NON-FREE ---------------------------------------------------------------------------- +# Cool, Film+, HBO, National Geographic, Disney Channel, AXN, FEM3, Private spice, ATV, +# HirTV, Sportklub +T 818000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE diff --git a/util/scan/dvb-t/hu-Szombathely-Vasvar-Lenti-Zalaegerszeg b/util/scan/dvb-t/hu-Szombathely-Vasvar-Lenti-Zalaegerszeg new file mode 100644 index 0000000..af1ddb2 --- /dev/null +++ b/util/scan/dvb-t/hu-Szombathely-Vasvar-Lenti-Zalaegerszeg @@ -0,0 +1,21 @@ +# Hungary / Szombathely-Vasvar-Lenti-Zalaegerszeg +# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy +# +# A.multiplex UHF-38: +# FREE ----------------------------------------------------------------------------------- +# m1 HD, m2 HD, Duna World, Duna HD, MR1 Kossuth Radio, MR2 Petofi Radio, MR3 Bartok Radio +T 610000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE +# +# B.multiplex UHF-58: +# NON-FREE ---------------------------------------------------------------------------- +# PRO4, VIASAT3, Prizma TV, Muzsika TV, Universal Channel, Comedy Central, Minimax, +# Cartoon Network, Spektrum, History, Sport1, Sport2, Dorcel TV +T 770000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE +# +# C.multiplex UHF-68: +# FREE -------------------------------------------------------------------------------- +# RTL Klub, TV2, Euronews Test, Info csatorna, Neo FM +# NON-FREE ---------------------------------------------------------------------------- +# Cool, Film+, HBO, National Geographic, Disney Channel, AXN, FEM3, Private spice, ATV, +# HirTV, Sportklub +T 850000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE diff --git a/util/scan/dvb-t/hu-Tokaj-Kazincbarcika b/util/scan/dvb-t/hu-Tokaj-Kazincbarcika deleted file mode 100644 index 1435271..0000000 --- a/util/scan/dvb-t/hu-Tokaj-Kazincbarcika +++ /dev/null @@ -1,17 +0,0 @@ -# Hungary / Tokaj-Kazincbarcika -# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy -# -# A.multiplex UHF-68: -# FREE -------------------------------------------------------------------------------- -# m1 HD, m2 HD, RTL Klub, TV2, Euronews EN Teszt, Euronews FR Teszt, Euronews GER Teszt -# Radio DVB-T Teszt 1, Radio DVB-T Teszt 2,Radio DVB-T Teszt 3 -# NON-FREE ---------------------------------------------------------------------------- -# ATV, HirTV -T 850000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE -# -# C.multiplex UHF-63: -# FREE -------------------------------------------------------------------------------- -# DunaTV HD, Autonomia -# NON-FREE ---------------------------------------------------------------------------- -# Cool, Film+, Sportklub, National Geographic, Disney, AXN, FEM3, Private spice -T 810000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE diff --git a/util/scan/dvb-t/hu-Uzd-Bonyhad-Dunaujvaros-Szekszard-Szigetvar b/util/scan/dvb-t/hu-Uzd-Bonyhad-Dunaujvaros-Szekszard-Szigetvar new file mode 100644 index 0000000..029ebbb --- /dev/null +++ b/util/scan/dvb-t/hu-Uzd-Bonyhad-Dunaujvaros-Szekszard-Szigetvar @@ -0,0 +1,21 @@ +# Hungary / Uzd-Bonyhad-Dunaujvaros-Szekszard-Szigetvar +# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy +# +# A.multiplex UHF-52: +# FREE ----------------------------------------------------------------------------------- +# m1 HD, m2 HD, Duna World, Duna HD, MR1 Kossuth Radio, MR2 Petofi Radio, MR3 Bartok Radio +T 722000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE +# +# B.multiplex UHF-37: +# NON-FREE ---------------------------------------------------------------------------- +# PRO4, VIASAT3, Prizma TV, Muzsika TV, Universal Channel, Comedy Central, Minimax, +# Cartoon Network, Spektrum, History, Sport1, Sport2, Dorcel TV +T 602000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE +# +# C.multiplex UHF-67: +# FREE -------------------------------------------------------------------------------- +# RTL Klub, TV2, Euronews Test, Info csatorna, Neo FM +# NON-FREE ---------------------------------------------------------------------------- +# Cool, Film+, HBO, National Geographic, Disney Channel, AXN, FEM3, Private spice, ATV, +# HirTV, Sportklub +T 842000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE diff --git a/util/scan/dvb-t/hu-Vasvar b/util/scan/dvb-t/hu-Vasvar deleted file mode 100644 index a889d9c..0000000 --- a/util/scan/dvb-t/hu-Vasvar +++ /dev/null @@ -1,17 +0,0 @@ -# Hungary / Vasvar -# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy -# -# A.multiplex UHF-58: -# FREE -------------------------------------------------------------------------------- -# m1 HD, m2 HD, RTL Klub, TV2, Euronews EN Teszt, Euronews FR Teszt, Euronews GER Teszt -# Radio DVB-T Teszt 1, Radio DVB-T Teszt 2,Radio DVB-T Teszt 3 -# NON-FREE ---------------------------------------------------------------------------- -# ATV, HirTV -T 770000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE -# -# C.multiplex UHF-68: -# FREE -------------------------------------------------------------------------------- -# DunaTV HD, Autonomia -# NON-FREE ---------------------------------------------------------------------------- -# Cool, Film+, Sportklub, National Geographic, Disney, AXN, FEM3, Private spice -T 850000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE diff --git a/util/scan/scan.c b/util/scan/scan.c index 46bdb08..71a20db 100644 --- a/util/scan/scan.c +++ b/util/scan/scan.c @@ -1304,7 +1304,7 @@ static void parse_sdt (const unsigned char *buf, int section_length, int descriptors_loop_len = ((buf[3] & 0x0f) << 8) | buf[4]; struct service *s; - if (section_length < descriptors_loop_len || !descriptors_loop_len) + if (section_length < descriptors_loop_len) { warning("section too short: service_id == 0x%02x, section_length == %i, " "descriptors_loop_len == %i\n", @@ -1934,7 +1934,7 @@ static int __tune_to_transponder (int frontend_fd, struct transponder *t) return -1; } -static set_delivery_system(int fd, unsigned type) +static int set_delivery_system(int fd, unsigned type) { struct dtv_properties props; struct dtv_property dvb_prop[1]; diff --git a/util/szap/azap.c b/util/szap/azap.c index 230a7b9..d024b46 100644 --- a/util/szap/azap.c +++ b/util/szap/azap.c @@ -216,18 +216,14 @@ int parse(const char *fname, const char *channel, static int setup_frontend (int fe_fd, struct dvb_frontend_parameters *frontend) { - struct dvb_frontend_info fe_info; + uint32_t mstd; - if (ioctl(fe_fd, FE_GET_INFO, &fe_info) < 0) { - PERROR("ioctl FE_GET_INFO failed"); - return -1; - } - - if (fe_info.type != FE_ATSC) { - ERROR ("frontend device is not an ATSC (VSB/QAM) device"); + if (check_frontend(fe_fd, FE_ATSC, &mstd) < 0) { + close(fe_fd); return -1; } + /* TODO! Some frontends need to be explicit delivery system */ printf ("tuning to %i Hz\n", frontend->frequency); if (ioctl(fe_fd, FE_SET_FRONTEND, frontend) < 0) { @@ -240,7 +236,7 @@ int setup_frontend (int fe_fd, struct dvb_frontend_parameters *frontend) static -int check_frontend (int fe_fd) +int monitor_frontend (int fe_fd) { fe_status_t status; uint16_t snr, signal; @@ -344,7 +340,7 @@ int main(int argc, char **argv) if (parse (confname, channel, &frontend_param, &vpid, &apid, &sid)) return -1; - if ((frontend_fd = open(FRONTEND_DEV, O_RDWR)) < 0) { + if ((frontend_fd = open(FRONTEND_DEV, O_RDWR | O_NONBLOCK)) < 0) { PERROR ("failed opening '%s'", FRONTEND_DEV); return -1; } @@ -392,7 +388,7 @@ int main(int argc, char **argv) if (set_pesfilter (audio_fd, apid, DMX_PES_AUDIO, dvr) < 0) return -1; - check_frontend (frontend_fd); + monitor_frontend (frontend_fd); close (pat_fd); close (pmt_fd); diff --git a/util/szap/czap.c b/util/szap/czap.c index 8a97d98..f49c524 100644 --- a/util/szap/czap.c +++ b/util/szap/czap.c @@ -180,32 +180,30 @@ int parse(const char *fname, int list_channels, int chan_no, const char *channel } -static -int setup_frontend(int fe_fd, struct dvb_frontend_parameters *frontend) +static int setup_frontend(int fe_fd, struct dvb_frontend_parameters *frontend) { - struct dvb_frontend_info fe_info; + int ret; + uint32_t mstd; - if (ioctl(fe_fd, FE_GET_INFO, &fe_info) < 0) { - PERROR ("ioctl FE_GET_INFO failed"); + if (check_frontend(fe_fd, FE_QAM, &mstd) < 0) { + close(fe_fd); return -1; } - - if (fe_info.type != FE_QAM) { - ERROR ("frontend device is not a QAM (DVB-C) device"); + ret = dvbfe_set_delsys(fe_fd, SYS_DVBC_ANNEX_A); + if (ret) { + PERROR("SET Delsys failed"); return -1; } - if (ioctl(fe_fd, FE_SET_FRONTEND, frontend) < 0) { PERROR ("ioctl FE_SET_FRONTEND failed"); return -1; } - return 0; } static -int check_frontend (int fe_fd, int human_readable) +int monitor_frontend (int fe_fd, int human_readable) { fe_status_t status; uint16_t snr, signal; @@ -347,7 +345,7 @@ int main(int argc, char **argv) if (list_channels) return 0; - if ((frontend_fd = open(FRONTEND_DEV, O_RDWR)) < 0) { + if ((frontend_fd = open(FRONTEND_DEV, O_RDWR | O_NONBLOCK)) < 0) { PERROR("failed opening '%s'", FRONTEND_DEV); return -1; } @@ -393,7 +391,7 @@ int main(int argc, char **argv) if (set_pesfilter (audio_fd, apid, DMX_PES_AUDIO, dvr) < 0) return -1; - check_frontend (frontend_fd, human_readable); + monitor_frontend (frontend_fd, human_readable); close (pat_fd); close (pmt_fd); diff --git a/util/szap/szap.c b/util/szap/szap.c index 9de752e..90bdbfb 100644 --- a/util/szap/szap.c +++ b/util/szap/szap.c @@ -166,7 +166,7 @@ static int do_tune(int fefd, unsigned int ifreq, unsigned int sr) } -static int check_frontend (int fe_fd, int dvr, int human_readable) +static int monitor_frontend (int fe_fd, int dvr, int human_readable) { (void)dvr; fe_status_t status; @@ -220,9 +220,8 @@ int zap_to(unsigned int adapter, unsigned int frontend, unsigned int demux, char fedev[128], dmxdev[128], auddev[128]; static int fefd, dmxfda, dmxfdv, audiofd = -1, patfd, pmtfd; int pmtpid; - uint32_t ifreq; + uint32_t ifreq, mstd; int hiband, result; - static struct dvb_frontend_info fe_info; if (!fefd) { snprintf(fedev, sizeof(fedev), FRONTENDDEVICE, adapter, frontend); @@ -234,20 +233,11 @@ int zap_to(unsigned int adapter, unsigned int frontend, unsigned int demux, perror("opening frontend failed"); return FALSE; } - - result = ioctl(fefd, FE_GET_INFO, &fe_info); - if (result < 0) { - perror("ioctl FE_GET_INFO failed"); - close(fefd); - return FALSE; - } - - if (fe_info.type != FE_QPSK) { - fprintf(stderr, "frontend device is not a QPSK (DVB-S) device!\n"); + if (check_frontend(fefd, FE_QPSK, &mstd) < 0) { close(fefd); return FALSE; } - + /* TODO! Some frontends need to be explicit delivery system */ if ((dmxfdv = open(dmxdev, O_RDWR)) < 0) { perror("opening video demux failed"); close(fefd); @@ -322,7 +312,7 @@ int zap_to(unsigned int adapter, unsigned int frontend, unsigned int demux, } } - check_frontend (fefd, dvr, human_readable); + monitor_frontend (fefd, dvr, human_readable); if (!interactive) { close(patfd); close(pmtfd); diff --git a/util/szap/tzap.c b/util/szap/tzap.c index ce63832..5f84cb0 100644 --- a/util/szap/tzap.c +++ b/util/szap/tzap.c @@ -351,21 +351,20 @@ int parse(const char *fname, const char *channel, } -static -int setup_frontend (int fe_fd, struct dvb_frontend_parameters *frontend) +static int setup_frontend (int fe_fd, struct dvb_frontend_parameters *frontend) { - struct dvb_frontend_info fe_info; + int ret; + uint32_t mstd; - if (ioctl(fe_fd, FE_GET_INFO, &fe_info) < 0) { - PERROR("ioctl FE_GET_INFO failed"); + if (check_frontend(fe_fd, FE_OFDM, &mstd) < 0) { + close(fe_fd); return -1; } - - if (fe_info.type != FE_OFDM) { - ERROR ("frontend device is not a OFDM (DVB-T) device"); + ret = dvbfe_set_delsys(fe_fd, SYS_DVBT); + if (ret) { + PERROR("SET Delsys failed"); return -1; } - if (silent < 2) fprintf (stderr,"tuning to %i Hz\n", frontend->frequency); @@ -373,7 +372,6 @@ int setup_frontend (int fe_fd, struct dvb_frontend_parameters *frontend) PERROR("ioctl FE_SET_FRONTEND failed"); return -1; } - return 0; } @@ -417,7 +415,7 @@ static void print_frontend_stats(int fe_fd, int human_readable) } static -int check_frontend (int fe_fd, int human_readable) +int monitor_frontend (int fe_fd, int human_readable) { fe_status_t status; do { @@ -593,7 +591,7 @@ int main(int argc, char **argv) if (parse (confname, channel, &frontend_param, &vpid, &apid, &sid)) return -1; - if ((frontend_fd = open(FRONTEND_DEV, O_RDWR)) < 0) { + if ((frontend_fd = open(FRONTEND_DEV, O_RDWR | O_NONBLOCK)) < 0) { PERROR ("failed opening '%s'", FRONTEND_DEV); return -1; } @@ -678,7 +676,7 @@ int main(int argc, char **argv) print_frontend_stats(frontend_fd, human_readable); } else { just_the_frontend_dude: - check_frontend(frontend_fd, human_readable); + monitor_frontend(frontend_fd, human_readable); } close(pat_fd); diff --git a/util/szap/util.c b/util/szap/util.c index 99d303a..60de8f8 100644 --- a/util/szap/util.c +++ b/util/szap/util.c @@ -23,6 +23,7 @@ #include <unistd.h> #include <stdio.h> #include <errno.h> +#include <stdint.h> #include <sys/ioctl.h> #include <sys/types.h> @@ -121,3 +122,226 @@ int get_pmt_pid(char *dmxdev, int sid) close(patfd); return pmt_pid; } + +char *type_str[] = { + "QPSK", + "QAM", + "OFDM", + "ATSC", +}; + +/* to be used with v3 drivers */ +int check_frontend_v3(int fd, enum fe_type type) +{ + struct dvb_frontend_info info; + int ret; + + ret = ioctl(fd, FE_GET_INFO, &info); + if (ret < 0) { + perror("ioctl FE_GET_INFO failed"); + close(fd); + ret = -1; + goto exit; + } + if (info.type != type) { + fprintf(stderr, "Not a valid %s device!\n", type_str[type]); + close(fd); + ret = -EINVAL; + goto exit; + } +exit: + return ret; +} + +char *del_str[] = { + "UNDEFINED", + "DVB-C (A)", + "DVB-C (B)", + "DVB-T", + "DSS", + "DVB-S", + "DVB-S2", + "DVB-H", + "ISDB-T", + "ISDB-S", + "ISDB-C", + "ATSC", + "ATSC-M/H", + "DTMB", + "CMMB", + "DAB", + "DVB-T2", + "TURBO", + "QAM (C)", +}; + +static int map_delivery_mode(fe_type_t *type, enum fe_delivery_system delsys) +{ + switch (delsys) { + case SYS_DSS: + case SYS_DVBS: + case SYS_DVBS2: + case SYS_TURBO: + *type = FE_QPSK; + break; + case SYS_DVBT: + case SYS_DVBT2: + case SYS_DVBH: + case SYS_ISDBT: + *type = FE_OFDM; + break; + case SYS_DVBC_ANNEX_A: + case SYS_DVBC_ANNEX_C: + *type = FE_QAM; + break; + case SYS_ATSC: + case SYS_DVBC_ANNEX_B: + *type = FE_ATSC; + break; + default: + fprintf(stderr, "Delivery system unsupported, please report to linux-media ML\n"); + return -1; + } + return 0; +} + +int get_property(int fd, uint32_t pcmd, uint32_t *len, uint8_t *data) +{ + struct dtv_property p, *b; + struct dtv_properties cmd; + int ret; + + p.cmd = pcmd; + cmd.num = 1; + cmd.props = &p; + b = &p; + + ret = ioctl(fd, FE_GET_PROPERTY, &cmd); + if (ret < 0) { + fprintf(stderr, "FE_SET_PROPERTY returned %d\n", ret); + return -1; + } + memcpy(len, &b->u.buffer.len, sizeof (uint32_t)); + memcpy(data, b->u.buffer.data, *len); + return 0; +} + +int set_property(int fd, uint32_t cmd, uint32_t data) +{ + struct dtv_property p, *b; + struct dtv_properties c; + int ret; + + p.cmd = cmd; + c.num = 1; + c.props = &p; + b = &p; + b->u.data = data; + ret = ioctl(fd, FE_SET_PROPERTY, &c); + if (ret < 0) { + fprintf(stderr, "FE_SET_PROPERTY returned %d\n", ret); + return -1; + } + return 0; +} + +int dvbfe_get_delsys(int fd, fe_delivery_system_t *delsys) +{ + uint32_t len; + /* Buggy API design */ + return get_property(fd, DTV_DELIVERY_SYSTEM, &len, (uint8_t *)delsys); +} + +int dvbfe_set_delsys(int fd, enum fe_delivery_system delsys) +{ + return set_property(fd, DTV_DELIVERY_SYSTEM, delsys); +} + +int dvbfe_enum_delsys(int fd, uint32_t *len, uint8_t *data) +{ + return get_property(fd, DTV_ENUM_DELSYS, len, data); +} + +int dvbfe_get_version(int fd, int *major, int *minor) +{ + struct dtv_property p, *b; + struct dtv_properties cmd; + int ret; + + p.cmd = DTV_API_VERSION; + cmd.num = 1; + cmd.props = &p; + b = &p; + + ret = ioctl(fd, FE_GET_PROPERTY, &cmd); + if (ret < 0) { + fprintf(stderr, "FE_GET_PROPERTY failed, ret=%d\n", ret); + return -1; + } + *major = (b->u.data >> 8) & 0xff; + *minor = b->u.data & 0xff; + return 0; +} + +int check_frontend_multi(int fd, enum fe_type type, uint32_t *mstd) +{ + int ret; + + enum fe_type delmode; + unsigned int i, valid_delsys = 0; + uint32_t len; + uint8_t data[32]; + + ret = dvbfe_enum_delsys(fd, &len, data); + if (ret) { + fprintf(stderr, "enum_delsys failed, ret=%d\n", ret); + ret = -EIO; + goto exit; + } + fprintf(stderr, "\t FE_CAN { "); + for (i = 0; i < len; i++) { + if (i < len - 1) + fprintf(stderr, "%s + ", del_str[data[i]]); + else + fprintf(stderr, "%s", del_str[data[i]]); + } + fprintf(stderr, " }\n"); + /* check whether frontend can support our delivery */ + for (i = 0; i < len; i++) { + map_delivery_mode(&delmode, data[i]); + if (type == delmode) { + valid_delsys = 1; + ret = 0; + break; + } + } + if (!valid_delsys) { + fprintf(stderr, "Not a valid %s device!\n", type_str[type]); + ret = -EINVAL; + goto exit; + } + *mstd = len; /* mstd has supported delsys count */ +exit: + return ret; +} + +int check_frontend(int fd, enum fe_type type, uint32_t *mstd) +{ + int major, minor, ret; + + ret = dvbfe_get_version(fd, &major, &minor); + if (ret) + goto exit; + fprintf(stderr, "Version: %d.%d ", major, minor); + if ((major == 5) && (minor > 8)) { + ret = check_frontend_multi(fd, type, mstd); + if (ret) + goto exit; + } else { + ret = check_frontend_v3(fd, type); + if (ret) + goto exit; + } +exit: + return ret; +} diff --git a/util/szap/util.h b/util/szap/util.h index f4b7f12..b82fdc5 100644 --- a/util/szap/util.h +++ b/util/szap/util.h @@ -22,3 +22,7 @@ int set_pesfilter(int dmxfd, int pid, int pes_type, int dvr); int get_pmt_pid(char *dmxdev, int sid); + +int check_frontend(int fd, enum fe_type type, uint32_t *mstd); + +int dvbfe_set_delsys(int fd, enum fe_delivery_system delsys); |