From patchwork Thu Feb 22 00:33:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46424 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:26a3:b0:19e:cdac:8cce with SMTP id h35csp43363pze; Wed, 21 Feb 2024 16:38:27 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUlDY72HGhz07P2dNPsuaM+uVan65BBNN++bBKgi0ZadPp9a/yo5Y415oVZaNz63y1kkhE4OUg/LTaULzu0zJw3ITG7BBY4hU6JLg== X-Google-Smtp-Source: AGHT+IEd+oJhtn435ch6JhHDkv7JAEZ5oyFedjD4tTnIZq/slyXD7+n08E29DXiC/IOBI0s0OvmV X-Received: by 2002:a17:906:355b:b0:a3f:1139:13bc with SMTP id s27-20020a170906355b00b00a3f113913bcmr4309474eja.74.1708562307389; Wed, 21 Feb 2024 16:38:27 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hp18-20020a1709073e1200b00a3e5c23f0e2si4058698ejc.935.2024.02.21.16.38.13; Wed, 21 Feb 2024 16:38:27 -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=@outlook.com header.s=selector1 header.b=S81gG1Gh; arc=fail (body hash mismatch); 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=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C775268D1AD; Thu, 22 Feb 2024 02:38:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04olkn2090.outbound.protection.outlook.com [40.92.74.90]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 484DB68CC25 for ; Thu, 22 Feb 2024 02:38:04 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=g9V7qg/2E1Tx+m6cS6xPKWQRi1F1aop4bRznaA2JX6mqz5ZSSub/l0SOl3kRU7AYnnfqMOFo6p+yH2seRn1wcOjSgMd2+MhyW827ZUSTz8PBR5zQRmsL5cbeOs7AaGs6x7YBXDdIoEavnhN9FJaZHoL12SUw/JiTqR5tCkpNu/3q7WOcNBXDBqy4SvRNtbJRXkHDtburEgZUIy6s/tVR4QXIKt7PI5Or7q3CjRIpswMajLxj4nANCw1aoHxbUmJigbF1KfAYXUzybcsg/ScKGHukjDGuTwCDNX3zHDVG/Rk8qEDR5HnfG1CalJ8BH3en4VbQT2X/a7cdgJvPNmRkSA== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Ebar2bva/avY/8nKmePJxN6nMmI/bk2nDtdPMzfTjZs=; b=br8Hw3yNkXhflFkBFqp28IqWP01jFbZAQRyM3RlPf77lJACQpHBi7aL1zpHNITdb2j6r8gCUknvybqu+06kA8jfwVIizdBrPJR0hMzxEH2ijFVLV5n4SvnrPb1mEeeMuBMKxH5EkyuGWvDSUUXoa6U4W871ijMgvJrHAvH+IotZ3W4vmPqoNXR1O8nBl40cg8sYTbNhUMvCHN0nFrjty+C2r3MYcawVE8ayI7nDvBFC9CKn75dVYQtnYJHD1AM/e8c3H/TC0glfV2pejSd+gBpwzYXhK5Vl+xba4xDj92yGp3h9w3ZOQL2Kk29L0LxUbS7VVdMCROjKf2G5ETLN8mA== 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=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Ebar2bva/avY/8nKmePJxN6nMmI/bk2nDtdPMzfTjZs=; b=S81gG1GhMPCijtn2gREpAz7dgAQ4mD3z1OKSwSq9JMQZXiV0QQXXx31KnM4O6r1XpD0E8QBtkQsitialRgssyaY6eK/cQ6Yxfh+ePXvS8abwpx99jRhbz8QHmahyMjG7vxIgC6VGRD6T63wOWdp4SwM/DcEtZGaN0o1SPq+/e/Mgujiz8m3Rl8D/+cic4giHY1OLdXL16oWtDODmC5JEywj0adzwyeBd66ZsN0a5DWkB4YFDBkrMZkO61eLl5pBsz1UiEsF3ZX3il2qK2Na7M+DWZ9pUt34+Z/GDCnSCcfJqbS7DA0ZnA1j+f0aEVoI1XMQDUPMYkVRfmkNKfYrcIA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0210.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:179::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7316.23; Thu, 22 Feb 2024 00:38:02 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7292.033; Thu, 22 Feb 2024 00:38:02 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 22 Feb 2024 01:33:58 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [TRe7Jxhhr0QP1EiHzKPuLjPvsNjtjAIknedZcJFAGY4=] X-ClientProxiedBy: ZR0P278CA0124.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::21) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240222003358.2051977-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0210:EE_ X-MS-Office365-Filtering-Correlation-Id: 0e5178e5-580b-4ef6-ea4b-08dc333e86c6 X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnoD9KdWYVDMKjjxPyiu4b2HkvEF3eBSmMMCloB6EQNzMth4EAoy6jWBu5AEV04zFhTK/c3jjRURlhJPdte+4gCaHegJGW3mONpxy05XPeOUjZ519zsF5j9tQVBDk4ur9bj/bPhvdu7QyX2cTNfe37ti+0Vg2bkULxRiixHT/S/1Bltoeb4tpUYhCJUoHux8eASJ+zWyIw8lDUIBxedUXdOgkQBp3BVdmBXtkcWitc6LeFQOXgWXxfNPWojaOOWt4/+yINvkxsqOc919xVtiygEzGvZTiuzT2JDED4xpyu2o4uIrdGj5PXyXCJHaWYk5zPQBWasDRaUCRF+ivYNNaAbTJM2ems8wOc+LSGWJmQfZrziriI5MoHeqgFKMwpgh/EVYZpaa7S0QOAQHbot/bS6EdT0KdN68XAhiGSlUJX11ICCSqSjKltle5HZdD3YWd4xL8C9cxm1X2UPSm9Uz5PdsTSr2XUPwJlHQg5p4H+gJ8ROCwErxIvN6BTrcFfEUMItZamT/GVLLd4sluAbecAI0t7UW8BcA5iUMtieuffk51/EJMWU1sjiizvAKV+l1QDFgkk2nOV5r7D5YuzysAM0b21uUmAF1ZWfizQ3asotYQ5TY+AqqmDVjQO263bT2e43xxdiHsZs2pLOhPYSax93p1c4yitUx2WOjmpGUDkNPFUbnoE1GCF9XDvoiuSfX9mKYBTUoLVpfYQpK5vtueQitkRz80z9iX4rsLj5f3qB2GiJiK+oopYYkdpIsJ31uDTg= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wf37RJA7kW6gCFD4iHrGpQ1dkbXi0PV8URM8t7lmz8GtLpLXv7a5wG+SsNK28GtnQQARvkT7VuREme+wJm2fyeFbTyi8cvKAh+A72zRhDp/cvwEuF179bRQY38+UW4Oz5kE47WjceiTEB6gB+pekGZVxvYhmP+s3eW4qqUHuCBDIRniZVu3pPNPGW8+DBiVfSgDIhonmtlRUfX1yOWmhZZmVpzC/K+pFvAk0RIvOX4+RPipUV2axumRtcIrklm++YuYrzhdPFmRyw55SrZgVTPVueRVXVrkIrLOUH4cbxMJmXdLy7sQ1459L/F0LcJ2OpdHiCtAjMGbyz0zEXtvyUiChModG7QOA/ZdoSa21HNyLL8sfuUi4VJgqMSJ2f/cKLfhUbS/P0Ww90meRE/PgoylaTFir1ppSq+vNsbQtn8ZaVkxN2IFPVIVBx/VoJ6hj0+g6gL0BKz+R9Un17sQcY+R00k89ddGVjOW619iFxGU6nk97Qlkr11W2sxZA4F9CynqD15yXz0cmD8LceA0fbvehx2Hdp9REMo3BCN6hNmI1i2fHmcrzY0F7QlTM/0w3tltBJJNXSeqJoI70Si3iAZgpo/K0+6PYE2RwRdHFbxnKc2A3c8yRk4/MuRomcQpl X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 4ux8wsqbOrb4Sm9tU1QOjOl1gdocXrYRj95tGUvML5iOf5t7qirlLjga/1BbG/URwkzFFfyaZN5a3esJcBH9/hEPizRoU6cqj48EV9eVn6BO4/c4dQugGp6d7aBQ6MuRXNTKu3bL4UH4lqgotAVEjbUbjgwz+hqWFWGf8RhTei6UGruCAc+eWGFLp1WBnzndmbMGbOZ39oxPA3B7YrKqkPl0TGqSI2z8eihFa41eA6j4u65u3eaqu9wlJyZy6gar3OnzRgvEDekEUfHXogk5l4fd2312G+WOOinlTXXMkauynQSJO/PNl+ONUzScx/wplcJ0WPZVqCFxVgeupoZZ7y1e1R6ypd1LbF7BoOLDZXGXysuSdlYDb9RNCTxKoiaZnwGyQwnq0/vWmZt9IgxKzhfZIsCsej186NqG6y45kpnxEbie/Ps7nltjUeDTup9TtOhgySNLlwFi4PXnciV/x8CDmZd/4mwp4ZSCOxhzUFEuZiFaSO7pRAYHOVlxDns+uKUWiIz92h+bwtsbPqulxwjrol6+cwMQ1yk/Vq87W9iho9+x3ryu93wOUgZcpxRxYkgSsgHe+PezQ8Ko6/a5CCPGraUWD53/YSzmuWEnaokT70te8AQdtPm7FIVlcIRMJ4J3PxzsXdIQ2vdjfH2bONDIBZaoZ+0gq+IREA0vpwCixTpierqlevPJ3tfsQUpp31OhqOE5+pPsjM5T1EUwHcaeVc59i621/uRoythZO1skQPmi/N/GdRLDyaibDJr+FqJj/ezafdtGnB7GPyIm9asFk+2NkQyvW3r82GOpjkp3j01Od+2ii9kvkK83D7xL81LI05llqrD697eNXSYNrnHQu3U/1NBbhrlQZUz80AOiGgMMPJmd2lPp/1t6eP928b5UH9PfQLDhYEfk2HdkxRTlQL7ZpGfy4ft50g+Zd2xgBzYfixZbXyu5DT1PVmF9TV5Q2d9sGFyBfyLn2fgpXwr3QJzkUjbrXsUPidoppVxBQYovW3n494QODehNQilOy0mIIduhmYICdzVAdZ9KVAsRu3tgZh9AUkyPgUu7yvNbCqlCul0FajUCUl6QXr5dsUCFOQukTqNt29kxX0KZrKQOwuOkladgvHUzTbM+AuE879AmsLTMiZrJxBgF7UkTlEXAYVIHqScNwV3MydR7InzolCCW4xqTnVgqv7c875Y85Ylgf/PgGsApd7ogYoOLSaaWLFCLQHVJaXU4WVMVZKrXLSrC3cR7BZZiAJN9jeiYp2Z9kjMlZ/sXk1MYBDv/tCpnybEDK7/ZEw+avqlaXQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0e5178e5-580b-4ef6-ea4b-08dc333e86c6 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Feb 2024 00:38:02.3440 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3P250MB0210 Subject: [FFmpeg-devel] [PATCH 4/4] fftools/ffprobe: Use int64_t instead of long long int 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: o3um/Ri/7mve This makes ffprobe match the rest of the codebase. Signed-off-by: Andreas Rheinhardt --- fftools/ffprobe.c | 47 ++++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index 31081d19e2..ea225f14ab 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -397,14 +397,14 @@ static void log_callback(void *ptr, int level, const char *fmt, va_list vl) } struct unit_value { - union { double d; long long int i; } val; + union { double d; int64_t i; } val; const char *unit; }; static char *value_string(char *buf, int buf_size, struct unit_value uv) { double vald; - long long int vali; + int64_t vali; int show_float = 0; if (uv.unit == unit_second_str) { @@ -427,15 +427,15 @@ static char *value_string(char *buf, int buf_size, struct unit_value uv) const char *prefix_string = ""; if (use_value_prefix && vald > 1) { - long long int index; + int64_t index; if (uv.unit == unit_byte_str && use_byte_value_binary_prefix) { - index = (long long int) (log2(vald)) / 10; + index = (int64_t) (log2(vald)) / 10; index = av_clip(index, 0, FF_ARRAY_ELEMS(si_prefixes) - 1); vald /= si_prefixes[index].bin_val; prefix_string = si_prefixes[index].bin_str; } else { - index = (long long int) (log10(vald)) / 3; + index = (int64_t) (log10(vald)) / 3; index = av_clip(index, 0, FF_ARRAY_ELEMS(si_prefixes) - 1); vald /= si_prefixes[index].dec_val; prefix_string = si_prefixes[index].dec_str; @@ -443,10 +443,10 @@ static char *value_string(char *buf, int buf_size, struct unit_value uv) vali = vald; } - if (show_float || (use_value_prefix && vald != (long long int)vald)) + if (show_float || (use_value_prefix && vald != (int64_t)vald)) snprintf(buf, buf_size, "%f", vald); else - snprintf(buf, buf_size, "%lld", vali); + snprintf(buf, buf_size, "%"PRId64, vali); av_strlcatf(buf, buf_size, "%s%s%s", *prefix_string || show_value_unit ? " " : "", prefix_string, show_value_unit ? uv.unit : ""); } @@ -478,7 +478,7 @@ typedef struct Writer { void (*print_section_header)(WriterContext *wctx, const void *data); void (*print_section_footer)(WriterContext *wctx); - void (*print_integer) (WriterContext *wctx, const char *, long long int); + void (*print_integer) (WriterContext *wctx, const char *, int64_t); void (*print_rational) (WriterContext *wctx, AVRational *q, char *sep); void (*print_string) (WriterContext *wctx, const char *, const char *); int flags; ///< a combination or WRITER_FLAG_* @@ -772,7 +772,7 @@ static inline void writer_print_section_footer(WriterContext *wctx) } static inline void writer_print_integer(WriterContext *wctx, - const char *key, long long int val) + const char *key, int64_t val) { const struct section *section = wctx->section[wctx->level]; @@ -1105,13 +1105,13 @@ static void default_print_str(WriterContext *wctx, const char *key, const char * writer_printf(wctx, "%s\n", value); } -static void default_print_int(WriterContext *wctx, const char *key, long long int value) +static void default_print_int(WriterContext *wctx, const char *key, int64_t value) { DefaultContext *def = wctx->priv; if (!def->nokey) writer_printf(wctx, "%s%s=", wctx->section_pbuf[wctx->level].str, key); - writer_printf(wctx, "%lld\n", value); + writer_printf(wctx, "%"PRId64"\n", value); } static const Writer default_writer = { @@ -1303,14 +1303,14 @@ static void compact_print_str(WriterContext *wctx, const char *key, const char * av_bprint_finalize(&buf, NULL); } -static void compact_print_int(WriterContext *wctx, const char *key, long long int value) +static void compact_print_int(WriterContext *wctx, const char *key, int64_t value) { CompactContext *compact = wctx->priv; if (wctx->nb_item[wctx->level]) writer_w8(wctx, compact->item_sep); if (!compact->nokey) writer_printf(wctx, "%s%s=", wctx->section_pbuf[wctx->level].str, key); - writer_printf(wctx, "%lld", value); + writer_printf(wctx, "%"PRId64, value); } static const Writer compact_writer = { @@ -1451,9 +1451,9 @@ static void flat_print_section_header(WriterContext *wctx, const void *data) } } -static void flat_print_int(WriterContext *wctx, const char *key, long long int value) +static void flat_print_int(WriterContext *wctx, const char *key, int64_t value) { - writer_printf(wctx, "%s%s=%lld\n", wctx->section_pbuf[wctx->level].str, key, value); + writer_printf(wctx, "%s%s=%"PRId64"\n", wctx->section_pbuf[wctx->level].str, key, value); } static void flat_print_str(WriterContext *wctx, const char *key, const char *value) @@ -1569,9 +1569,9 @@ static void ini_print_str(WriterContext *wctx, const char *key, const char *valu av_bprint_finalize(&buf, NULL); } -static void ini_print_int(WriterContext *wctx, const char *key, long long int value) +static void ini_print_int(WriterContext *wctx, const char *key, int64_t value) { - writer_printf(wctx, "%s=%lld\n", key, value); + writer_printf(wctx, "%s=%"PRId64"\n", key, value); } static const Writer ini_writer = { @@ -1722,7 +1722,7 @@ static void json_print_str(WriterContext *wctx, const char *key, const char *val json_print_item_str(wctx, key, value); } -static void json_print_int(WriterContext *wctx, const char *key, long long int value) +static void json_print_int(WriterContext *wctx, const char *key, int64_t value) { JSONContext *json = wctx->priv; const struct section *parent_section = wctx->level ? @@ -1735,7 +1735,7 @@ static void json_print_int(WriterContext *wctx, const char *key, long long int v JSON_INDENT(); av_bprint_init(&buf, 1, AV_BPRINT_SIZE_UNLIMITED); - writer_printf(wctx, "\"%s\": %lld", json_escape_str(&buf, key, wctx), value); + writer_printf(wctx, "\"%s\": %"PRId64, json_escape_str(&buf, key, wctx), value); av_bprint_finalize(&buf, NULL); } @@ -1861,7 +1861,7 @@ static void xml_print_section_footer(WriterContext *wctx) } static void xml_print_value(WriterContext *wctx, const char *key, - const char *str, long long int num, const int is_int) + const char *str, int64_t num, const int is_int) { AVBPrint buf; XMLContext *xml = wctx->priv; @@ -1879,7 +1879,7 @@ static void xml_print_value(WriterContext *wctx, const char *key, av_bprint_clear(&buf); if (is_int) { - writer_printf(wctx, " value=\"%lld\"/>\n", num); + writer_printf(wctx, " value=\"%"PRId64"\"/>\n", num); } else { av_bprint_escape(&buf, str, NULL, AV_ESCAPE_MODE_XML, AV_ESCAPE_FLAG_XML_DOUBLE_QUOTES); @@ -1891,7 +1891,7 @@ static void xml_print_value(WriterContext *wctx, const char *key, writer_w8(wctx, ' '); if (is_int) { - writer_printf(wctx, "%s=\"%lld\"", key, num); + writer_printf(wctx, "%s=\"%"PRId64"\"", key, num); } else { av_bprint_escape(&buf, str, NULL, AV_ESCAPE_MODE_XML, AV_ESCAPE_FLAG_XML_DOUBLE_QUOTES); @@ -1906,7 +1906,8 @@ static inline void xml_print_str(WriterContext *wctx, const char *key, const cha xml_print_value(wctx, key, value, 0, 0); } -static inline void xml_print_int(WriterContext *wctx, const char *key, long long int value) { +static void xml_print_int(WriterContext *wctx, const char *key, int64_t value) +{ xml_print_value(wctx, key, NULL, value, 1); }