From patchwork Mon Oct 17 12:24:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Heiser X-Patchwork-Id: 37631 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bw6yu-0005p7-Fa; Mon, 17 Oct 2016 12:25:28 +0000 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.84_2/mailfrontend-8) with esmtp id 1bw6yr-0002DJ-mM; Mon, 17 Oct 2016 14:25:28 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933932AbcJQMZY (ORCPT + 1 other); Mon, 17 Oct 2016 08:25:24 -0400 Received: from smtp1.goneo.de ([85.220.129.30]:44312 "EHLO smtp1.goneo.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932747AbcJQMZV (ORCPT ); Mon, 17 Oct 2016 08:25:21 -0400 Received: from localhost (localhost [127.0.0.1]) by smtp1.goneo.de (Postfix) with ESMTP id C022823F169; Mon, 17 Oct 2016 14:25:18 +0200 (CEST) X-Virus-Scanned: by goneo X-Spam-Flag: NO X-Spam-Score: -2.646 X-Spam-Level: X-Spam-Status: No, score=-2.646 tagged_above=-999 tests=[ALL_TRUSTED=-1, AWL=0.254, BAYES_00=-1.9] autolearn=unavailable Received: from smtp1.goneo.de ([127.0.0.1]) by localhost (smtp1.goneo.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KfHViOVyNhlI; Mon, 17 Oct 2016 14:24:42 +0200 (CEST) Received: from ubu1604.multi.box (host-091-097-249-121.ewe-ip-backbone.de [91.97.249.121]) by smtp1.goneo.de (Postfix) with ESMTPSA id E81E02421BF; Mon, 17 Oct 2016 14:24:39 +0200 (CEST) From: Markus Heiser To: Mauro Carvalho Chehab , Chris Mayo Cc: Markus Heiser , Linux Media Mailing List Subject: [PATCH 2/2] libdvbv5: Improve vdr format output for DVB-T(2) Date: Mon, 17 Oct 2016 14:24:32 +0200 Message-Id: <1476707072-21985-3-git-send-email-markus.heiser@darmarit.de> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1476707072-21985-1-git-send-email-markus.heiser@darmarit.de> References: <7C627C3A-DF3F-4E50-9876-7130D9221D96@darmarit.de> <1476707072-21985-1-git-send-email-markus.heiser@darmarit.de> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2016.10.17.121816 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_2000_2999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, IN_REP_TO 0, LEGITIMATE_NEGATE 0, LEGITIMATE_SIGNS 0, MSG_THREAD 0, MULTIPLE_REAL_RCPTS 0, NO_URI_HTTPS 0, REFERENCES 0, SINGLE_URI_IN_BODY 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CC_NAME 0, __CC_NAME_DIFF_FROM_ACC 0, __CC_REAL_NAMES 0, __CP_URI_IN_BODY 0, __FRAUD_BODY_WEBMAIL 0, __FRAUD_WEBMAIL 0, __FROM_DOMAIN_IN_ANY_CC2 0, __FROM_DOMAIN_IN_RCPT 0, __HAS_CC_HDR 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __LINES_OF_YELLING 0, __MIME_TEXT_ONLY 0, __MIME_TEXT_P 0, __MIME_TEXT_P1 0, __MULTIPLE_RCPTS_CC_X2 0, __REFERENCES 0, __RUS_OBFU_PHONE 0, __SANE_MSGID 0, __SINGLE_URI_TEXT 0, __TO_MALFORMED_2 0, __TO_NAME 0, __TO_NAME_DIFF_FROM_ACC 0, __TO_REAL_NAMES 0, __URI_IN_BODY 0, __URI_NO_WWW 0, __URI_NS , __URI_WITH_PATH 0' From: Chris Mayo 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 --- 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: