From patchwork Thu Mar 14 00:36:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47040 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:9204:b0:1a3:31a3:7958 with SMTP id tl4csp137148pzb; Wed, 13 Mar 2024 17:36:54 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVS3smuZx6WAcGaLA0f+oZsCfDojZIaZsf4pw4xSJh7d9c9X1n+qy5VYYLamcvzGxiMDRsgbcVp1XVDDc083fAf6sZ7NGLNL0ZVcQ== X-Google-Smtp-Source: AGHT+IFN6UykJ8RNHYHGZJYOaKvjRpz48SGtH+IgSmQ/mMb5FoI06W4MrCSTPu66EMnz4PsDGL5R X-Received: by 2002:a17:906:3409:b0:a46:5fad:241c with SMTP id c9-20020a170906340900b00a465fad241cmr79962ejb.69.1710376614094; Wed, 13 Mar 2024 17:36:54 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id s20-20020a170906bc5400b00a45feedc02dsi157979ejv.740.2024.03.13.17.36.52; Wed, 13 Mar 2024 17:36:54 -0700 (PDT) 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=OvezVEgI; 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 4D9D668D08E; Thu, 14 Mar 2024 02:36:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03olkn2074.outbound.protection.outlook.com [40.92.58.74]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D1B8168C7F8 for ; Thu, 14 Mar 2024 02:36:43 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Gg6ec7Eb47voh4Mgw8aV63+fHuYFu/PMQWnlFuvA4sCTQGvNz8Txi6JgKhW0/AMOJaD/7g1a0BP29PPmO5FslupXLGZ7m9EmWzKJo4xG6pKLXODJj93kbLrfes0Qnwd9b+HHTl3QazZ6swBNYQak7HcEac4L6WHKgFCeuctT/ZWo+O4VnM4jmNBVpOSNGQAYFkD74yazw1qWR1gV9Ip6ErKdEDUXBY1nxxA3MBmW4bIBIWYUxCJ85CX/mSjXNu9CvHR63I0VMmkB1/bF/h5xLd/cIPyRzB/l4Etz1t5m6RQa9YBruvQWKaj3IY7cFYGUExzZf0uH5IG6hzr+cjTPYw== 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=fz2NqZwCrj0VM+4EJMtYalnMUtEOLfXsoKtIP4A/Ypo=; b=TptqYdfOfWQpBcUjJrjOVdauoqmTnOJ3TvrDr3OLUSLQAlI6XgA5cPSkkuHDyzO8k50GFLwAM4RC0Ll3n2VE+zKrBwHqrXCR6AmX4/Lv5xtc5Of6pSqxjWW95y1BXvIiaN3BoAaZXf1PTF3Gk81f57X4egTfOG8k8QEz74b8o2w0OcF9PWEceyQGAtmYIpq3m2Z5Prk1A+t/rtFg/lQiYa+yZmTqQQfwq0fTTROd6E6/+SuHbPeJpGeBYh2IWT53R5z5UEDp2nOBkmtI1tmieJf4V5v4kzT9h81QcK/WhIK9rT7s6xcP5S0Oe1BGNEd6DWudz5Xfk4Ft2A6WofzfWg== 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=fz2NqZwCrj0VM+4EJMtYalnMUtEOLfXsoKtIP4A/Ypo=; b=OvezVEgIdXbt23ynbMVG4QbuO0oll9VVI3Cp271J+g1winuZhcqGqBMJwmhkcJ129N53S/xQLsfS35X709ddC2Y4ZTzYYsJ6EYC6qN4mepyYdzTpRRS+Ni67fDI5IEst7OL5cf8d8pj6JS1G/yYxwk9ISna2lHfwfyDxbjF8z9Nbt1acTDvRnUxxQ0fj9CTIMSi/zBIA/hiKrlz81NUJdkxFe7r0CX23Rndtv/tvTu8k7NNjmjG3LN0PJKO/2IjMtkgHrHYiikXLpkS6QaCVQvayiQu0+uZc3ILlh59DBBGsa5p8GuMjRUSQdm3YeLox31ElkWGKl2IQXy2CUwRu2Q== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0152.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17e::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7386.21; Thu, 14 Mar 2024 00:36:41 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::228d:8c6f:ed10:82eb]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::228d:8c6f:ed10:82eb%7]) with mapi id 15.20.7362.035; Thu, 14 Mar 2024 00:36:41 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 14 Mar 2024 01:36:32 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [MnuKEHX8XlC2+EHpE92FscMvtMl+ciDzRf2slHSUeFE=] X-ClientProxiedBy: ZR0P278CA0140.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:40::19) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240314003633.3064297-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0152:EE_ X-MS-Office365-Filtering-Correlation-Id: b60f1083-a585-4baf-04b3-08dc43bed10b X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnrZB07ndMjn8PPzEH1YHAJhIF/JsOEW6BBammfMu/Cji0yeLQEtfJeQzC/uLPaTEZlssavi8D7sN04Bc9zune4vZAZNkk5iEmK5urI8ZlzSL+f9/PdN8Tkx3Lrfu7YqBMuIb4zVTLw5Rx/zdyAhyDuidt/nS7uExvoHk3L7XLLHBvE4RYpB5BUUu0zxcYGZb2PDFtSetOPdjyfdr0x5Pkoaf0CMz5+6Ke7+WXCBRSUfcIyLY8CmJb9DW9RMCYhtC0zvnEza3OFGTivFbs/yvv79Bg3U8D+E7skE6R6QXrnpnVaQhsS0irP726zetQmy4/hY5r1vp9/sN5q6GfUE3HFouOw+js8DYZihAegro8oiJhWa4zZSbqlxbAhq5Px1s7UmdJBQpiTq2q3HHTuM8b8/s80zhjMm+B4w3dD/1UkEkuIiTbhuJTvgTt9cmnOGYaLbZx9xksuXQBM9SsCwvm3jwJUOuGBSbabPH38hRUJgpNJbHNs1xQUooc5DjZIGA86GsKRUi4sK1chN4zP3UNB4t2A34Tz5tgFmieLfVkppREiUAdYdM9sdp2L2I4sIwY2q8Gxx4/e5imYwqrnOyDcN1jFFrF9z1xLI+Gb3ctMc+zveVYe/mGKdktGpfDMcUaBtTGzCP1M2WEPedyE/LKpit/pr6GMPZ+cPDfjlJ2C7h6Cgec0DOUouSsYgaH4pMriLGUCu054Ic5Cn4Svcd4wATag0TwfE1vslaoxZEI8uA79epgZoJR3AUy0ijkrq8uM= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6iPpaYC0jtT97JwEhsPPUUqi0MSkVNZgINL9r9hzz8ZLdu7bAvNm/QQMG7kicrM6pAiAw2qPATuscNwLOCBHsh+oogmqD69kTBv4TrP2qQOsICnbxutpy3rVNE510t/+gm79rQWucODrqDJ/YmqjR7l4LB2G//3a4sgdPYDFLLD2Mjs7zhgSabASPnQ+H6qYWOe8z2irznZkx2o9IcASRN51ccpj6VnMeDk2Dmd/JIjEG1iJkL7gPvrZuuKttmbODOYPoGKCaNBL0DnJcRMSia70OwJ2P3fgzmVWBHBnrirSkE6j0M4JCkjE1EjM2tm7SDJXiW7XocV04sUui3sf0klJ5tYrcoeLVhNCYpbBmQLttNCKNKR4DOtWOAKATHqXqZ9t1PIfGPH5LxS03H5/7OBcZwLUNQwSFXss/QJnCWnreilQyfALvdHlx0GcuY8Ry5JUQfL+A0EKIEBoYwJSrepSCyBESnVC2045H91ug92N03maK7HbX01RSD6ovWO0li4dCUUjic2ET+EAc4dzEWABJzvzXhr6oh5AoC5fGUGtdqJyAHOphMdNiFkO+6LWtz8WrHL++UN7Qb771YMe7kSq7whrXgPaMC3e4op5N/rt6g7NKQUc4DTt9Cf+5qeV X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: er8QYLw+he9bHwKCIReCyXaEy22PyumE123+4lCghMAILalCXHdhhpzvPiduNc4CpkOzvuctUY0F5AS9Spd1pUYEO6DCk+eOm2/eJ/IS6nfAaOaCiLI4bo6V+deBE1tVpvLm799cIbeMJP7x9rfu9nNB9r6CJAvVRFoklclDKnf8Amd2iX9y4qFCtFkIKqiOY809hIqAW3TuWDxLgH43h2NKjgfevXAy2UZCNe92bmqcf6xqKI6Xfi67t+OKYlwTA+3MhvQrUfLUC4RrPyYQmiN7RGQlK//O0zx8yWxtzxZNSNtqP2l8SC+nuZS9efzJmUgiMUuYL5nKY4lhn3T4bByqImPkG96+vqE0qcr3XyJJyAHdb2tgVnFbkQN72PBEXAzao+sVS2BpMkRPKkFjnb3/8xPKs0mv1zcKayQ8240+7bKI0zulUC1vHbuJpAo4xXH73ieAaGQwLRZx+PNuPeyjiwV9n1CigQq46g/B6DpoX6LjS0DyqGnA90J+MMJ+W2b7Jip24ovZqL7K4uJRGyuZp4iPQ8/TTS4XeGlve98f3PbgAPYuhmOYg7GTJ+3q0vJJkt/pHzNbHkBy1YX/JzC177Zp6ad7APzpGqJumG2fbpYN9weDRcRrcn4TsPObPcpa7DUAxolVTf2SDfhtULUS2pepY+Jg80KG0b/PFDWPoBtt56tzu/OekWug8mXlQVe1RPqEmT444ugr/3BZfvTbFzXU/q9qalvzgKNglg4EJjZeLWtRCI81fqiJjsIEuaI+8l15kmnmwZXRGSKKU7/8OQt6eXD6B9W0k3PwqIcc3QSSs0+f2DsIUsgPpwe0j4AoG6BWJebLDK2lWz8xp5/YYTWmoZlGHMwXc2mftXasAYHX+0wKVTeXYBbzhjSbFeWgw4RjEMbnt/pjd8mF1guAT0G1sItlfdZN7a2nFMM0ZwMyZakYq7UjHZnDKYh4uBIiFztE8TuMXInyuzH6//2zNVNQpjEOw+Q5cuIayD77zAMY5f0ANxG/QICAj7IECvkPoabdwhP+STBcdbB+ScG1uNKRvEtYTNzSMRetUAmL8CTZfpczCrh2896m9m0Za4sNg2Y2fLu7Y+qcZKei0D8rsYRGXypY5YYgkmQZ0obYkfyDIuqpfMsIoWluoMGupznSmreUSmVp65nxBSglm7lWYqMj86F6BxwpDp8QazuwYmCo9mp9tdonJTi6QBfbR+SIerNtn4cgqeZGV1umDBB8RoqRT9uJSdHTS1SBsRZznqL+mk92AFOKfz7R0MKHxelN6yBpj+7v7yen0HYc4A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b60f1083-a585-4baf-04b3-08dc43bed10b X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Mar 2024 00:36:41.1888 (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: PR3P250MB0152 Subject: [FFmpeg-devel] [PATCH 2/3] avformat/aiffenc: Simplify padding tag 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: Ur3DSdFgVvsy Signed-off-by: Andreas Rheinhardt --- libavformat/aiffenc.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libavformat/aiffenc.c b/libavformat/aiffenc.c index 11a5b18d57..37aca41847 100644 --- a/libavformat/aiffenc.c +++ b/libavformat/aiffenc.c @@ -87,13 +87,15 @@ static void put_meta(AVFormatContext *s, const char *key, uint32_t id) AVIOContext *pb = s->pb; if (tag = av_dict_get(s->metadata, key, NULL, 0)) { - int size = strlen(tag->value); + size_t size = strlen(tag->value); + + // AIFF tags are zero-padded to an even length. + // So simply copy the terminating \0 if the length is odd. + size = FFALIGN(size, 2); avio_wl32(pb, id); - avio_wb32(pb, FFALIGN(size, 2)); + avio_wb32(pb, size); avio_write(pb, tag->value, size); - if (size & 1) - avio_w8(pb, 0); } }