From patchwork Wed Mar 28 15:03:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tobias Rapp X-Patchwork-Id: 8208 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp569805jad; Wed, 28 Mar 2018 08:04:24 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+ELAXwcsoBW6bBhHK/5ww2vvF9GBB9FJK36YJDfbk8HcXWY9nuJip1Pald9/VCYkW0Md5Z X-Received: by 10.223.196.132 with SMTP id m4mr3561657wrf.9.1522249464896; Wed, 28 Mar 2018 08:04:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522249464; cv=none; d=google.com; s=arc-20160816; b=JQC0kooXCakwmUTHLvaUNZjm2Cbht9P2SZ60vKMJ5yJsZExBFZL2Qhf3GXAU0CqrNX /GN1wDr1ft2rTRZSHyuSbDylU8Rlr1zC3P6DFe27zD252m/8/zn+RWH6yJ8Bx7iAbR2j TOUloTSuz2X2WE1eKgd1TNWVnR74Z7Fz8AmGf0Z1Xfu/QKGbHRY3OTWXZYoeQG4ydEhc OM1NTf++r7wvZPvOGusvPosymxbe57gHrGFBuR7oO+gf8K46CvUEe88k9fqTzNL69aYa UvvF0bPGcv3N+LgETWoXELPXmq6W/MTjc7nPWdlKZTYWCvKKDTB1D3PbPRkt0L8QDHAY cslw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to:arc-authentication-results; bh=W5JMwX0NlGjSjh37IHaUCDAMLi3prHOR/7PtfDx//JI=; b=wXkbUpLMFztSHTItOUmdWeM/h3iATmuWKVkX+3FoHT1aVqgB+TJjdyWViebGp5Zges +XB6j6lC/jRlySeWEsZLOS83S5RN7C/J9wOSev3qoLjaYotiDyRJttBwy1fjJehZlu50 GeAM2ZhdV9fiWwxsM6zG1rk75ge6yRIB/eGWkAjFc16RaNPiDAl1xZPmCH6pPARXWLgQ 0ThDtKbDTwpPb2Edji7fw6RmGy1iD9314eSgs+a868M+tup7YyBnbXwur5gTNQPLSQWG rVkpazJSdRcFeNc/oSpuiHEtQ05vvK4yXcHPMHiAjqvd9NjocT/p7Ua4OpFZchbIDMz5 QExA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 1si2941872wrs.44.2018.03.28.08.04.24; Wed, 28 Mar 2018 08:04:24 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 87F0A689C3B; Wed, 28 Mar 2018 18:03:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mx01.mail.netstorage.at (mx01.mail.netstorage.at [89.207.144.13]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 572B9689BB5 for ; Wed, 28 Mar 2018 18:03:39 +0300 (EEST) Received: from p1002.netstorage.at (p1002.netstorage.at [89.207.146.186]) by mx01.mail.netstorage.at (Postfix) with ESMTPS id 30610A0072 for ; Wed, 28 Mar 2018 17:03:42 +0200 (CEST) Received: from mailix (noaport.de [46.237.252.213]) by p1002.netstorage.at (Postfix) with ESMTPA id EB23681B49 for ; Wed, 28 Mar 2018 17:03:41 +0200 (CEST) Received: from frogstar-a.kuhnle.local (frogstar-a.kuhnle.local [192.168.0.26]) by mailix with ESMTPA ; Wed, 28 Mar 2018 17:03:49 +0200 From: Tobias Rapp To: ffmpeg-devel@ffmpeg.org Date: Wed, 28 Mar 2018 17:03:40 +0200 Message-Id: <1522249420-5373-3-git-send-email-t.rapp@noa-archive.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1522249420-5373-1-git-send-email-t.rapp@noa-archive.com> References: <1521642030-22067-1-git-send-email-t.rapp@noa-archive.com> <1522249420-5373-1-git-send-email-t.rapp@noa-archive.com> X-PPP-Message-ID: <20180328150342.11620.24483@p1002.netstorage.at> X-PPP-Vhost: noa-archive.com X-NetStorage-MailScanner-Information: Please contact the ISP for more information X-NetStorage-MailScanner-ID: 30610A0072.A18AF X-NetStorage-MailScanner: Found to be clean X-NetStorage-MailScanner-SpamCheck: not spam (whitelisted), SpamAssassin (nicht zwischen gespeichert, Wertung=-0.5, benoetigt 6, autolearn=not spam, BAYES_00 -0.50) X-NetStorage-MailScanner-From: t.rapp@noa-archive.com X-Spam-Status: No Subject: [FFmpeg-devel] [PATCH v3 3/3] fftools/cmdutils: replace loglevel option parsing with av_log_set_opts X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Tobias Rapp --- fftools/cmdutils.c | 48 +++++++----------------------------------------- 1 file changed, 7 insertions(+), 41 deletions(-) diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index c0ddf0b..2a0a995 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -870,51 +870,17 @@ int opt_cpuflags(void *optctx, const char *opt, const char *arg) int opt_loglevel(void *optctx, const char *opt, const char *arg) { - const struct { const char *name; int level; } log_levels[] = { - { "quiet" , AV_LOG_QUIET }, - { "panic" , AV_LOG_PANIC }, - { "fatal" , AV_LOG_FATAL }, - { "error" , AV_LOG_ERROR }, - { "warning", AV_LOG_WARNING }, - { "info" , AV_LOG_INFO }, - { "verbose", AV_LOG_VERBOSE }, - { "debug" , AV_LOG_DEBUG }, - { "trace" , AV_LOG_TRACE }, - }; - char *tail; - int level; - int flags; - int i; - - flags = av_log_get_flags(); - tail = strstr(arg, "repeat"); - if (tail) - flags &= ~AV_LOG_SKIP_REPEATED; - else - flags |= AV_LOG_SKIP_REPEATED; - - av_log_set_flags(flags); - if (tail == arg) - arg += 6 + (arg[6]=='+'); - if(tail && !*arg) - return 0; - - for (i = 0; i < FF_ARRAY_ELEMS(log_levels); i++) { - if (!strcmp(log_levels[i].name, arg)) { - av_log_set_level(log_levels[i].level); - return 0; - } - } + int ret; - level = strtol(arg, &tail, 10); - if (*tail) { + ret = av_log_set_opts(arg); + if (ret < 0) { av_log(NULL, AV_LOG_FATAL, "Invalid loglevel \"%s\". " - "Possible levels are numbers or:\n", arg); - for (i = 0; i < FF_ARRAY_ELEMS(log_levels); i++) - av_log(NULL, AV_LOG_FATAL, "\"%s\"\n", log_levels[i].name); + "Possible levels are numbers or:\n" + "\"quiet\", \"panic\", \"fatal\", \"error\", \"warning\", " + "\"info\", \"verbose\", \"debug\", \"trace\"\n" + "optionally prefixed by \"repeat\" or \"level\" flags\n", arg); exit_program(1); } - av_log_set_level(level); return 0; }