This is an automatic generated email to let you know that the following patch were queued at the http://git.linuxtv.org/cgit.cgi/v4l-utils.git tree:
Subject: v4l-utils: fixed dvbv5 vdr format Author: Markus Heiser <markus.hei...@darmarit.de> Date: Mon Oct 17 14:24:31 2016 +0200 From: Heiser, Markus <markus.hei...@darmarit.de> The vdr format was broken, I got '(null)' entries HD:11494:S1HC23I0M5N1O35:S:(null):22000:5101:5102,5103,5106,5108:0:0:10301:0:0:0: 0-:1----:2--------------:3:4-----: refering to the VDR Wikis ... * LinuxTV: http://www.linuxtv.org/vdrwiki/index.php/Syntax_of_channels.conf * german comunity Wiki: http://www.vdr-wiki.de/wiki/index.php/Channels.conf#Parameter_ab_VDR-1.7.4 There is no field at position 4 / in between "Source" and "SRate" which might have a value. I suppose the '(null):' is the result of pointing to *nothing*. An other mistake is the ending colon (":") at the line. It is not explicit specified but adding an collon to the end of an channel entry will prevent players (like mpv or mplayer) from parsing the line (they will ignore these lines). At least: generating a channel list with dvbv5-scan --output-format=vdr ... will result in the same defective channel entry, containing "(null):" and the leading collon ":". Signed-off-by: Markus Heiser <markus.hei...@darmarit.de> Signed-off-by: Mauro Carvalho Chehab <mche...@s-opensource.com> lib/libdvbv5/dvb-vdr-format.c | 45 +++++++++++++++++++++++++++++-------------- 1 file changed, 31 insertions(+), 14 deletions(-) --- http://git.linuxtv.org/cgit.cgi/v4l-utils.git/commit/?id=a32ac13830412f2eefed673cb9a48e01fddb9a17 diff --git a/lib/libdvbv5/dvb-vdr-format.c b/lib/libdvbv5/dvb-vdr-format.c index a4bd26ba5a69..ab0e5cf333e3 100644 --- a/lib/libdvbv5/dvb-vdr-format.c +++ b/lib/libdvbv5/dvb-vdr-format.c @@ -309,13 +309,14 @@ int dvb_write_format_vdr(const char *fname, fprintf(fp, "%s", entry->channel); if (entry->vchannel) fprintf(fp, ",%s", entry->vchannel); + fprintf(fp, ":"); /* * Output frequency: * in kHz for terrestrial/cable * in MHz for satellite */ - fprintf(fp, ":%i:", freq / 1000); + fprintf(fp, "%i:", freq / 1000); /* Output modulation parameters */ fmt = &formats[i]; @@ -349,20 +350,30 @@ int dvb_write_format_vdr(const char *fname, fprintf(fp, "%s", table->table[data]); } - - /* Output format type */ - fprintf(fp, ":%s:", id); + fprintf(fp, ":"); /* - * Output satellite location - * FIXME: probably require some adjustments to match the - * format expected by VDR. + * Output sources configuration for VDR + * + * S (satellite) xy.z (orbital position in degrees) E or W (east or west) + * + * FIXME: in case of ATSC we use "A", this is what w_scan does */ - switch(delsys) { - case SYS_DVBS: - case SYS_DVBS2: - fprintf(fp, "%s:", entry->location); + + if (entry->location) { + switch(delsys) { + case SYS_DVBS: + case SYS_DVBS2: + fprintf(fp, "%s", entry->location); + break; + default: + fprintf(fp, "%s", id); + break; + } + } else { + fprintf(fp, "%s", id); } + fprintf(fp, ":"); /* Output symbol rate */ srate = 27500000; @@ -407,10 +418,16 @@ 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 Network ID */ + fprintf(fp, "0:"); - fprintf(fp, "\n"); + /* Output Transport Stream ID */ + fprintf(fp, "0:"); + + /* Output Radio ID + * this is the last entry, tagged bei a new line (not a colon!) + */ + fprintf(fp, "0\n"); line++; }; fclose (fp); _______________________________________________ linuxtv-commits mailing list linuxtv-commits@linuxtv.org https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
