All of lore.kernel.org
 help / color / mirror / Atom feed
From: Chris Mayo <aklhfex@gmail.com>
To: linux-media@vger.kernel.org
Subject: [v4l-utils PATCH] libdvbv5: Improve vdr format output for DVB-T(2)
Date: Sat, 30 Jul 2016 18:14:47 +0100	[thread overview]
Message-ID: <CAHTui8JpvDW5_qUM=5duQ-4uu8kJTfG+=ksQ_J6aY5NMdQg1wA@mail.gmail.com> (raw)

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 | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/lib/libdvbv5/dvb-vdr-format.c b/lib/libdvbv5/dvb-vdr-format.c
index a4bd26b..4377c81 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, },
@@ -367,6 +367,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:
@@ -407,8 +410,8 @@ int dvb_write_format_vdr(const char *fname,
  /* Output Service ID */
  fprintf(fp, "%d:", entry->service_id);

- /* Output SID, NID, TID and RID */
- fprintf(fp, "0:0:0:");
+ /* Output NID, TID and RID */
+ fprintf(fp, "0:0:0");

  fprintf(fp, "\n");
  line++;
-- 
2.7.3

                 reply	other threads:[~2016-07-30 17:14 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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='CAHTui8JpvDW5_qUM=5duQ-4uu8kJTfG+=ksQ_J6aY5NMdQg1wA@mail.gmail.com' \
    --to=aklhfex@gmail.com \
    --cc=linux-media@vger.kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.