From patchwork Tue Sep 17 01:09:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 15109 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id A4CF3447440 for ; Tue, 17 Sep 2019 04:09:14 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8001768817C; Tue, 17 Sep 2019 04:09:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM04-BN3-obe.outbound.protection.outlook.com (mail-oln040092009095.outbound.protection.outlook.com [40.92.9.95]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 15FBB688053 for ; Tue, 17 Sep 2019 04:09:08 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QEq5nernhGBqIKDSyQzp4Qn3292DqPRu+DmQbGKG3iGqvq56NfWSAAHic1M9aq4XmlbDw2WtNlOvJU40+OO/MkVPVuIWEblj127UC+SUF5ZJp4exc/qn+GCZzEnQOBHN14DJkznBGZ0R1KLAJvrz1IEQ7ysPPXSEpnNqU2teeZGm0U2iaNZHPL6sZazLkn+xd0sasTtn2Pki8jaBKOFdzchc33Hp5WUejISVufI1o8zvIAGztUn/xV4pqxg5aOxIA4EHw60kqG1cE3C3ROnPrp3WcWcuugq3GbPb+1H7GP+XoESE7VkA32E1JMzGFSDSSGEsKT3pFckVplM5ziUkfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1vqzttNX1wAhEnZpi2YO1c1lOCx6yIuXuQsclegVbwc=; b=G5N9gP3MrHTej7rztEoPy8J3MSgN8PHwQzkSwrNQWV4rTxxsvO9khSEiukInkYw+/QoF1xkPmLzV/uZqx1CyU0qJmuW/UcpFgwpQOEpC3LmHMZwVbuDj68ulyn20QJmZpVGm8NqAbn8mxPY+OjnGdZjE0geGnqRS1hYxGYbY9wU+m00v9hTF5GKJJUnSgMHPNHKYH2pu11QngLFIzyoMAlql7qO1NMNXpr32MSVURp7BIaX9KZ5s4ame0JVNwBJ9WSpcbrbFeO02rt31NLURpXs26YhZdeYTcZc5BFyXtHatBzQ9dMhM+GRCTERbb+PDJdFWkWtLyEcd/ig+dI+p+w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1vqzttNX1wAhEnZpi2YO1c1lOCx6yIuXuQsclegVbwc=; b=XZGQp3eoEpmmwWXYlDtqpBfZxDH3S5CskLkqIugsxTIM/yCERO58pbwjM7XlQ5eGh6Ht6U73VxIgMnezhzMvGELFsXUsAkqO3cOD5xb3uqGInBouKheCQroQqNx/EtxvgiM5q82MRxi7Wg7fdoKP5DI1I0QOy9t1fP5cuBxPYDRQVSqiPOblIvr5aGBACr5pUHt1kb1qhiRL3h3u1Un6N7rfnbnRJ016Nj0t2qLuobqEm1wNb7n0qQPZA3KgTJozuYBdTZ9b1jP27hPIDYf00GivJYr69GnQKSivKtNRyIcKHiyv06PVGLG7BE2rJCTL0PomnQywQgm+5jAhRJuWJA== Received: from SN1NAM04FT061.eop-NAM04.prod.protection.outlook.com (10.152.88.51) by SN1NAM04HT014.eop-NAM04.prod.protection.outlook.com (10.152.88.114) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2263.14; Tue, 17 Sep 2019 01:09:06 +0000 Received: from MN2PR13MB2752.namprd13.prod.outlook.com (10.152.88.51) by SN1NAM04FT061.mail.protection.outlook.com (10.152.89.201) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2263.14 via Frontend Transport; Tue, 17 Sep 2019 01:09:06 +0000 Received: from MN2PR13MB2752.namprd13.prod.outlook.com ([fe80::9c2c:8444:38e1:5d6]) by MN2PR13MB2752.namprd13.prod.outlook.com ([fe80::9c2c:8444:38e1:5d6%7]) with mapi id 15.20.2284.009; Tue, 17 Sep 2019 01:09:06 +0000 From: Soft Works To: FFmpeg development discussions and patches Thread-Topic: [PATCH] Print out numeric values of option constants Thread-Index: AdVs9G+7E283TtbUSgyrIfT9kjE9zA== Date: Tue, 17 Sep 2019 01:09:05 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-incomingtopheadermarker: OriginalChecksum:CE164693FF493A38039B008F363EDC4C1F95F0551D776AAE4CBE515D6439322F; UpperCasedChecksum:0751E9E0CD77C1F81670DB72E22406E2C6E30D364CC54907E56B4DFFFCE1112C; SizeAsReceived:6554; Count:40 x-tmn: [7Msbt6Kml25ueiPnKeBMBsikwt31NcmU] x-ms-publictraffictype: Email x-incomingheadercount: 40 x-eopattributedmessage: 0 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(5050001)(7020095)(20181119110)(201702061078)(5061506573)(5061507331)(1603103135)(2017031320274)(2017031324274)(2017031323274)(2017031322404)(1601125500)(1603101475)(1701031045); SRVR:SN1NAM04HT014; x-ms-traffictypediagnostic: SN1NAM04HT014: x-microsoft-antispam-message-info: e89oAI9Dqwihg3+KCQZiVZYWUjxwZ20URL3xfBVQcW8edpEvpvrfZXhF1X+x0ETAJOUvoBTCOLzo0d6jZvSsdlCT+oP2DHeNwzpLHbHDWk2hEg6Gj7gjyFc0NeYpxVRghQ7ymWO9dMc1bjf2aGEfgtg2k4DQkRrNhL4mgDjZan6RTDFqU/KAdI2BmKsJTIBa x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: hotmail.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: 3c0330ea-5e12-4c27-56ca-08d73b0ba2e9 X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Sep 2019 01:09:05.9784 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1NAM04HT014 Subject: [FFmpeg-devel] [PATCH] Print out numeric values of option constants 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" It's often not obvious how option constants relate to numerical values. Defaults are sometimes printed as numbers and from/to are always printed as numbers. Printing the numeric values of options constants avoids this confusion. It also allows to see which constants are equivalent. Before this patch: -segment_list_type E........ set the segment list type (from -1 to 4) (default -1) flat E........ flat format csv E........ csv format ext E........ extended format ffconcat E........ ffconcat format m3u8 E........ M3U8 format hls E........ Apple HTTP Live Streaming compatible Afterwards: -segment_list_type E........ set the segment list type (from -1 to 4) (default -1) flat 0 E........ flat format csv 1 E........ csv format ext 3 E........ extended format ffconcat 4 E........ ffconcat format m3u8 2 E........ M3U8 format hls 2 E........ Apple HTTP Live Streaming compatible Signed-off-by: softworkz --- libavutil/opt.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/libavutil/opt.c b/libavutil/opt.c index 93d6c26c11..ed90808d6d 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -1102,7 +1102,7 @@ static char *get_opt_flags_string(void *obj, const char *unit, int64_t value) } static void opt_list(void *obj, void *av_log_obj, const char *unit, - int req_flags, int rej_flags) + int req_flags, int rej_flags, enum AVOptionType parent_type) { const AVOption *opt = NULL; AVOptionRanges *r; @@ -1182,6 +1182,11 @@ static void opt_list(void *obj, void *av_log_obj, const char *unit, 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, "%-12d ", 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; @@ -1286,7 +1291,7 @@ static void opt_list(void *obj, void *av_log_obj, const char *unit, av_log(av_log_obj, AV_LOG_INFO, "\n"); if (opt->unit && opt->type != AV_OPT_TYPE_CONST) - opt_list(obj, av_log_obj, opt->unit, req_flags, rej_flags); + opt_list(obj, av_log_obj, opt->unit, req_flags, rej_flags, opt->type); } } @@ -1297,7 +1302,7 @@ int av_opt_show2(void *obj, void *av_log_obj, int req_flags, int rej_flags) av_log(av_log_obj, AV_LOG_INFO, "%s AVOptions:\n", (*(AVClass **)obj)->class_name); - opt_list(obj, av_log_obj, NULL, req_flags, rej_flags); + opt_list(obj, av_log_obj, NULL, req_flags, rej_flags, -1); return 0; }