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: 9379111 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DC3FD600CA for ; Mon, 17 Oct 2016 12:25:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CC06329241 for ; Mon, 17 Oct 2016 12:25:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C0BE729245; Mon, 17 Oct 2016 12:25:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1995E29241 for ; Mon, 17 Oct 2016 12:25:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933932AbcJQMZY (ORCPT ); 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 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-Virus-Scanned: ClamAV using ClamSMTP 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: