From patchwork Wed Oct 8 12:09:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akihiro TSUKADA X-Patchwork-Id: 5053391 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 47F5FC11AC for ; Wed, 8 Oct 2014 12:10:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3B6A5201DD for ; Wed, 8 Oct 2014 12:10:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 00B96201CD for ; Wed, 8 Oct 2014 12:10:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756397AbaJHMKZ (ORCPT ); Wed, 8 Oct 2014 08:10:25 -0400 Received: from mail-pa0-f43.google.com ([209.85.220.43]:61408 "EHLO mail-pa0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756912AbaJHMKY (ORCPT ); Wed, 8 Oct 2014 08:10:24 -0400 Received: by mail-pa0-f43.google.com with SMTP id lf10so9005606pab.2 for ; Wed, 08 Oct 2014 05:10:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ljw6WcoCJent13Pzr3Cu3vMsYpFfa5CL+y++TmYdD78=; b=LdVjxJm3z4YmTN2S+NF78nHLfi3u/JYbee1+qkLf1938B+oPae4Cwxn27FfxC9YxqV UsqSqvvalbRUeLClCNcwmeO2Z7ldSk3ESNuTSx9AwQkhVXatfZR02jf7KrkfKOs9kOUU 7BWw8Q2b4GJhsdil7bGcTffRw5mVvBSN4uQJ8OEtdl0zQPsPAqDkG6c8Tl1dGDBHeGtX arODMXmDQVEP6uF/3mWBgUTbjdUm1vDHMrpQBHR8N1ePA4oESqmTS8DAqcdLDUGJqnpC czUFoUxPFWwap2T6T9Rn4HxfVwR9N+kyD1c3OeVfpKOR+snodDR4opKusHquDG+DCErH SZyw== X-Received: by 10.70.16.2 with SMTP id b2mr10376450pdd.36.1412770223991; Wed, 08 Oct 2014 05:10:23 -0700 (PDT) Received: from seabird.localdomain.localdomain (softbank219203027033.bbtec.net. [219.203.27.33]) by mx.google.com with ESMTPSA id g1sm16426666pdh.12.2014.10.08.05.10.21 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 08 Oct 2014 05:10:23 -0700 (PDT) From: tskd08@gmail.com To: linux-media@vger.kernel.org Cc: m.chehab@samsung.com Subject: [PATCH 4/4] v4l-utils/dvbv5-scan: add support for ISDB-S scanning Date: Wed, 8 Oct 2014 21:09:41 +0900 Message-Id: <1412770181-5420-5-git-send-email-tskd08@gmail.com> X-Mailer: git-send-email 2.1.2 In-Reply-To: <1412770181-5420-1-git-send-email-tskd08@gmail.com> References: <1412770181-5420-1-git-send-email-tskd08@gmail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Akihiro Tsukada Signed-off-by: Akihiro Tsukada --- utils/dvb/dvb-format-convert.c | 3 ++- utils/dvb/dvbv5-scan.c | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/utils/dvb/dvb-format-convert.c b/utils/dvb/dvb-format-convert.c index 4f0e075..bf37945 100644 --- a/utils/dvb/dvb-format-convert.c +++ b/utils/dvb/dvb-format-convert.c @@ -125,7 +125,8 @@ int main(int argc, char **argv) fprintf(stderr, "ERROR: Please specify a valid output file\n"); missing = 1; } else if (((args.input_format == FILE_ZAP) || - (args.output_format == FILE_ZAP)) && args.delsys <= 0) { + (args.output_format == FILE_ZAP)) && + (args.delsys <= 0 || args.delsys == SYS_ISDBS)) { fprintf(stderr, "ERROR: Please specify a valid delivery system for ZAP format\n"); missing = 1; } diff --git a/utils/dvb/dvbv5-scan.c b/utils/dvb/dvbv5-scan.c index cdc82ec..0ef95f3 100644 --- a/utils/dvb/dvbv5-scan.c +++ b/utils/dvb/dvbv5-scan.c @@ -251,6 +251,16 @@ static int run_scan(struct arguments *args, if (dvb_retrieve_entry_prop(entry, DTV_POLARIZATION, &pol)) pol = POLARIZATION_OFF; + if (parms->current_sys == SYS_ISDBS) { + uint32_t tsid = 0; + + dvb_store_entry_prop(entry, DTV_POLARIZATION, POLARIZATION_R); + + dvb_retrieve_entry_prop(entry, DTV_STREAM_ID, &tsid); + if (!dvb_new_ts_is_needed(dvb_file->first_entry, entry, + freq, shift, tsid)) + continue; + } else if (!dvb_new_freq_is_needed(dvb_file->first_entry, entry, freq, pol, shift)) continue; @@ -258,6 +268,10 @@ static int run_scan(struct arguments *args, count++; dvb_log("Scanning frequency #%d %d", count, freq); + if (!args->lnb_name && entry->lnb && + (!parms->lnb || strcasecmp(entry->lnb, parms->lnb->alias))) + parms->lnb = dvb_sat_get_lnb(dvb_sat_search_lnb(entry->lnb)); + /* * Run the scanning logic */