From patchwork Tue Sep 17 01:07:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 15108 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 60716446F16 for ; Tue, 17 Sep 2019 04:07:26 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3D12F68815B; Tue, 17 Sep 2019 04:07:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM04-SN1-obe.outbound.protection.outlook.com (mail-oln040092011070.outbound.protection.outlook.com [40.92.11.70]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 99561687F9D for ; Tue, 17 Sep 2019 04:07:19 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kGd8qvX8bCTLo2XmXWpQndul7VU4i5JljjEpyim94IonKuZ6yVtKe0hF5jc23AQ09BWq14g6C/CPYz5PzUCgunGD1U8Pmg+vAYzSZ6lvCi6n6B1nzre73G4+0ksdU2fGenki3SswwUSu6VylyKMMCMeREgKYvG4KFYoFpa/C1vDNny2orm/OvGPYeNbcE7aunFnDoKeo22m6RdJ9P+tnbeoA6JuW6egG9KGg9ZTifDxAgD1v0KqIAgn8WGp/l9clB7DFxPvxTExo0Y8+vUQ24FUR5gYR0cAaRk+TweoHw3pSHC1XOpUyKcr0dO3lNMx84EgutB3X7s6hfDjZDM4IDA== 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=+WxSbpmyrGeV2VwZxhRkrYW+QGfI8IhycXIelgkkVB8=; b=LCwR6LIrMEvYiCE3wkgcOzAUJWU2e/YbqAklIKytOIj7ZKz4cWq0PjzsNa9Cj6DMA1IC9HL7RGNb/SgJPqLQFNd0ZveT1nkdKHCl8UQ/Wrvj6kEyIS1pDtvO7DyKaAg4iFVZcOwzj/TgOBy694pyV0IXxx/yJkqlWbWFcbJw1HMZwPMSHDImH/YsNFBoyGiGKEVCIaxlDCYi9pAKdQBl+YvpX3wT5Fs8rdQ6PAmMKp1hi5JzWlt0XHX9x9A7bRsNoFdbHuvGih3Nr1yhB0YVX1Sddj8PtTW24TVfNrLNCNpHuCyefpWGUBrAr5vctHk67gY+65LWgqrSR7g7/bfdgQ== 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=+WxSbpmyrGeV2VwZxhRkrYW+QGfI8IhycXIelgkkVB8=; b=ZLXvPy05aMgNOLG3N7R90dZ6IoEtb2hrsslF5ShZw8iiOJnjbNdI9m2dkvBwGScL4RZoxOQ52ZyQA51GzUD9DQQWr82t+hxx2n/RoOD+a77tf7OuTtEojyby9rDQzMZr2k6rGaW/rZ07Q6c9bPKbzuIR/PMVoiwWR+df/ItVzGMOWMkP5pgTg8i3lxpxfmufWP4flQX0VfyHaAsPueFxRWJDkAr7NkY0lLd6iU+AQ998KIFdGuq4kS6jf8SO3CJnZ+pDZeE+9pcX08uv82D6TCUuvpWNFWktc/FVugapBM3uq4QInwiVeLrEEdfDy2wH2F1vHfmYvMsVwF5kiQ3O+A== Received: from SN1NAM04FT061.eop-NAM04.prod.protection.outlook.com (10.152.88.59) by SN1NAM04HT141.eop-NAM04.prod.protection.outlook.com (10.152.88.191) 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:07:17 +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:07:17 +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:07:17 +0000 From: Soft Works To: FFmpeg development discussions and patches Thread-Topic: [PATCH] Fix printing integer option defaults Thread-Index: AdVs9DitXdpr+I2kTxWYlTDZiHXTPg== Date: Tue, 17 Sep 2019 01:07:16 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-incomingtopheadermarker: OriginalChecksum:AD8BA7DBE22315B79FACA9CB001BB3E76C7CF90213954CCC9B993137FC2476F7; UpperCasedChecksum:F4790F7F284D4E88CC8FADF414385FC714AF6FEA2F4D46DE4A4CD8DFFDD6A2FC; SizeAsReceived:6564; Count:40 x-tmn: [XrxdbSBell46/mXrqGdvjU8x+je8qxSq] 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)(2017031322404)(2017031323274)(2017031324274)(1601125500)(1603101475)(1701031045); SRVR:SN1NAM04HT141; x-ms-traffictypediagnostic: SN1NAM04HT141: x-microsoft-antispam-message-info: mIyCAJBeiL6ba3amdwxms7euhRqF0u3CqyBPzjb1THP/1bmfONrJLrJ+hFREyIsyB/WYvdfVakcZsda7rgKrDD5zoWmEtXmfWYI2lv5KairRGZffEs1msp/17ih3Aoe/vNuyjCTR8JRw2eW15n4DbWp7hrG5ZCUDqaFnLFm4SnDMtCxaSfomIiadvSW7g/2q 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: ae410ce7-ea20-4ec6-71ba-08d73b0b6203 X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Sep 2019 01:07:16.9917 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1NAM04HT141 Subject: [FFmpeg-devel] [PATCH] 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) 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..01530394e1 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, "%d", 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: