From patchwork Mon Sep 19 09:45:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thilo Borgmann X-Patchwork-Id: 38041 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp1112737pzh; Mon, 19 Sep 2022 02:46:28 -0700 (PDT) X-Google-Smtp-Source: AMsMyM70feBy4lrAnZ/DudCn1cN/HqVfgPIxIOFRKEmaAgqJkqUwKHn9+DRAm3vESaKdf7sJADE9 X-Received: by 2002:aa7:c585:0:b0:453:e1c6:7dc6 with SMTP id g5-20020aa7c585000000b00453e1c67dc6mr5272247edq.245.1663580788593; Mon, 19 Sep 2022 02:46:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663580788; cv=none; d=google.com; s=arc-20160816; b=Xc3qlyJR8H6O7ZCJ3Rf3UjUY+Yrdg4WPmmMmY4UfkoIgYNIwDTM7lvpj76qd+XQhqm /plehbKgpkprl7nTFaxdMsNKo6qwiniBRcseQVUJwwJ2rN2Xj+sBXwX+E/6G0vAALio+ pprtEzqEKAhHTkwOvTZX7Zm6X81/Ua2jLSNepwjN086vgtSOsAbRl9plYJzY9+HIFqAJ AndOenK8NSBMRS2wBLKI9VUrQwOPaQk4xgE/brMVphRMxnpqjaFYS/5Ri2W/FioDkomA CkZ3M/krPH+KmBV597MRx3Ur7QgamG4z1HjIu4Q3b0eK7lfvL2t1HpC36T6hIBKjaVIJ B4Ow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=SBL0OKas5mbVFLM0ObqvpNifBpz1Jsj+tFsV0sCh8zA=; b=KOR903y9u0V8U3YTo7iY3aa3IQn6JtsjV0FFPx/54icFvEpVr+N8IVJxiu5o2GP7nO VWd+oKBoF0VfvCzizz434tQ3nuW5X2EFGWeBlBKX4NfTL1/37oxQWDuy/AbzZcWe5BqH j+sKDZ4WjuCYE/7crEItTpPmfCt69kAML0ycCzNfBD2ksteEfbnduvnWjz4EltUKu/3d LAnsPabZQE5OUukZUB/uoguq1dlxuTrZFghsw+i7f1JjxiQi1guvKE0M9SMIAFpDddBN oc2qfRlZfIgsHk84vqcokE7vkIerZQad2OUZJq5jgY7Ex6k8USpk0mUPV5WmuFlPic3D VahA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mail.de header.s=mailde202009 header.b=TiGa1qvI; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mail.de Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id fj4-20020a1709069c8400b007799e328e10si25684636ejc.999.2022.09.19.02.46.28; Mon, 19 Sep 2022 02:46:28 -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; dkim=neutral (body hash did not verify) header.i=@mail.de header.s=mailde202009 header.b=TiGa1qvI; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mail.de Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 49AFE68BC5D; Mon, 19 Sep 2022 12:46:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from shout02.mail.de (shout02.mail.de [62.201.172.25]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 59BBE68BB99 for ; Mon, 19 Sep 2022 12:46:06 +0300 (EEST) Received: from postfix03.mail.de (postfix03.bt.mail.de [10.0.121.127]) by shout02.mail.de (Postfix) with ESMTP id B969FA0C1B for ; Mon, 19 Sep 2022 11:46:05 +0200 (CEST) Received: from smtp01.mail.de (smtp01.bt.mail.de [10.0.121.211]) by postfix03.mail.de (Postfix) with ESMTP id 9981580101 for ; Mon, 19 Sep 2022 11:46:05 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=mail.de; s=mailde202009; t=1663580765; bh=h3SrmAVpYz8HuJhSx5RTyKIMBb7s3/JSTLlKRHB62dw=; h=From:To:Subject:Date:Message-Id:From:To:CC:Subject:Reply-To; b=TiGa1qvIKLynLbVgwUEzs6SsPqh/oceOfLTHYMy1BIwp/hvoTOdRxQBzOeoqvLic+ GmROdvUV5bn27euJBf4aSAvGQ2lhpf7OifutqqjQENcVdOWa3zQ0I4NohdGUlLTwwA lKuJRFB0Ap0Era8M6xP2XF7+gtUSvunrnYFb0nFyCspteXYpyhwdwJbH/If1whtH13 NyRHS4C0BxNiZg6+IinEsm4RI3iEqJxYOkIeyoatvAoQPNtg+vEDdfW8ilQ6MJSiX/ dx9ft65d0Yn283c+MPWxXOSAGXOGgVF1rNs1/3U/+dQTvXs1yZYVBEqHJaV1UImWco dZXei9Lf9BnCw== Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp01.mail.de (Postfix) with ESMTPSA id 5A09210015D for ; Mon, 19 Sep 2022 11:46:05 +0200 (CEST) From: Thilo Borgmann To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Sep 2022 11:45:59 +0200 Message-Id: <20220919094604.4645-2-thilo.borgmann@mail.de> In-Reply-To: <20220919094604.4645-1-thilo.borgmann@mail.de> References: <20220919094604.4645-1-thilo.borgmann@mail.de> MIME-Version: 1.0 X-purgate: clean X-purgate: This mail is considered clean (visit http://www.eleven.de for further information) X-purgate-type: clean X-purgate-Ad: Categorized by eleven eXpurgate (R) http://www.eleven.de X-purgate: This mail is considered clean (visit http://www.eleven.de for further information) X-purgate: clean X-purgate-size: 4278 X-purgate-ID: 154282::1663580765-CD7F95FC-A2617EAD/0/0 Subject: [FFmpeg-devel] [PATCH v4 1/6] lavu/opt: Allow options to be arguments of other options X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: wV+GTReXbW6w Adds AV_OPT_FLAG_ARGUMENT for options being used as arguments for other options. Adds av_arg_show() to allow printing of such arguments in help output. --- doc/APIchanges | 4 ++++ libavutil/opt.c | 14 +++++++++++++- libavutil/opt.h | 8 ++++++++ libavutil/version.h | 4 ++-- 4 files changed, 27 insertions(+), 3 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index 729f56be7b..e4b2fc8799 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -14,6 +14,10 @@ libavutil: 2021-04-27 API changes, most recent first: +2022-09-19 - xxxxxxxxxx - lavu 57.37.100 - opt.h + Add AV_OPT_FLAG_ARGUMENT. + Add av_arg_show() to print arguments to options. + 2022-09-03 - xxxxxxxxxx - lavu 57.36.100 - pixfmt.h Add AV_PIX_FMT_P012, AV_PIX_FMT_Y212, AV_PIX_FMT_XV30, AV_PIX_FMT_XV36 diff --git a/libavutil/opt.c b/libavutil/opt.c index a3940f47fb..89ef111690 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -1256,7 +1256,7 @@ static void opt_list(void *obj, void *av_log_obj, const char *unit, av_log(av_log_obj, AV_LOG_INFO, " %-15s ", opt->name); else av_log(av_log_obj, AV_LOG_INFO, " %s%-17s ", - (opt->flags & AV_OPT_FLAG_FILTERING_PARAM) ? " " : "-", + (opt->flags & (AV_OPT_FLAG_FILTERING_PARAM | AV_OPT_FLAG_ARGUMENT)) ? " " : "-", opt->name); switch (opt->type) { @@ -1329,6 +1329,7 @@ FF_ENABLE_DEPRECATION_WARNINGS av_log(av_log_obj, AV_LOG_INFO, "%-12s ", ""); break; } + if (!(opt->flags & AV_OPT_FLAG_ARGUMENT)) { av_log(av_log_obj, AV_LOG_INFO, "%c%c%c%c%c%c%c%c%c%c%c", (opt->flags & AV_OPT_FLAG_ENCODING_PARAM) ? 'E' : '.', (opt->flags & AV_OPT_FLAG_DECODING_PARAM) ? 'D' : '.', @@ -1341,6 +1342,7 @@ FF_ENABLE_DEPRECATION_WARNINGS (opt->flags & AV_OPT_FLAG_BSF_PARAM) ? 'B' : '.', (opt->flags & AV_OPT_FLAG_RUNTIME_PARAM) ? 'T' : '.', (opt->flags & AV_OPT_FLAG_DEPRECATED) ? 'P' : '.'); + } if (opt->help) av_log(av_log_obj, AV_LOG_INFO, " %s", opt->help); @@ -1456,6 +1458,16 @@ int av_opt_show2(void *obj, void *av_log_obj, int req_flags, int rej_flags) return 0; } +int av_arg_show(void *obj, void *av_log_obj) +{ + if (!obj) + return -1; + + opt_list(obj, av_log_obj, NULL, AV_OPT_FLAG_ARGUMENT, 0, -1); + + return 0; +} + void av_opt_set_defaults(void *s) { av_opt_set_defaults2(s, 0, 0); diff --git a/libavutil/opt.h b/libavutil/opt.h index 461b5d3b6b..dce3483237 100644 --- a/libavutil/opt.h +++ b/libavutil/opt.h @@ -297,6 +297,7 @@ typedef struct AVOption { #define AV_OPT_FLAG_FILTERING_PARAM (1<<16) ///< a generic parameter which can be set by the user for filtering #define AV_OPT_FLAG_DEPRECATED (1<<17) ///< set if option is deprecated, users should refer to AVOption.help text for more information #define AV_OPT_FLAG_CHILD_CONSTS (1<<18) ///< set if option constants can also reside in child objects +#define AV_OPT_FLAG_ARGUMENT (1<<19) ///< set if option is an argument to another option //FIXME think about enc-audio, ... style flags /** @@ -386,6 +387,13 @@ typedef struct AVOptionRanges { */ int av_opt_show2(void *obj, void *av_log_obj, int req_flags, int rej_flags); +/** + * Show the obj arguments. + * + * @param av_log_obj log context to use for showing the options + */ +int av_arg_show(void *obj, void *av_log_obj); + /** * Set the values of all AVOption fields to their default values. * diff --git a/libavutil/version.h b/libavutil/version.h index 0585fa7b80..9c44cef6aa 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -79,8 +79,8 @@ */ #define LIBAVUTIL_VERSION_MAJOR 57 -#define LIBAVUTIL_VERSION_MINOR 36 -#define LIBAVUTIL_VERSION_MICRO 102 +#define LIBAVUTIL_VERSION_MINOR 37 +#define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ LIBAVUTIL_VERSION_MINOR, \