Merge tag 'upstream/0+git20141009.d26b627'

Upstream version 0+git20141009.d26b627

1 files changed, 312 insertions, 26 deletions

diff --git a/dvb-t/hr-All b/dvb-t/hr-All
index 6561858..50c644a 100644
--- a/dvb-t/hr-All
+++ b/dvb-t/hr-All
@@ -2,29 +2,315 @@
 # Created from http://www.oiv.hr/broadcasting/tables/dtv_hr.aspx
 # and from http://www.oiv.hr/broadcasting/tables/dtv_channel_hr.aspx
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 474000000 8MHz 5/6 NONE QAM64 8k 1/4 NONE # D1 MUXD
-T 490000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D2 MUXA
-T 506000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D4 MUXA
-T 530000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D5 MUXA, D9 MUXD
-T 538000000 8MHz 5/6 NONE QAM64 8k 1/16 NONE # D5 MUXD
-T 538000000 8MHz 1/2 NONE QAM16 8k 1/8 NONE # d72 MUXD
-T 546000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D6 MUXA
-T 554000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D7 MUXD
-T 570000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D8 MUXA
-T 578000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D8 MUXD
-T 586000000 8MHz 1/2 NONE QAM16 8k 1/8 NONE # d71 MUXD
-T 594000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D3 MUXD
-T 610000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D1 MUXA
-T 618000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D2 MUXB
-T 642000000 8MHz 5/6 NONE QAM64 8k 1/4 NONE # D4 MUXD
-T 658000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D1 MUXB, D3 MUXA, D6 MUXB
-T 666000000 8MHz 5/6 NONE QAM64 8k 1/16 NONE # D5 MUXD
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # SLO MUXA
-T 690000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D3 MUXB, D4 MUXB
-T 714000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D7 MUXA, D9 MUXA
-T 730000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D5 MUXB, D8 MUXB
-T 738000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D6 MUXD
-T 762000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE # Tusti Vrh MUXD
-T 770000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D2 MUXD
-T 778000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D7 MUXB, D9 MUXB
-T 850000000 8MHz 5/6 NONE QAM64 8k 1/16 NONE # D5 MFN
+[D1 MUXD]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 474000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 5/6
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[D2 MUXA]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 490000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 3/4
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[D4 MUXA]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 506000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 3/4
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[D5 MUXA, D9 MUXD]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 530000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 3/4
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[D5 MUXD]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 538000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 5/6
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/16
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[d72 MUXD]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 538000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 1/2
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/16
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/8
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[D6 MUXA]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 546000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 3/4
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[D7 MUXD]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 554000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 3/4
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[D8 MUXA]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 570000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 3/4
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[D8 MUXD]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 578000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 3/4
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[d71 MUXD]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 586000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 1/2
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/16
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/8
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[D3 MUXD]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 594000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 3/4
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[D1 MUXA]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 610000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 3/4
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[D2 MUXB]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 618000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 3/4
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[D4 MUXD]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 642000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 5/6
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[D1 MUXB, D3 MUXA, D6 MUXB]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 658000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 3/4
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[D5 MUXD]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 666000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 5/6
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/16
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[SLO MUXA]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 666000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[D3 MUXB, D4 MUXB]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 690000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 3/4
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[D7 MUXA, D9 MUXA]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 714000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 3/4
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[D5 MUXB, D8 MUXB]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 730000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 3/4
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[D6 MUXD]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 738000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 3/4
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[Tusti Vrh MUXD]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 762000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 3/4
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/16
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[D2 MUXD]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 770000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 3/4
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[D7 MUXB, D9 MUXB]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 778000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 3/4
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[D5 MFN]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 850000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 5/6
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/16
+	HIERARCHY = NONE
+	INVERSION = AUTO
+