From 06e54ff221c2e3126a7dfbd63e9814431511b558 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <m.chehab@samsung.com>
Date: Fri, 5 Sep 2014 15:05:42 -0300
Subject: Convert existing tables to DVBv5 format

All comments were preserved on this conversion, thanks to a
temporary patch for libdvbv5.

Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
---
 dvb-t/au-Melbourne | 78 +++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 72 insertions(+), 6 deletions(-)

(limited to 'dvb-t/au-Melbourne')

diff --git a/dvb-t/au-Melbourne b/dvb-t/au-Melbourne
index 556739a4..e3963b1a 100644
--- a/dvb-t/au-Melbourne
+++ b/dvb-t/au-Melbourne
@@ -10,14 +10,80 @@
 # T[2] [plp_id] [system_id] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [# comment]
 #------------------------------------------------------------------------------
 # Seven Network
-T 177500000 7MHz AUTO AUTO QAM64 8k 1/16 NONE
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 177500000
+	BANDWIDTH_HZ = 7000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = AUTO
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/16
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
 # SBS Melbourne
-T 184500000 7MHz AUTO AUTO QAM64 8k 1/8 NONE
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 184500000
+	BANDWIDTH_HZ = 7000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = AUTO
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/8
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
 # Nine Network Australia
-T 191625000 7MHz AUTO AUTO QAM64 8k 1/16 NONE
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 191625000
+	BANDWIDTH_HZ = 7000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = AUTO
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/16
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
 # Network TEN
-T 219500000 7MHz AUTO AUTO QAM64 8k 1/16 NONE
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 219500000
+	BANDWIDTH_HZ = 7000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = AUTO
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/16
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
 # ABC Melbourne
-T 226500000 7MHz AUTO AUTO QAM64 8k 1/16 NONE
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 226500000
+	BANDWIDTH_HZ = 7000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = AUTO
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/16
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
 # C31
-T 557625000 7MHz AUTO AUTO QPSK 8k 1/16 NONE
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 557625000
+	BANDWIDTH_HZ = 7000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = AUTO
+	MODULATION = QPSK
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/16
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
-- 
cgit v1.2.3