From patchwork Fri Feb 23 13:58:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 46491 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:26a3:b0:19e:cdac:8cce with SMTP id h35csp995019pze; Fri, 23 Feb 2024 06:36:37 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXttOorp7KNitR6ehA/Bn5Vz/h6WEyhV+v5FdTtC2UVN3FCVNaV8ODj7XkBdFdORUG27An+DuX/dUZy5+CCXFeWEiwjZW57GakqTw== X-Google-Smtp-Source: AGHT+IH4sDyLH8yJ9lABAvbEW4fUBmZrcairUquTCepi6VWvcCQkSYmpx/HrrXq4lzkAMizID6Dp X-Received: by 2002:aa7:d7c4:0:b0:564:42e2:5b0 with SMTP id e4-20020aa7d7c4000000b0056442e205b0mr16944eds.13.1708698997126; Fri, 23 Feb 2024 06:36:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708698997; cv=none; d=google.com; s=arc-20160816; b=BvgdiaGPFNK5q+RxMiUMOJ7I+9YNDJhj2gRunm8usw+CU1LJvRmRovkHdFR+sZNcRp pGIcYSN+OAG8JWa754qA85xs9wllJuqyKP3qzVU7Gu5vFDUV9til1mlUD8OTbsS9hilk KPt1fZGh3ZS8QHYXwCETh7LY+ZkdoPG6OnIz7UI/hSr3qG2o2Ke3CQEV4ajVQ7LYBD1s oQlvSw70ipa4l+JuF+T/WzNuQwX1HnBQltwv1q9OIteEOtT9SlnK7+0+CKDlrWrXz758 Bkljlox1PpuOl/xP3hHv5EYvy2cFUuNfS3YE8kS1yN3gV1bVnssBie7tVAGJVJGcK7m5 UJbw== 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=x6eXVm3hVF71i/vTIzEVTc/6RhH9lO7p2t35AFZezBU=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=hhPhUmhwRag0LaWBd+m3QuXMmcq7ZZ0CeKyWBa3TKh00luNl/vZfT4ykeVAjQXft01 BY2fP0lamr8qtGIClPbalvlJpLpXHOa317ef421wnYCMG23TsaxsySm2+CHkAqG3z+mP 6gMjNVL1B7g5lMn0jZfJoKr2skES20HD2vta4hHdoy5AfARPo4vtHU0XLb1InPYFdk0+ ctjGGyYf0cHxRxaqypHnOSONEyJKcBRdaTBQRTkIbTuZ/Lg9lA9pI/c2D+od5bF2KK0U GJzKAUpEuLrelvQeXpYPdlt4ZkZ3/WObMnj/zKhNb7LIZVs8BIFhjeY39B+aKhYQxYuc 7hiw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=Ny3ml0iC; 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 j18-20020a05640211d200b005643fb48a5dsi5770512edw.3.2024.02.23.06.36.36; Fri, 23 Feb 2024 06:36:37 -0800 (PST) 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=@khirnov.net header.s=mail header.b=Ny3ml0iC; 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 5DA0768CCBC; Fri, 23 Feb 2024 16:32:14 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 156BB68C790 for ; Fri, 23 Feb 2024 16:31:35 +0200 (EET) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=Ny3ml0iC; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 9B29E4D38 for ; Fri, 23 Feb 2024 15:31:30 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id beaIL6kHYlaE for ; Fri, 23 Feb 2024 15:31:30 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1708698687; bh=yZFFzr8NevAy9vLagP02VUT7N72ndyTZxdfVGVi1qpw=; h=From:To:Subject:Date:In-Reply-To:References:From; b=Ny3ml0iC1npLIU4Rf7qlxwKMuDi2fz2hAx2eINvoCj2VhIWMbP3M+Lf1ygov8JuJZ P/mNOTLZheaMCxCqhhynpuZLylxO/8X0kl2wbSADm7c+HSIUW7hEf1fLtpEtkjGMSI I3CCHHt4sVETzP4yD19fzU16ydIztEPo43q5G3QDW0ITPE6HQ/BaCiOT5/03eVjFb/ Ki2BWnhU2RbLjLQyD/rmEAq/+Pc3rNuk/CnMtkZTA0h+2LizFjWLv4VMjvAGc14qNo ICw+aing+znkYC3+fUx1K/2oM5YM9Ggn9KfKFgNEK5HbeFrk/cqAqaJ1qhjagy5y32 L9OVWxLKugr6g== Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail1.khirnov.net (Postfix) with ESMTPS id 5BC184D26 for ; Fri, 23 Feb 2024 15:31:27 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 23D183A0F82 for ; Fri, 23 Feb 2024 15:31:22 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 23 Feb 2024 14:58:29 +0100 Message-ID: <20240223143115.16521-8-anton@khirnov.net> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240223143115.16521-1-anton@khirnov.net> References: <20240223143115.16521-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 07/38] lavu/opt: simplify printing option type in opt_list() 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: D3qhH9wx8TJK --- libavutil/opt.c | 107 +++++++++++++++++------------------------------- 1 file changed, 37 insertions(+), 70 deletions(-) diff --git a/libavutil/opt.c b/libavutil/opt.c index d13b1ab504..554916fbaf 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -1231,6 +1231,41 @@ static char *get_opt_flags_string(void *obj, const char *unit, int64_t value) return NULL; } +static void log_type(void *av_log_obj, const AVOption *o, + enum AVOptionType parent_type) +{ + const char *desc[] = { + [AV_OPT_TYPE_FLAGS] = "", + [AV_OPT_TYPE_INT] = "", + [AV_OPT_TYPE_INT64] = "", + [AV_OPT_TYPE_UINT64] = "", + [AV_OPT_TYPE_DOUBLE] = "", + [AV_OPT_TYPE_FLOAT] = "", + [AV_OPT_TYPE_STRING] = "", + [AV_OPT_TYPE_RATIONAL] = "", + [AV_OPT_TYPE_BINARY] = "", + [AV_OPT_TYPE_DICT] = "", + [AV_OPT_TYPE_IMAGE_SIZE] = "", + [AV_OPT_TYPE_VIDEO_RATE] = "", + [AV_OPT_TYPE_PIXEL_FMT] = "", + [AV_OPT_TYPE_SAMPLE_FMT] = "", + [AV_OPT_TYPE_DURATION] = "", + [AV_OPT_TYPE_COLOR] = "", +#if FF_API_OLD_CHANNEL_LAYOUT + [AV_OPT_TYPE_CHANNEL_LAYOUT]= "", +#endif + [AV_OPT_TYPE_CHLAYOUT] = "", + [AV_OPT_TYPE_BOOL] = "", + }; + + if (o->type == AV_OPT_TYPE_CONST && parent_type == AV_OPT_TYPE_INT) + av_log(av_log_obj, AV_LOG_INFO, "%-12"PRId64" ", o->default_val.i64); + else if (o->type < FF_ARRAY_ELEMS(desc) && desc[o->type]) + av_log(av_log_obj, AV_LOG_INFO, "%-12s ", desc[o->type]); + else + av_log(av_log_obj, AV_LOG_INFO, "%-12s ", ""); +} + static void opt_list(void *obj, void *av_log_obj, const char *unit, int req_flags, int rej_flags, enum AVOptionType parent_type) { @@ -1259,76 +1294,8 @@ static void opt_list(void *obj, void *av_log_obj, const char *unit, (opt->flags & AV_OPT_FLAG_FILTERING_PARAM) ? " " : "-", opt->name); - switch (opt->type) { - case AV_OPT_TYPE_FLAGS: - av_log(av_log_obj, AV_LOG_INFO, "%-12s ", ""); - break; - case AV_OPT_TYPE_INT: - av_log(av_log_obj, AV_LOG_INFO, "%-12s ", ""); - break; - case AV_OPT_TYPE_INT64: - av_log(av_log_obj, AV_LOG_INFO, "%-12s ", ""); - break; - case AV_OPT_TYPE_UINT64: - av_log(av_log_obj, AV_LOG_INFO, "%-12s ", ""); - break; - case AV_OPT_TYPE_DOUBLE: - av_log(av_log_obj, AV_LOG_INFO, "%-12s ", ""); - break; - case AV_OPT_TYPE_FLOAT: - av_log(av_log_obj, AV_LOG_INFO, "%-12s ", ""); - break; - case AV_OPT_TYPE_STRING: - av_log(av_log_obj, AV_LOG_INFO, "%-12s ", ""); - break; - case AV_OPT_TYPE_RATIONAL: - av_log(av_log_obj, AV_LOG_INFO, "%-12s ", ""); - break; - case AV_OPT_TYPE_BINARY: - av_log(av_log_obj, AV_LOG_INFO, "%-12s ", ""); - break; - case AV_OPT_TYPE_DICT: - av_log(av_log_obj, AV_LOG_INFO, "%-12s ", ""); - break; - case AV_OPT_TYPE_IMAGE_SIZE: - av_log(av_log_obj, AV_LOG_INFO, "%-12s ", ""); - break; - case AV_OPT_TYPE_VIDEO_RATE: - av_log(av_log_obj, AV_LOG_INFO, "%-12s ", ""); - break; - case AV_OPT_TYPE_PIXEL_FMT: - av_log(av_log_obj, AV_LOG_INFO, "%-12s ", ""); - break; - case AV_OPT_TYPE_SAMPLE_FMT: - av_log(av_log_obj, AV_LOG_INFO, "%-12s ", ""); - break; - case AV_OPT_TYPE_DURATION: - av_log(av_log_obj, AV_LOG_INFO, "%-12s ", ""); - break; - case AV_OPT_TYPE_COLOR: - av_log(av_log_obj, AV_LOG_INFO, "%-12s ", ""); - break; - case AV_OPT_TYPE_CHLAYOUT: -#if FF_API_OLD_CHANNEL_LAYOUT -FF_DISABLE_DEPRECATION_WARNINGS - case AV_OPT_TYPE_CHANNEL_LAYOUT: -FF_ENABLE_DEPRECATION_WARNINGS -#endif - av_log(av_log_obj, AV_LOG_INFO, "%-12s ", ""); - break; - case AV_OPT_TYPE_BOOL: - av_log(av_log_obj, AV_LOG_INFO, "%-12s ", ""); - break; - case AV_OPT_TYPE_CONST: - if (parent_type == AV_OPT_TYPE_INT) - av_log(av_log_obj, AV_LOG_INFO, "%-12"PRId64" ", opt->default_val.i64); - else - av_log(av_log_obj, AV_LOG_INFO, "%-12s ", ""); - break; - default: - av_log(av_log_obj, AV_LOG_INFO, "%-12s ", ""); - break; - } + log_type(av_log_obj, opt, parent_type); + 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' : '.',