From: Markus Heiser <markus.heiser@darmarit.de>
To: Mauro Carvalho Chehab <mchehab@infradead.org>,
Chris Mayo <aklhfex@gmail.com>
Cc: Markus Heiser <markus.heiser@darmarit.de>,
Linux Media Mailing List <linux-media@vger.kernel.org>
Subject: [PATCH 2/2] libdvbv5: Improve vdr format output for DVB-T(2)
Date: Mon, 17 Oct 2016 14:24:32 +0200 [thread overview]
Message-ID: <1476707072-21985-3-git-send-email-markus.heiser@darmarit.de> (raw)
In-Reply-To: <1476707072-21985-1-git-send-email-markus.heiser@darmarit.de>
From: Chris Mayo <aklhfex@gmail.com>
Before (1.10.1):
BBC TWO:498000:S0B8C23D12I999M64T8G32Y0:T:27500:201:202,206:0:0:4287:0:0:0
BBC TWO HD:474167:S1B8C23D999I999M256T32G128Y0:T:27500:101:102,106:0:0:17472:0:0:0
After:
BBC TWO:498000:B8C23D12G32I999M64S0T8Y0:T:0:201:202,206:0:0:4287:0:0:0
BBC TWO HD:474167:B8C23D999G128I999M256S1T32Y0:T:27500:101:102,106:0:0:17472:0:0:0
channels.conf (vdr 2.2.0):
BBC TWO:498000000:B8C23D12G32M64S0T8Y0:T:0:201=2:202=eng@3,206=eng@3:0;205=eng:0:4287:9018:4163:0
BBC TWO HD:474166670:C23G128M256P0Q16436S1T32X1Y0:T:27500:101=27:102=eng@17,106=eng@17:0;105=eng:0:17472:9018:16515:0
Signed-off-by: Chris Mayo <aklhfex@gmail.com>
---
lib/libdvbv5/dvb-vdr-format.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/lib/libdvbv5/dvb-vdr-format.c b/lib/libdvbv5/dvb-vdr-format.c
index ab0e5cf..3d09237 100644
--- a/lib/libdvbv5/dvb-vdr-format.c
+++ b/lib/libdvbv5/dvb-vdr-format.c
@@ -198,26 +198,26 @@ static const struct dvb_parse_table sys_dvbs2_table[] = {
};
static const struct dvb_parse_table sys_dvbt_table[] = {
- { DTV_DELIVERY_SYSTEM, PTABLE(vdr_parse_delivery_system) },
{ DTV_BANDWIDTH_HZ, PTABLE(vdr_parse_bandwidth) },
{ DTV_CODE_RATE_HP, PTABLE(vdr_parse_code_rate_hp) },
{ DTV_CODE_RATE_LP, PTABLE(vdr_parse_code_rate_lp) },
+ { DTV_GUARD_INTERVAL, PTABLE(vdr_parse_guard_interval) },
{ DTV_INVERSION, PTABLE(vdr_parse_inversion) },
{ DTV_MODULATION, PTABLE(vdr_parse_modulation) },
+ { DTV_DELIVERY_SYSTEM, PTABLE(vdr_parse_delivery_system) },
{ DTV_TRANSMISSION_MODE, PTABLE(vdr_parse_trans_mode) },
- { DTV_GUARD_INTERVAL, PTABLE(vdr_parse_guard_interval) },
{ DTV_HIERARCHY, PTABLE(vdr_parse_hierarchy) },
};
static const struct dvb_parse_table sys_dvbt2_table[] = {
- { DTV_DELIVERY_SYSTEM, PTABLE(vdr_parse_delivery_system) },
{ DTV_BANDWIDTH_HZ, PTABLE(vdr_parse_bandwidth) },
{ DTV_CODE_RATE_HP, PTABLE(vdr_parse_code_rate_hp) },
{ DTV_CODE_RATE_LP, PTABLE(vdr_parse_code_rate_lp) },
+ { DTV_GUARD_INTERVAL, PTABLE(vdr_parse_guard_interval) },
{ DTV_INVERSION, PTABLE(vdr_parse_inversion) },
{ DTV_MODULATION, PTABLE(vdr_parse_modulation) },
+ { DTV_DELIVERY_SYSTEM, PTABLE(vdr_parse_delivery_system) },
{ DTV_TRANSMISSION_MODE, PTABLE(vdr_parse_trans_mode) },
- { DTV_GUARD_INTERVAL, PTABLE(vdr_parse_guard_interval) },
{ DTV_HIERARCHY, PTABLE(vdr_parse_hierarchy) },
/* DVB-T2 specifics */
{ DTV_STREAM_ID, NULL, },
@@ -378,6 +378,9 @@ int dvb_write_format_vdr(const char *fname,
/* Output symbol rate */
srate = 27500000;
switch(delsys) {
+ case SYS_DVBT:
+ srate = 0;
+ break;
case SYS_DVBS:
case SYS_DVBS2:
case SYS_DVBC_ANNEX_A:
--
2.7.4
prev parent reply other threads:[~2016-10-17 12:25 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-10 9:52 [PATCH 0/2] v4l-utils build instruction and dvbv5 format Markus Heiser
2016-08-10 9:52 ` [PATCH 1/2] v4l-utils: add comments to the build instructions Markus Heiser
2016-08-10 9:52 ` [PATCH 2/2] v4l-utils: fixed dvbv5 vdr format Markus Heiser
2016-08-16 7:10 ` Markus Heiser
2016-08-22 9:53 ` Markus Heiser
2016-08-24 14:49 ` Mauro Carvalho Chehab
2016-08-24 14:52 ` Mauro Carvalho Chehab
2016-09-05 13:13 ` Markus Heiser
2016-09-05 13:25 ` Mauro Carvalho Chehab
2016-09-05 19:01 ` Chris Mayo
2016-09-06 9:41 ` Mauro Carvalho Chehab
2016-09-06 15:16 ` VDR User
2016-09-06 15:47 ` Mauro Carvalho Chehab
2016-09-07 9:51 ` Markus Heiser
2016-09-07 17:59 ` VDR User
2016-09-08 7:15 ` Markus Heiser
2016-09-08 15:59 ` VDR User
2016-09-08 18:33 ` Mauro Carvalho Chehab
2016-10-17 12:24 ` [PATCH 0/2] " Markus Heiser
2016-10-17 12:24 ` [PATCH 1/2] " Markus Heiser
2016-10-17 12:24 ` Markus Heiser [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1476707072-21985-3-git-send-email-markus.heiser@darmarit.de \
--to=markus.heiser@darmarit.de \
--cc=aklhfex@gmail.com \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox