From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 04E0649805 for ; Mon, 20 May 2024 09:42:05 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 373D168D16C; Mon, 20 May 2024 12:42:02 +0300 (EEST) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04olkn2019.outbound.protection.outlook.com [40.92.75.19]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E8D1268C371 for ; Mon, 20 May 2024 12:41:55 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=M3cTY8p03cZiJTklSP3sal668OM5DWxgFC5MjaB+VBPV6guE1R8thacgmwsiw1oDMBbj9oHGtLUIYjbJ0bG7GxN1A817N64uKxjhoGYlNPK/Ynb2Oghr2BoHzoNwIGhZg1/bCLysLpY7nqY0EUJjtOb44WYwbZNRXmebS03VdDt8G5GQAnAqs+Ed6LSVrVWN8iLmKMmk7AQyTBo6fl8VHGGP1lIB8at/v82jyiOgV/U+h/Okrvdwa92h2XklYhHdzUm9SnfZT34nC2oTXziKDr+r+zQXcraYO3luKJAqyLLKWuBDwISeOsH8wAFEAyA9NlbI+zwd3803yfbb9lBnXA== 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=U+LQ/SHypfYaSwEULHRyycyGUGFZQqvUXCuQLzsMJCU=; b=fNu4eB1a0JQFfu+PN9qvBluarSoviRljLf24sFfGk1TtPJNo1URrhfTsq6gcLe/kvhR2pTZeq/4Rb6ZYDUwTheVE8CJ/7wLleB9BMOg7cUFBhH2LtDBtkobAFwbVMhXKADMNOOBgH3dVlIbiFAXCqQ2728lkZRfTqb60lWqsVPOZXWPoIz89dDCrZYX8z+FroXY/2IwaW/X59BQwbTiA0Re5xWktghzSyeoE7HUnDw9fH9WCX2Eyt7ML0HJNDObtQrYjtFlSzeTGkAPTIpZsgDJ1bf93egws2UBpir1mRoaR3VcNl09P9qqv1HoJnXMzUxRFkUTLW/GbsUp6hIYlzQ== 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=U+LQ/SHypfYaSwEULHRyycyGUGFZQqvUXCuQLzsMJCU=; b=oUMGjsiflWij96M3J9Yl1zow0+2qIE1GNMM4+kpnwdhafZNQlYM4jo9Xh3vaJFrygVujbk8pOwCKpznXI7clVBn6pu62rnoZotJ5pJLAx1qBywwOpVFkW7gtDcbwIBfXNREpoQJTznuSLSyQ1O/ZYVm8K3Dz5pQHoxCfCugfuuNZcqMtsHumQU0YPOXxRhi1+DBUwBd/ft9ye9uIMhDCS+QNv2SviArYKMgbUHuMxnJtKEa5hj6FcerGWtNlYSk0KJ+pJASudHH8kmEOdeq/usse8T5oZjhSdRdS7rmqASSgw4LIj6LOUnJm101LCN9tY0PixEH0qMPUmoZSvKI3vg== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0224.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:279::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7587.35; Mon, 20 May 2024 09:41:54 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9%4]) with mapi id 15.20.7544.052; Mon, 20 May 2024 09:41:54 +0000 Message-ID: Date: Mon, 20 May 2024 11:41:52 +0200 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: Content-Language: en-US From: Andreas Rheinhardt In-Reply-To: X-TMN: [MOi576yL+zEZJXLSfw80CyQeK/KlyOU9h+2f7fnSy3s=] X-ClientProxiedBy: ZR2P278CA0057.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:53::14) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <39784ef7-7b1a-4005-acde-4ffeb33eb7ea@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0224:EE_ X-MS-Office365-Filtering-Correlation-Id: 0b412031-1e60-4c58-7007-08dc78b11529 X-Microsoft-Antispam: BCL:0;ARA:14566002|461199019|440099019|3412199016; X-Microsoft-Antispam-Message-Info: PdGejD1gCKyPreJiVR/Fh2BV6f2b4aAfHd76PG0vYTjlqgwVCt/WgVLPX6G42IwTc8UsQaie+4TaNbWU+wjoHrsc8Id6LXkRbvNhK5m9WOer45VKtayMGuk/isu2+ffy6oiBRt2Mk1gt9pLM865b15rOSXojCegdA65E5kaXCs4YtVmVljC+SpTxbKKD1jhMw0w38LvTZo/Xjzt7ObFqtsy7ADp++HEgaqWBbv4xrE89H0vNG1wMyS1pQ22X1fj3Fgi5Sxeb6JN6MMmbfBYjOsaAOWOr2ooMGaQ4heHo1ZlYHlCZ4psfJGphOJ3/w5rrf6KE0/OKhDA2iLxcJGKnV88OnwfgqeT7ZwyQlsZt5XVZQRMDTXDkXyXwWTQ8VY9E0W31GWDvt13qXkyRcGzB5QGifBvdGut3vRv2aOCqJj/jsJdiQWm928YIwXG5FyVwoBEx1y/ataypY9Fyg69kgQjFJcDpP70EHK1srI0tajpLlvD6OeluTUMwkbSJ6K9frHL+pyP2Mfh2Z0GWrBRJUMF13gzcImfHT2RbHrbomkU1RjYucPvVFeugh0YI3VPz X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?NTFkN3JNb3VwUXZpZHJTbnpNeVRDVy92NDEyNk1FVW40bzVFcG9uOFV5Qnln?= =?utf-8?B?NEZwa0NGdzRWYkVOVlNLNkNzM3oxVHJ4eHhweS9SaDB5azlqT3lVV2tjSkV0?= =?utf-8?B?Y1hSTjJRbzUxT2Z5bVJMWHp0SkViUUVDcVVLT0MyanUyT0xZTUpMbDM1SkNS?= =?utf-8?B?K1lQeG0ycVVxbWxKSVlhcWdqaTF6elhocFNlczBiQ1g0SnZCMHVtU1B0U0ht?= =?utf-8?B?RHZZYkQ0RWhtSmVsTTcydmV3Uis3Z2taejlKYmloZXhDNGlXRm80MTcyTVpZ?= =?utf-8?B?WUdndVdtNHNFdEwrZ09CeXFUZ2owVXVaTUdUWkkyUmlLS3RSTDZtSDRMQU9p?= =?utf-8?B?RWZDTDM1UkhMRTdLc2ROT0pRQ3o0cXJOQnBnSEUxSEJmQXlUd3I0UE80a2lY?= =?utf-8?B?Y2ZhVkU1NXpUUXorMjR0R002MkFmL1Vnek52ZVB0aEZpcytJS3JqNTB5U0lJ?= =?utf-8?B?SitOZWFHY2xScloxYTgyVU9xZlFJRmZHSmJ3SHVoYytmRmdVdENad0k5ZE1S?= =?utf-8?B?OWFpem0ySlJ3NDFocXZhaENkZ21saCtYQzg4U25KYkIxd0V6TW9ZVDNXdE5N?= =?utf-8?B?LzE5aldIaXZId0dTRitvZG1iQWFGM2Eydk85RkFNYWNSMzRmTjJBVmdZcTdy?= =?utf-8?B?eUFpejBuR1RSYUdUSW01UXlkekRLcE9BWjZ4Y3ZsRW12aTdaMTZwM1JJODc3?= =?utf-8?B?Nkg4TFE0U0JleWVzRXdBbjRQNTk3ZGxkZCtzcW5wQm43RGZEc0ZMQ3RSWFpy?= =?utf-8?B?WDBadTNTbEdCbFBKZmcrRjRYaXY3bjRJdmFIaSt4V3lCb2w0YnlXdmJ6ZC9U?= =?utf-8?B?cEZ3QVVSQnA5REs5VzhId2FTL01Ib2U0R1NhNUxYaUdQaGdrVGk4c0gwcDNM?= =?utf-8?B?bXpVMkVBcFdjcGdIWlErWUtqQ2Z4b09MT0FhZjhsQWVhd0dvUDVpUW9BUFNi?= =?utf-8?B?VmdVUlNmUlFzNHZzd1p6WWlyQWpnVUs1R09EQ0I0cjdxVm1zQktzampoVU1W?= =?utf-8?B?cWdxcnJxL2F5b3dONkcvUzY1R3JGdUFYeWkreFpCOS9wMEcwU0habzJCZWVw?= =?utf-8?B?ejRNQnBrcTloYkdiOEtuaTRHUW4rU05XM25rVzlOOGsyMnozVjlaMU5OaWY0?= =?utf-8?B?VmZCcHJVOGxOaUQralQvdzI5ZHNIVWhpYWhoaFJJVjdVeCtiSU5JeW5DY2dp?= =?utf-8?B?eHJDMWVZam5FSTFjMW93VGw0aEFXZVlVUkJEcUxTUCttdzBOdG9PV3VjNm9T?= =?utf-8?B?NzY0bkFKZUhzenNPdHBRbnp4c2pGS2NIay95NzlOL1NPRVhuRHNxNnBUcGtm?= =?utf-8?B?NFhBM2l2bHlmdHNCbkxUanB3UE5pcGtYcmdEOFI4TXRwLzBRQUhCZHEyY3lx?= =?utf-8?B?cmtqU0VHTkZRMkVlbXliNHRzN25ZcSs3THVOWG56Uk0xbWR3ZG9PTnZraTJ0?= =?utf-8?B?K2tGcjU3T2krMmk0SnVaQ2cxUzVLT0dycEtwWFVIeTg2ZS9mOFVabkR5VGFm?= =?utf-8?B?dFJZTmRVQzV6NU1wSEx1WTUxU2FYR3dxZEhiU3loRXZNbUIvTjZiQ3U3SmxK?= =?utf-8?B?MlVHc0wvRmlTdjBOREI3Vy9NTWhQNDhIelhtb3RhRmhpNGJLVmdabjVDYUpF?= =?utf-8?B?clR3My9KZzYzVW5YQUl4bE50STFnNnFoS0kwS3RaTmFJV0Z4V2lmaS9nT2Yx?= =?utf-8?B?S3lKMFVrRlBzQ0NWZnBBU2t0elVvOXpHeTJQT0VQdjZkZW1YaVBweUhBPT0=?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0b412031-1e60-4c58-7007-08dc78b11529 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 May 2024 09:41:54.1244 (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: DU2P250MB0224 Subject: Re: [FFmpeg-devel] [PATCH 1/3] avfilter/vf_signalstats: Use av_dict_set_int() where appropriate 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Andreas Rheinhardt: > Signed-off-by: Andreas Rheinhardt > --- > libavfilter/vf_signalstats.c | 80 ++++++++++++++++++------------------ > 1 file changed, 40 insertions(+), 40 deletions(-) > > diff --git a/libavfilter/vf_signalstats.c b/libavfilter/vf_signalstats.c > index c2358c66cb..960899596f 100644 > --- a/libavfilter/vf_signalstats.c > +++ b/libavfilter/vf_signalstats.c > @@ -720,40 +720,40 @@ static int filter_frame8(AVFilterLink *link, AVFrame *in) > av_dict_set(&out->metadata, "lavfi.signalstats." key, metabuf, 0); \ > } while (0) > > - SET_META("YMIN", "%d", miny); > - SET_META("YLOW", "%d", lowy); > + av_dict_set_int(&out->metadata, "lavfi.signalstats.YMIN", miny, 0); > + av_dict_set_int(&out->metadata, "lavfi.signalstats.YLOW", lowy, 0); > SET_META("YAVG", "%g", 1.0 * toty / s->fs); > - SET_META("YHIGH", "%d", highy); > - SET_META("YMAX", "%d", maxy); > + av_dict_set_int(&out->metadata, "lavfi.signalstats.YHIGH", highy, 0); > + av_dict_set_int(&out->metadata, "lavfi.signalstats.YMAX", maxy, 0); > > - SET_META("UMIN", "%d", minu); > - SET_META("ULOW", "%d", lowu); > + av_dict_set_int(&out->metadata, "lavfi.signalstats.UMIN", minu, 0); > + av_dict_set_int(&out->metadata, "lavfi.signalstats.ULOW", lowu, 0); > SET_META("UAVG", "%g", 1.0 * totu / s->cfs); > - SET_META("UHIGH", "%d", highu); > - SET_META("UMAX", "%d", maxu); > + av_dict_set_int(&out->metadata, "lavfi.signalstats.UHIGH", highu, 0); > + av_dict_set_int(&out->metadata, "lavfi.signalstats.UMAX", maxu, 0); > > - SET_META("VMIN", "%d", minv); > - SET_META("VLOW", "%d", lowv); > + av_dict_set_int(&out->metadata, "lavfi.signalstats.VMIN", minv, 0); > + av_dict_set_int(&out->metadata, "lavfi.signalstats.VLOW", lowv, 0); > SET_META("VAVG", "%g", 1.0 * totv / s->cfs); > - SET_META("VHIGH", "%d", highv); > - SET_META("VMAX", "%d", maxv); > + av_dict_set_int(&out->metadata, "lavfi.signalstats.VHIGH", highv, 0); > + av_dict_set_int(&out->metadata, "lavfi.signalstats.VMAX", maxv, 0); > > - SET_META("SATMIN", "%d", minsat); > - SET_META("SATLOW", "%d", lowsat); > + av_dict_set_int(&out->metadata, "lavfi.signalstats.SATMIN", minsat, 0); > + av_dict_set_int(&out->metadata, "lavfi.signalstats.SATLOW", lowsat, 0); > SET_META("SATAVG", "%g", 1.0 * totsat / s->cfs); > - SET_META("SATHIGH", "%d", highsat); > - SET_META("SATMAX", "%d", maxsat); > + av_dict_set_int(&out->metadata, "lavfi.signalstats.SATHIGH", highsat, 0); > + av_dict_set_int(&out->metadata, "lavfi.signalstats.SATMAX", maxsat, 0); > > - SET_META("HUEMED", "%d", medhue); > + av_dict_set_int(&out->metadata, "lavfi.signalstats.HUEMED", medhue, 0); > SET_META("HUEAVG", "%g", 1.0 * tothue / s->cfs); > > SET_META("YDIF", "%g", 1.0 * dify / s->fs); > SET_META("UDIF", "%g", 1.0 * difu / s->cfs); > SET_META("VDIF", "%g", 1.0 * difv / s->cfs); > > - SET_META("YBITDEPTH", "%d", compute_bit_depth(masky)); > - SET_META("UBITDEPTH", "%d", compute_bit_depth(masku)); > - SET_META("VBITDEPTH", "%d", compute_bit_depth(maskv)); > + av_dict_set_int(&out->metadata, "lavfi.signalstats.YBITDEPTH", compute_bit_depth(masky), 0); > + av_dict_set_int(&out->metadata, "lavfi.signalstats.UBITDEPTH", compute_bit_depth(masku), 0); > + av_dict_set_int(&out->metadata, "lavfi.signalstats.VBITDEPTH", compute_bit_depth(maskv), 0); > > for (fil = 0; fil < FILT_NUMB; fil ++) { > if (s->filters & 1< @@ -946,40 +946,40 @@ static int filter_frame16(AVFilterLink *link, AVFrame *in) > av_frame_free(&s->frame_prev); > s->frame_prev = av_frame_clone(in); > > - SET_META("YMIN", "%d", miny); > - SET_META("YLOW", "%d", lowy); > + av_dict_set_int(&out->metadata, "lavfi.signalstats.YMIN", miny, 0); > + av_dict_set_int(&out->metadata, "lavfi.signalstats.YLOW", lowy, 0); > SET_META("YAVG", "%g", 1.0 * toty / s->fs); > - SET_META("YHIGH", "%d", highy); > - SET_META("YMAX", "%d", maxy); > + av_dict_set_int(&out->metadata, "lavfi.signalstats.YHIGH", highy, 0); > + av_dict_set_int(&out->metadata, "lavfi.signalstats.YMAX", maxy, 0); > > - SET_META("UMIN", "%d", minu); > - SET_META("ULOW", "%d", lowu); > + av_dict_set_int(&out->metadata, "lavfi.signalstats.UMIN", minu, 0); > + av_dict_set_int(&out->metadata, "lavfi.signalstats.ULOW", lowu, 0); > SET_META("UAVG", "%g", 1.0 * totu / s->cfs); > - SET_META("UHIGH", "%d", highu); > - SET_META("UMAX", "%d", maxu); > + av_dict_set_int(&out->metadata, "lavfi.signalstats.UHIGH", highu, 0); > + av_dict_set_int(&out->metadata, "lavfi.signalstats.UMAX", maxu, 0); > > - SET_META("VMIN", "%d", minv); > - SET_META("VLOW", "%d", lowv); > + av_dict_set_int(&out->metadata, "lavfi.signalstats.VMIN", minv, 0); > + av_dict_set_int(&out->metadata, "lavfi.signalstats.VLOW", lowv, 0); > SET_META("VAVG", "%g", 1.0 * totv / s->cfs); > - SET_META("VHIGH", "%d", highv); > - SET_META("VMAX", "%d", maxv); > + av_dict_set_int(&out->metadata, "lavfi.signalstats.VHIGH", highv, 0); > + av_dict_set_int(&out->metadata, "lavfi.signalstats.VMAX", maxv, 0); > > - SET_META("SATMIN", "%d", minsat); > - SET_META("SATLOW", "%d", lowsat); > + av_dict_set_int(&out->metadata, "lavfi.signalstats.SATMIN", minsat, 0); > + av_dict_set_int(&out->metadata, "lavfi.signalstats.SATLOW", lowsat, 0); > SET_META("SATAVG", "%g", 1.0 * totsat / s->cfs); > - SET_META("SATHIGH", "%d", highsat); > - SET_META("SATMAX", "%d", maxsat); > + av_dict_set_int(&out->metadata, "lavfi.signalstats.SATHIGH", highsat, 0); > + av_dict_set_int(&out->metadata, "lavfi.signalstats.SATMAX", maxsat, 0); > > - SET_META("HUEMED", "%d", medhue); > + av_dict_set_int(&out->metadata, "lavfi.signalstats.HUEMED", medhue, 0); > SET_META("HUEAVG", "%g", 1.0 * tothue / s->cfs); > > SET_META("YDIF", "%g", 1.0 * dify / s->fs); > SET_META("UDIF", "%g", 1.0 * difu / s->cfs); > SET_META("VDIF", "%g", 1.0 * difv / s->cfs); > > - SET_META("YBITDEPTH", "%d", compute_bit_depth(masky)); > - SET_META("UBITDEPTH", "%d", compute_bit_depth(masku)); > - SET_META("VBITDEPTH", "%d", compute_bit_depth(maskv)); > + av_dict_set_int(&out->metadata, "lavfi.signalstats.YBITDEPTH", compute_bit_depth(masky), 0); > + av_dict_set_int(&out->metadata, "lavfi.signalstats.UBITDEPTH", compute_bit_depth(masku), 0); > + av_dict_set_int(&out->metadata, "lavfi.signalstats.VBITDEPTH", compute_bit_depth(maskv), 0); > > for (fil = 0; fil < FILT_NUMB; fil ++) { > if (s->filters & 1<