Merge tag 'upstream/0+git20130622.edc0bc3'

Upstream version 0+git20130622.edc0bc3

15 files changed, 164 insertions, 46 deletions

diff --git a/dvb-t/at-All b/dvb-t/at-All
new file mode 100644
index 0000000..5d179eb
--- /dev/null
+++ b/dvb-t/at-All
@@ -0,0 +1,53 @@
+# Austria, all DVB-T transmitters run by ORS
+# Created from
+# http://www.ors.at/fileadmin/user_upload/downloads/DVB-T_Kanalbezeichnungen_und_Mittenfrequenzen.pdf
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 474000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 482000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 490000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 498000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 506000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 514000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 522000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 530000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 538000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 546000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 554000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 562000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 570000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 578000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 578000000 8MHz 3/4 NONE QAM16 8k 1/8 NONE
+T 586000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 594000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 602000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 610000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 618000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 626000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 634000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 642000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 650000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 658000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 666000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 674000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 682000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 690000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 698000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 706000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 714000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 722000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 730000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 738000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 746000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 754000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 762000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 770000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 778000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 786000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 794000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 802000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 810000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 826000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 834000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 842000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 850000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 858000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
diff --git a/dvb-t/at-Official b/dvb-t/at-Official
deleted file mode 100644
index cdb221c..0000000
--- a/dvb-t/at-Official
+++ /dev/null
@@ -1,24 +0,0 @@
-# Austria, all DVB-T transmitters run by ORS
-# Created from http://www.ors.at/view08/ors.php?mid=94
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 474000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 490000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 498000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 514000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 522000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 530000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 538000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 546000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 554000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 562000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 578000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 578000000 8MHz 3/4 NONE QAM16 8k 1/8 NONE
-T 594000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 602000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 610000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 634000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 650000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 666000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 698000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 722000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 754000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
diff --git a/dvb-t/bg-Sofia b/dvb-t/bg-Sofia
new file mode 100644
index 0000000..82cc037
--- /dev/null
+++ b/dvb-t/bg-Sofia
@@ -0,0 +1,16 @@
+#------------------------------------------------------------------------------
+# file automatically generated by w_scan
+# (http://wirbel.htpc-forum.de/w_scan/index2.html)
+#! <w_scan> 20130331 1 0 TERRESTRIAL BG </w_scan>
+#------------------------------------------------------------------------------
+# location and provider: Sofia
+# date (yyyy-mm-dd)    : 2013-05-13
+# provided by (opt)    : v.lalov@gmail.com
+#
+# T[2] [plp_id] [system_id] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [# comment]
+#------------------------------------------------------------------------------
+T 490000000 8MHz  2/3 NONE    QAM64   8k  1/4 NONE      # NURTS Digital
+T 626000000 8MHz  2/3 NONE    QAM64   8k  1/4 NONE      # NURTS Digital
+T 722000000 8MHz  2/3 NONE    QAM64   8k  1/4 NONE      # First Digital
+T 818000000 8MHz  2/3 NONE    QAM16   8k 1/16 NONE      # NURTS
+ 
diff --git a/dvb-t/fr-All b/dvb-t/fr-All
new file mode 100644
index 0000000..77c77d5
--- /dev/null
+++ b/dvb-t/fr-All
@@ -0,0 +1,42 @@
+# France ALL (All channel 21 to 60)
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 474000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 21
+T 482000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 22
+T 490000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 23
+T 498000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 24
+T 506000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 25
+T 514000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 26
+T 522000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 27
+T 530000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 28
+T 538000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 29
+T 546000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 30
+T 554000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 31
+T 562000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 32
+T 570000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 33
+T 578000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 34
+T 586000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 35
+T 594000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 36
+T 602000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 37
+T 610000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 38
+T 618000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 39
+T 626000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 40
+T 634000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 41
+T 642000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 42
+T 650000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 43
+T 658000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 44
+T 666000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 45
+T 674000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 46
+T 682000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 47
+T 690000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 48
+T 698000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 49
+T 706000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 50
+T 714000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 51
+T 722000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 52
+T 730000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 53
+T 738000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 54
+T 746000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 55
+T 754000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 56
+T 762000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 57
+T 770000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 58
+T 778000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 59
+T 786000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 60
diff --git a/dvb-t/fr-Bordeaux b/dvb-t/fr-Bordeaux
deleted file mode 100644
index 5efba4e..0000000
--- a/dvb-t/fr-Bordeaux
+++ /dev/null
@@ -1,9 +0,0 @@
-# Bordeaux - France (DVB-T transmitter of Bouliac or Cauderan)
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 482000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/dvb-t/ru-Krasnodar b/dvb-t/ru-Krasnodar
new file mode 100644
index 0000000..51d58d0
--- /dev/null
+++ b/dvb-t/ru-Krasnodar
@@ -0,0 +1,6 @@
+# Russia, Krasnodar
+# std freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy plp_id
+T2 618000000 8MHz 4/5 NONE QAM64 32k AUTO NONE 0
+T2 618000000 8MHz 4/5 NONE QAM64 32k AUTO NONE 1
+T2 618000000 8MHz 4/5 NONE QAM64 32k AUTO NONE 2
+T2 618000000 8MHz 4/5 NONE QAM64 32k AUTO NONE 3
diff --git a/dvb-t/ru-Novosibirsk b/dvb-t/ru-Novosibirsk
new file mode 100644
index 0000000..443c7e4
--- /dev/null
+++ b/dvb-t/ru-Novosibirsk
@@ -0,0 +1,6 @@
+# Russia, Novosibirsk
+# std freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy plp_id
+T2 530000000 8MHz 4/5 NONE QAM64 32k AUTO NONE 0
+T2 530000000 8MHz 4/5 NONE QAM64 32k AUTO NONE 1
+T2 530000000 8MHz 4/5 NONE QAM64 32k AUTO NONE 2
+T2 530000000 8MHz 4/5 NONE QAM64 32k AUTO NONE 3
diff --git a/dvb-t/ru-Volgodonsk b/dvb-t/ru-Volgodonsk
new file mode 100644
index 0000000..2089a70
--- /dev/null
+++ b/dvb-t/ru-Volgodonsk
@@ -0,0 +1,6 @@
+# Russia, Volgodonsk
+# std freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy plp_id
+T2 650000000 8MHz 4/5 NONE QAM64 32k AUTO NONE 0
+T2 650000000 8MHz 4/5 NONE QAM64 32k AUTO NONE 1
+T2 650000000 8MHz 4/5 NONE QAM64 32k AUTO NONE 2
+T2 650000000 8MHz 4/5 NONE QAM64 32k AUTO NONE 3
diff --git a/dvb-t/tw-All b/dvb-t/tw-All
new file mode 100644
index 0000000..8290355
--- /dev/null
+++ b/dvb-t/tw-All
@@ -0,0 +1,11 @@
+T 533000000 6MHz 2/3 NONE QAM16 8k 1/4 NONE
+T 539000000 6MHz 2/3 NONE QAM16 8k 1/4 NONE
+T 545000000 6MHz 2/3 NONE QAM16 8k 1/4 NONE
+T 551000000 6MHz 2/3 NONE QAM16 8k 1/4 NONE
+T 557000000 6MHz 2/3 NONE QAM16 8k 1/4 NONE
+T 563000000 6MHz 2/3 NONE QAM16 8k 1/4 NONE
+T 569000000 6MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 575000000 6MHz 2/3 NONE QAM16 8k 1/4 NONE
+T 581000000 6MHz 2/3 NONE QAM16 8k 1/4 NONE
+T 587000000 6MHz 2/3 NONE QAM16 8k 1/4 NONE
+T 593000000 6MHz 2/3 NONE QAM16 8k 1/4 NONE
diff --git a/dvb-t/tw-Kaohsiung b/dvb-t/tw-Kaohsiung
deleted file mode 100644
index f1eabc9..0000000
--- a/dvb-t/tw-Kaohsiung
+++ /dev/null
@@ -1,6 +0,0 @@
-# Taiwan - Kaohsiung, southern Taiwan
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 545000000 6MHz 2/3 NONE QAM16 8k 1/4 NONE
-T 545000000 6MHz 2/3 NONE QAM16 8k 1/8 NONE
-T 557000000 6MHz 2/3 NONE QAM16 8k 1/4 NONE
-T 557000000 6MHz 2/3 NONE QAM16 8k 1/8 NONE
diff --git a/dvb-t/tw-Taipei b/dvb-t/tw-Taipei
deleted file mode 100644
index 3bba686..0000000
--- a/dvb-t/tw-Taipei
+++ /dev/null
@@ -1,7 +0,0 @@
-# Taiwan - Taipei, northern Taiwan
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 533000000 6MHz 1/2 NONE QAM16 8k 1/8 NONE
-T 545000000 6MHz 2/3 NONE QAM16 8k 1/8 NONE
-T 557000000 6MHz 2/3 NONE QAM16 8k 1/4 NONE
-T 581000000 6MHz 2/3 NONE QAM16 8k 1/4 NONE
-T 593000000 6MHz 2/3 NONE QAM16 8k 1/4 NONE
diff --git a/dvb-t/ua-Kharkov b/dvb-t/ua-Kharkov
new file mode 100644
index 0000000..c206c90
--- /dev/null
+++ b/dvb-t/ua-Kharkov
@@ -0,0 +1,6 @@
+# Ukraine, Kharkov
+# std freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy plp_id
+T2 554000000 8MHz 3/5 NONE QAM256 32k 1/16 NONE
+T2 586000000 8MHz 3/5 NONE QAM256 32k 1/16 NONE
+T2 690000000 8MHz 3/5 NONE QAM256 32k 1/16 NONE
+T2 770000000 8MHz 3/5 NONE QAM256 32k 1/16 NONE
diff --git a/dvb-t/ua-Kiev b/dvb-t/ua-Kiev
new file mode 100644
index 0000000..6db2d56
--- /dev/null
+++ b/dvb-t/ua-Kiev
@@ -0,0 +1,6 @@
+# Ukraine, Kiev
+# std freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy plp_id
+T2 526000000 8MHz 3/5 NONE QAM256 32k 1/16 NONE
+T2 538000000 8MHz 3/5 NONE QAM256 32k 1/16 NONE
+T2 554000000 8MHz 3/5 NONE QAM256 32k 1/16 NONE
+T2 698000000 8MHz 3/5 NONE QAM256 32k 1/16 NONE
diff --git a/dvb-t/ua-Lozovaya b/dvb-t/ua-Lozovaya
new file mode 100644
index 0000000..a0bfc09
--- /dev/null
+++ b/dvb-t/ua-Lozovaya
@@ -0,0 +1,6 @@
+# Ukraine, Lozovaya
+# std freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy plp_id
+T2 554000000 8MHz 3/5 NONE QAM256 32k 1/16 NONE
+T2 746000000 8MHz 3/5 NONE QAM256 32k 1/16 NONE
+T2 754000000 8MHz 3/5 NONE QAM256 32k 1/16 NONE
+T2 778000000 8MHz 3/5 NONE QAM256 32k 1/16 NONE
diff --git a/dvb-t/ua-Odessa b/dvb-t/ua-Odessa
new file mode 100644
index 0000000..2420279
--- /dev/null
+++ b/dvb-t/ua-Odessa
@@ -0,0 +1,6 @@
+# Ukraine, Odessa
+# std freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy plp_id
+T2 490000000 8MHz 3/5 NONE QAM256 32k 1/16 NONE
+T2 562000000 8MHz 3/5 NONE QAM256 32k 1/16 NONE
+T2 618000000 8MHz 3/5 NONE QAM256 32k 1/16 NONE
+T2 650000000 8MHz 3/5 NONE QAM256 32k 1/16 NONE