From patchwork Tue Sep 17 01:36:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 15111 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 01805449963 for ; Tue, 17 Sep 2019 04:36:41 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CB48E6881AD; Tue, 17 Sep 2019 04:36:40 +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-oln040092009082.outbound.protection.outlook.com [40.92.9.82]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0307D6809EB for ; Tue, 17 Sep 2019 04:36:35 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YticKANGyUNfEXqJlnn8VrVJatptBC5PEoJDR7xc07Y5a1Enznyg74UZXN4X0tgmWHBzxZwq6jFSdE1payzar0xpUWh69I7js6evTXKR5wtEajmZQz7nVymMuBqiejuqDwbQUtCnrMYbMyj6T7MWk1xUyAJYtbFVCeAptdvayU5JjEE4bOscCcGTR4YHRDNWYdQqiixlbmKchEnEqIlRjE4/bfG1UvzRElHuT11o15zgUXV9wQGLHke76fxb9SRjOy5Rdv4Q8MvFjUOP1TiQnMXuS2m8xBkjLpaBoV1FCYxiKpdCKByOcrYOuzH/n0az4TWPm6V/XWjXy7Z1JOlLAA== 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=Dlbk7PgQQEsfO16qpQ25RKkrfi6w/LkC/ZwQ1f/kHVk=; b=UuMszCvMOrOLWclo1fuRJtnFy08rVDshWCIhn+z5fZrWNOgeo6OvzRfvR0tajtFgyp96AoLs+Ey7d72u9nCi7bPWI2/PwBqcl6dP+ybbzVUC53Lbi6sKxWCqZ5P2K1bo+ixRrOQYhx8B+3JVBz0vUQ9Gzfck8C7rXT5996jA8YhZKJt9vff5W8F0rP5TvFT6pfGKqy/LvLRhVfzVrCJs1gjp5OIgF0M/Osk4QfPq4xxgiIKsxX8Q2mcka/lV+wFB1Zwx5VIkKTR9y7RiY4uhvoP2ROzB5lqZIiY5/zTeRx5t6lvUjmufsZXqc3186aE1WX+uXSnvG7wfGskfjAcysQ== 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=Dlbk7PgQQEsfO16qpQ25RKkrfi6w/LkC/ZwQ1f/kHVk=; b=alxiIPiodRyDfG4vTlXLU3wnlZPVyPVz3jB+SnZKmbmJ/rqe5Tc14LwGSw8w9XApNlhzRaeF8hx+/ip7B9Z6okcXu/Q1CcngoILUlkp6onvka1LeMdIowFYI59w4LTp+iHr5KqFWWtQyGekCH9KDgDzjxgnYU8FXkJxFjSA7fqJVky+q64X3QyzOdd7yd6sXJOOHQ0DoF1vnn/bqTcMgWVxIiqCczbVQer9RQkKt8SoAl3qREKC1R9sE92NPx51nH1MUZ+ItS4UCAK2eKiZO/SGYU/PRNQFwRHTKUjKdqcGR+R4cZG0mY5MsF/74mM5dUnon5V6P7nzau6F5zudRuQ== Received: from SN1NAM04FT058.eop-NAM04.prod.protection.outlook.com (10.152.88.51) by SN1NAM04HT091.eop-NAM04.prod.protection.outlook.com (10.152.89.57) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2263.14; Tue, 17 Sep 2019 01:36:33 +0000 Received: from MN2PR13MB2752.namprd13.prod.outlook.com (10.152.88.56) by SN1NAM04FT058.mail.protection.outlook.com (10.152.89.64) 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:36:33 +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:36:33 +0000 From: Soft Works To: FFmpeg development discussions and patches Thread-Topic: [PATCH v2] Fix printing integer option defaults Thread-Index: AdVs+DpAtQG/1dNHQLeyGno4vp553w== Date: Tue, 17 Sep 2019 01:36:33 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-incomingtopheadermarker: OriginalChecksum:BBA0367AB6116F6906597342D3DEFD5A5261263C834B7899E38FC8ED468F69AC; UpperCasedChecksum:39FD894C0B24ED188A190D7A197A14172F480B50166D1502E7B0B9C812A17AFD; SizeAsReceived:6570; Count:40 x-tmn: [aBzDK465WoTyrzlFuPqM9t1/rTQdmw5H] 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)(2017031323274)(2017031324274)(2017031322404)(1601125500)(1603101475)(1701031045); SRVR:SN1NAM04HT091; x-ms-traffictypediagnostic: SN1NAM04HT091: x-microsoft-antispam-message-info: E79VJoOvwOTLEs18e9jfFcgKSMj054h7vytYiUx9o75o2YKJImNkFlAH9Ny8In0rWmoxkM7KmJsSWuJofWPI4MOFUNLa2CkFDjjQJuxmVjLp3rG8LNX4NruLw+Mu3/qbq6xPLUjM3LddAFZYOAUNwia8ZEJyUSnhH0q1moza6WgInIezV3SPNLKihQ+CychQ 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: d1cde7d3-d5d9-4b20-db99-08d73b0f78c7 X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Sep 2019 01:36:33.1677 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1NAM04HT091 Subject: [FFmpeg-devel] [PATCH v2] Fix printing integer option defaults 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" Integer values should not be printed using format specifier '%g' which leads to inexact display in case of higher values. Before this patch: -trans_color .D.V..... color value [...] (default 1.67772e+07) Afterwards: -trans_color .D.V..... color value [...] (default 16777215) Update: Use PRId64 format specifier Signed-off-by: softworkz --- libavutil/opt.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/libavutil/opt.c b/libavutil/opt.c index 93d6c26c11..5a35109f39 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -1034,6 +1034,23 @@ int av_opt_flag_is_set(void *obj, const char *field_name, const char *flag_name) return res & flag->default_val.i64; } +static void log_int_value(void *av_log_obj, int level, int64_t i) +{ + if (i == INT_MAX) { + av_log(av_log_obj, level, "INT_MAX"); + } else if (i == INT_MIN) { + av_log(av_log_obj, level, "INT_MIN"); + } else if (i == UINT32_MAX) { + av_log(av_log_obj, level, "UINT32_MAX"); + } else if (i == INT64_MAX) { + av_log(av_log_obj, level, "I64_MAX"); + } else if (i == INT64_MIN) { + av_log(av_log_obj, level, "I64_MIN"); + } else { + av_log(av_log_obj, level, "%"PRId64, i); + } +} + static void log_value(void *av_log_obj, int level, double d) { if (d == INT_MAX) { @@ -1254,7 +1271,7 @@ static void opt_list(void *obj, void *av_log_obj, const char *unit, if (def_const) av_log(av_log_obj, AV_LOG_INFO, "%s", def_const); else - log_value(av_log_obj, AV_LOG_INFO, opt->default_val.i64); + log_int_value(av_log_obj, AV_LOG_INFO, opt->default_val.i64); break; } case AV_OPT_TYPE_DOUBLE: