From patchwork Thu Mar 14 00:35:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47039 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:9204:b0:1a3:31a3:7958 with SMTP id tl4csp136916pzb; Wed, 13 Mar 2024 17:36:18 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXVwXFP8PKZdfJ+4BWbq8AlcMzkT1lFTgTvyF6bV+ALOWhIWi9ywIC3yWVCvH6T5wFiEoS8flzWmyfC2pWafd7YW7aJnsyI6gv0Jg== X-Google-Smtp-Source: AGHT+IHM1UEMD3BGbqTVWHBHC3e0oBXY/+NVqeSnV1LpvJEUKrFAwJ+/BBX6Y+oX7oK/EE/o8OVr X-Received: by 2002:a2e:9ccf:0:b0:2d4:49d2:a3d1 with SMTP id g15-20020a2e9ccf000000b002d449d2a3d1mr86654ljj.1.1710376578393; Wed, 13 Mar 2024 17:36:18 -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 eb11-20020a0564020d0b00b0056763d0295dsi166652edb.333.2024.03.13.17.35.58; Wed, 13 Mar 2024 17:36:18 -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=ipQiAp0o; 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 1464368C7F8; Thu, 14 Mar 2024 02:35:55 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2015.outbound.protection.outlook.com [40.92.89.15]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E908168CF40 for ; Thu, 14 Mar 2024 02:35:47 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kgAhUtDG0fPjTc4xPnpeKZbglLinzNIBNPaZyYNEHm6DgMQutlNwhDB42YXVYp13eOzsMZ5wqwDaraRg+3l87k2K+ANagTIx+9JLkDzUBZqGnSkQKRxKN7WmCHXDtkuxcaG3nM9SuTwuB6PoDCsq3LPaTvylOYgzCZ/ubVbKMtDMgPH/Z1rXHhIM3lzrHO/qGiQ8TuDQN7DeK0Ln5ZUWXQ9qvi433aJ1w22nEjUObOdF16Ypr5OuoaeJIyRHwqwWxd4+Yx5mE0O1mnbGy3/yq64zWYK+69vIYb1KXLuHX482YL3KttOft1zJGoF6uOnKPAhWZGKrHfnicKChCqreMA== 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=fa4XYYE7tNxS9IjphUWnhKGm3U5qq479uNzRMiZ24Yg=; b=lHg1NGmK/qRh0Affa21ZMMZn2pnsoOYZofP7BAd3nC0XckK99iHRYlUlL+jJSAotZmFQOK3cYnT/2edUnIcdK7++JaO3f15ldqtAdR3FlmAmX6Dag4HoCjmy6In8x+bjmB1YHk/QYbdtWrAwfnvUxzQlKSH6qN11bIKSjXwI9micQerqLlWAt2hbgWzlAi+GZVRC8UGLrOhqAmxuxJUzr4F9CfQO4ifyd6LKrIcLdRb+ben3jRMvKCDSuuSWTo6OtOQOcIbzb1qv6bcRTZEqYpZyVVDjw1ZsSCZeFQpLMhmOuUzI03493fBOIAISA8AhtPu0CcoSHQ6rdgf0pJn0NQ== 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=fa4XYYE7tNxS9IjphUWnhKGm3U5qq479uNzRMiZ24Yg=; b=ipQiAp0oNPhPbPUF/XwNeZIXZwsM5NHJtuslppvjDPhXz/md/5FGWdpPgbg3Ek9d6vXLedBcRVTah917IEYntrqah0VVziZbCDfkTXwkmYwb180jUZLVKRx1n+xcvRIaOFfJciFs0ZtS9g9M7TkYQoaTmk0DXFF0dZ8jXWfLfKTb/hBVqOT7xz0iL0aB//pHqRybtOSSfX37qO1F5KhXo41e8gGrmHIL6ex3quxAirN5Btk/35Cpbdlpn3E3RmJPEFQLPeuOHG4zbNGS1Etn1EFrQQGQynS5qXyCOm5TSRVvfWIAQsNyHI7z2lb2Y1n64m75VT4aE/+gDY52evJwZA== 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:35:45 +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:35:45 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 14 Mar 2024 01:35:36 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [gTexykSauzkjOguaf5Xit1BC9Ndojkdjj9ePEIpjh8U=] X-ClientProxiedBy: ZR0P278CA0117.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::14) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240314003538.3064246-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: ff8d6dd6-43bd-483a-e1fd-08dc43beb00a X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnrZB07ndMjn8PPzEH1YHAJh5Z2P+1zaYk0A0u1dTXpwnUi4zqSHAWP8m8Ea/5FW71+GBbbcZI1ibDkQjOvoKSbPeXskaDkZ00B96XoLzlm8yKfhMCNu3uPOWcWPXkvpvVD5hgQMT7+/zsugtRV/EweR+hCLTKS/YN37B9gykOD24FjzDMcYCuexL46J/nnkUsD1EI8ZbgjLpVsb25cTKmxEI3AQw0uNbE77zynYNcnRpUZpMCKxJy1qgmwjlFnAvZV6i0D+rV5nvCxf1vi04tuQRSwmieHYch1BL43ZaedIYDvhkNF0lT8Sziw8K2XaDeKluvEPu95EWUt5Dy8vttqVH9Jm5K0Ctjl8S0x7z6k2hgVR9H4JcKkNJNNeuT3yWPmGsz/yIEqCFzJjK7V32rFI3H57dOiULVNWrNEYMV39IVKpRMW+ErUwUih9zr5uWnvvTmkataMgKInG9eJnkNQPRMTaZdApufBrxbs3d4krDfV26TtDcmQjwB7QZ4Rz0mB51y1XgM83AOKDN23bYRXtd49S44GDcTKRkfIcufeNb6Sx3hrxvba8lZ/ah9c03sHu5HGVfq3NN5tLfuWS/9kKzlNvsjvdyf2dCbGNbX6A2+cj/yiZfz3SVLvOWjxhoQ/KOs/bdIzHEzMer4IXf2ggsAX5KLZ3zAWxJPUxhHVuPfYkbkkwQHPqFEVi53fZhqI8SA0Tk7dJgeg9BX0yv/rvTymELjOADVvIBglNxr8TRH+g6+mnIxsL2QwSwCwCxpE= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bxqW3tQ0FFZ3JNlwjE1PIO5zpfXpengBQjorykXkp39nRCe6f8+eqknqNedDRuRgRD/udewfzV3rDNHqk33oqutiRnfe57tCefpzz1dN6yiqaTve8WnnjnQfVf+l9i/x+k+PDdtuyXENuZ41+reL7M4fYl1Utu9QN3UzPYSpgCzEU3K88oQeO5vptXPNUBvjhmg0waRZ6W4Uc9nLEGPbV7DbYs/xqTRyUtSr4WApYc6eQ3OciUXzygZWsHAWgHyBkR4tMLrkEnTOXKeT3mvfz0hETIAy98pFIAoMmNbQhnS5/E9Vz16vFzPz4nX1uRIcjgZdGuVqttd9Y8swISWsbMs/RvCP2iFxyzsCuUGKj4OUJ3ScbYMjBTHPEOXt76SPT6sYBERM7gWi3oiJG+BzMPYjCOr8YUQ6j3tM2ZOooMIdHXPygt5sLr0dGjPg8GyxAsXRqPQ4V28VTPFAJ7fQpv1GBoi4NRr4ki3wMxmB3a0CTIgLv8tZJ4soPodZyNTo7xuJXfiDp42jxArt831gCy/ElXaCixKIIjXub7dmkGlDKjKxUHi7NBMOI5GojRMx8+uTyDYFSr/6uHmFMsXkd/h8S9NeRFRD/0giWjM0nwJESmS3yphUfJ9gFXsnl6G2 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: rs3jQIYgRatjHhXcsvGgDAHo0h1B0fjw8mwDJdlnj+E7MFuohybwi7agBKGJ6yz0EXWOoAeWu5K8vVU42yeXk/1Mo1ZhMgZUYnqM9WHgF7XuoEIix2U57LarZak7sKwly6aSTtnPiZ/EaM0UKubTczhjTZqx200fj0eJCYpbo+J6V74OxZwlKYaow/pAbWDW+dhoOg6wvIZmAGd78G2N/6zmjbweSnHVf7ASnGDmO0tm0t6UkzVmONe9g5wVUMZGZBVm4cDU3L4K4vi1LP+fObNjKd1aDrSxrqHVj5f0qoB/YdyNzHvJfzLBanbQ0B7IZqguEx/OcQDwO0jeWy/SZO6+QtGYaYmXYRVOIB6s7B3id51pt728zOysmW4cm0q+YaK9MUmi0/RIW0D2Amnt6L2lBBYWu/A/OV23uGBH54EsYE13QxhwgqPBmq5Qk35lV0sxhf4kvUARQjnwd9ZN9EW24qhCD+j3DtEuLEczzZ58WHOGNcGSfXPNpvw++49dVai7gnWt+5D4iAVaa4OtiBgOcfYxbS8TE13yg6vuX0B875VXWo2Gy3Oojq4B5ekUFVC97Idlb3hr27i6/jrtMYoAm4lTqnDn3hIo6hAgSs08boQp16CAjyg4FV82CH6Iga0KAklxvwE72bFpXZ0Frw7sSwLvif2NG1XA24OCT6t+D9nmvFcwMIpRVaeAf3EL4LSG6/Ii1T5Xv13iW4BIj0rGMj3L8K22/neWazffAHOo8xEmO1lq9ihugjrBM4H2C9/mmISWcudh20e9p6/CkQID7olr/qiaIePGa9mM3amHspdwkzcoDH2SkGBWEBttNu2pax3qqH0U7wRzUT6loy+40EVUiYWfqPHRt/9vQZdiF87eT1vTsuBwUcuZ57vhgtzy6bV/+Qgul/rYC8NKxl4augRu4hEncFBaVk9EMcUuWSDuBGvJhySSC6Z7zKz6QxHyHSRKMG5LncHZZWmFbx8NQ5YeEkMqKOQgiwH9LyL+z80H7n27aPtgaPg1BvNJv3bkUiHUY/dY0KuYxkEB9FoDqA1Tj6qBHCks+YI2E+klyeo75HBbFtgCzHwrBB9zfmv2NtPBWA2pl2tomFcX30tL4zXksh8DwOOnCMtKfz+P5ZIef4qq2BFgzzvZJqrVrA8cQwMwpxzNdFyykDWLcOacLJWA9qApQk2NoQUjCANF+f4beQtQ6I5dq/DSErT9GryIi2uskvURIVfx1HLuKLgz76JRYxUH738r1c62kNowr05Amp49FYHR7tGC5XRiK2fzceJc+INdtev4CYdaxQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ff8d6dd6-43bd-483a-e1fd-08dc43beb00a 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:35:45.8373 (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 1/3] fate/lavf-audio: Test writing AIFF-native tags 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: 1kS0KCchGyqb In particular, test writing tags with odd strlen. (These tags are zero-padded to even size.) Signed-off-by: Andreas Rheinhardt --- tests/fate/lavf-audio.mak | 1 + tests/ref/lavf/aiff | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/fate/lavf-audio.mak b/tests/fate/lavf-audio.mak index d54cd107e0..7ea0c41da9 100644 --- a/tests/fate/lavf-audio.mak +++ b/tests/fate/lavf-audio.mak @@ -28,6 +28,7 @@ $(FATE_LAVF_AUDIO): CMD = lavf_audio $(FATE_LAVF_AUDIO): REF = $(SRC_PATH)/tests/ref/lavf/$(@:fate-lavf-%=%) $(FATE_LAVF_AUDIO): $(AREF) +fate-lavf-aiff: CMD = lavf_audio "" "-metadata copyright=noone" fate-lavf-al fate-lavf-ul: CMD = lavf_audio "" "" "-ar 44100" fate-lavf-dfpwm: CMD = lavf_audio "" "" "-sample_rate 44100" fate-lavf-ogg: CMD = lavf_audio "" "-c:a flac" diff --git a/tests/ref/lavf/aiff b/tests/ref/lavf/aiff index d72ec85150..e208ff3e16 100644 --- a/tests/ref/lavf/aiff +++ b/tests/ref/lavf/aiff @@ -1,3 +1,3 @@ -2c129d88acef834e32869145fe792b9c *tests/data/lavf/lavf.aiff -88270 tests/data/lavf/lavf.aiff +655b5bd68e7a59599ab6663de0015324 *tests/data/lavf/lavf.aiff +88284 tests/data/lavf/lavf.aiff tests/data/lavf/lavf.aiff CRC=0x3a1da17e 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); } } From patchwork Thu Mar 14 00:36:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47041 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:9204:b0:1a3:31a3:7958 with SMTP id tl4csp137207pzb; Wed, 13 Mar 2024 17:37:01 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWXA80h5fQouJ9MJGcXx5qFbdvB7K/aidll28PXlYDjYsEE9AuoVeuUnAW7ZRj11iQwjFdhnvUZO4owvDVbgF+s3Gj54vJqhtvJFw== X-Google-Smtp-Source: AGHT+IHFzJL11v6i/Lb1pOua85qauOMsvkwOeB1AreTuduEbuGn+BLD/E7JSBZ+7Kh2deA7PpL9G X-Received: by 2002:a05:6402:528a:b0:568:79e3:4afd with SMTP id en10-20020a056402528a00b0056879e34afdmr51383edb.25.1710376621168; Wed, 13 Mar 2024 17:37:01 -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 y20-20020a056402441400b005687144d973si162697eda.285.2024.03.13.17.37.00; Wed, 13 Mar 2024 17:37:01 -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=nw9Dh1IO; 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 59E2568D091; Thu, 14 Mar 2024 02:36:56 +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 1D5AA68CFE3 for ; Thu, 14 Mar 2024 02:36:49 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OWsmsUHfvhvlSNPW0oJJQrKoRZfgtkLobCBSvSZOClN00Kay9c9mNggVd4TVNqXoN2305haAs5ThqCFiDC0MXDywlI2oXUxk6vMEIRTzgFUpObNFebWlKegIkaj6LpBHnjgK27OKTw3PqJ5qlsmrQEpUWXORZ5oaXEOGEuev2ZlZjF2jQfMBKI8FDrv8VM5VYV7FKfm/ERko6nKnAk2LcIUhO1chSvW649CF4nU0neNOiwlKxD7kHZOGOGBaK3F4w4a00qpKZDv1M0w/xmJXJn/I9XFdU145Op+W0Nq/41vEDAuo0/dXUni4wfaav1W7lMXinOOCRk51h6GbCtMedQ== 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=7XxiR3cr+bjtoo+uePHRt1FTwSlLnirq8gaM4rIYLJc=; b=P2bWBep1e6K/3iupsPIuu96yg8FQiH3c/8tEKtpkRALeRII1jqRs4AzK3MM/rBuInQD02mhqRoLBBd4A9QTSX2ZMp3aKkj5/PaG78/IJhn30GsFYU51SY9SJd5kT1NQpSBcG1DOn+6vvtiJfCh7x0sKFhZFLrNkeY2Ieqtk5TyNR0tLe+xsO6mhAjyE79K0d9S2fgi4AdB9iYsS9PSp2kTtuepSeX8v8MjzF/9clqUBEjQdZUbpnkgcbJRrmsSzBlKmgBdEw7kXkO84walQY6fG73N+/kGZuuSscpBdk2m+TqS5kcYssz2J5uECSRXgCJFFhzuEls+ASk/5Elq95RA== 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=7XxiR3cr+bjtoo+uePHRt1FTwSlLnirq8gaM4rIYLJc=; b=nw9Dh1IOVaASpSJgn4mdZzCwEqbaTyyyFhHnvxcDZTScvsUtcsb0OFwvIx84Ux+BZfxScCu4hky/lOtRE2zEUk0/H/18S9OHZcVVGITYb5gQMiv2cj5BPAR2YfP88NNjKueisqxWcntJRZtFKjPRsn19pjvgl0B0F/XUxxQbQQxARstbFktXEO9rmFpXKOdKskF7Y4XzG6Sr+jZpB1vGjGKbx2sIM0Ro7fN/qf/NolX/CoxkGH60AioCoOyQzZpgLdKhTAvyU7ixXr0y8NUgTqjrjetAAuc9fNQ01S1NmSbATfDrIfnIeFO+6mgkAvOg3XAwucaeKELsjeb10th3mQ== 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:43 +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:43 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 14 Mar 2024 01:36:33 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [SqNaa1VEljrXEV1CvUYmuE4Kvgdkfh4OTmW++aZM9A8=] 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-2-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: e4a93dfd-58fb-464d-a7af-08dc43bed267 X-MS-Exchange-SLBlob-MailProps: 9IecXKUgicDyadF/9QYgeT/1Wlu6smXxNSDSJr5LIl2QCHE7juN3C/fRNmTRrqi+aVRxtVf4nwbN4KPzNhw2CLrPQ1jAiGLtfl3klyBqWhA4yaMpQ7ISsbq0jCWAumA3blJfW91t5/qg0f8yW3DWqnqsDcqyYHdHg7C0IQg5deqSbPN0OylOJ8McUngwyhDyObdheMI78bFKb4yRIe8JFzOWcaQ9pwP/K9W9eQN7lWHkjz5MW3nYVffj2It1GF9VlJBNRiqmQdE4Uf9kCYyVakpCwWcHoONKJmZXF21Ms0X0pxxPkRx8oXeEEPL378RhMpusqao914LXrRSQU9mzLHmwOyZoiDzZLTXGh5d2oiZlc/b4UOLCZ6o7qRUkL/BoSO2P0v+RlILvtYaqvOMqi/bBaJGEvoRtLV2l5zcepHVv5zBkDnLJ1kwcx8+uTRUENbYyqp6pAWffLrsPNFPPTVorQE6jIxxX+kR0Zb3rM7SI/66IvbpcIohOGLMQ+Y3VUee0R+QUc2qVoGsT/gSy9md96TkeSAYWSiqBdrW+RVIT8Luzwu1dNnr653R8TARHi9GGCxVRhc7OoV6kr/YcQYR6CYrrX59gNsd//UV6DTw6sTcOFvS9Mvs/GQLkRniF7e1DEsOdizvNd+jNv8rn7I4kMXfqc4xVCSkk/iLv32b5siA3VtaArUON4UBqnYp4ggyJDqKG2bXDF8YdIMuADyfbUKyahF2aamOBIn4TtUfI0vogjMheHA== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: D+e4hBSCiCkxkAUjqsgOhI1fF5JyOyPzhicTRGR9HKfmEEF7p4k0L0SRkfcCsoxPbfSO53gFBk1y0wM+2pM61PeJUU6Pmoj6L6O9g0Ww+ksrihZLhx5GG/+y+heFlSCOSaSX0ICG4dFZhYBAabwMwxWVLBVkkQk8lAHGY0ztT316veAmdA8qLme7Q/hT9JxIGZ4Aci8SiCGUglrUNVX/7yAsfqqkxjv/HTEK6t4AIiNxfJXyFXf0kiyEkJiuzrJdreeq238lcGO9SnUa7PVFpr5by0LItmtRRYAXluwroGYoRMkdj1KRcffg27/7vdbnal9T5ccsr27lx6ZpO9v48PdvhEtHidL8/gqzAT05sRstbwMDTWZ2NtYB+PTH/5sdCg0EZ60UaQuKLoKuiA7g4f7Tg4PeaeSM8trwAYcznOx8yrij2d+W1v0SoLMe9ti/V2OPFPijAjdELax3s5Rjra7zjM3cDcRXHsFN4Lcs7lPiKMVPQw5PeOjlUgyGscr0GP9Uqwc78NMOKBcqylF4OLx6twB5JRIesgHslMmXbdtC49V73mxkrlWOVjtBO+TntDm1eKr+J5joTp+x1AJyHOPu8F7BfJaXsEkVHuhXrQ7K594nfQtkF2MFYNVQnEX7 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: oZJW2QfeZGGGY/TWMlm0Ebs6Ud1VT9BY4QbFYuTJKA5ku7a29ZIYaJXZdlC58EBrKr51ItbQHe5+DnrdQk34QNJrpTFVBXOSOyD5I+1o1V6WjecRx5uHNDuiy6h/yw95oNcya6bvJiWeNh54LBRd5cGlluC25z35o8Cge8d0hUr4rwWoshjvd0ZPggSEUkY+RtrYaI+rW3uw/ZLN9zgs3l1L29/RBJkAxCGBVWvnxfOx3k+jmhwtCb8osbli8Qx9YQQTXrBC/EwLqouveVW+SvDZUS0/fmiA8ccvpXRslzGKP/2bD87gH3s7IYSlk0XDb/e/z9P1AqD4sus4cheEZuvFcRoPt/7uj36skShtxVXI5wymDGVbqruuEkBIKrTpRx6CHNc7RyYg21Osw0zAE4FOXfpg6vj1W+q6VLhVb4+3vazQuExnHo7O2fw+au3JRjH2qJK2Q52AlupQa6FyaHMhk1bTC9+lbb9FXfSWJ11S49bCI4ymYLe1QIbo7fPmn+YwHOa6N+2AoelRkvFGzS1SvsjVjMXzSdfrA7tjaj/yHVU9WNwrpbAcO4qDdzCxY79GMDkxHm03ylQWiwF6wiWYH4kE7oSRFLIXFitw2YRecdhvqVv06G6E5QnJugY+X0x3Ej2PtS/g5HnnIwJf/aj8n+OqG3gkR4oy9G5KK6DqBlD5b+sxnkT856oJOXHcnaMfqYL4Rgx4ZmOM/jTXRQVJfpLF7JwKrdvPhbSj3ggM+rq1gmpjuHm9xeFQWWx8RcaLTC2EjE0yYw6uW18aU/3qJBzeRNqoNZtNGkn32phfAGBSXVwlJJ/eJ5BTkE2mjOt3qIgGBle4BOi3/svfIV0fVnOr8tI+ZhsaAa8bM9XBlGcIvYz3WfxFWvsII8G9sTg4OIVlkDUyvOuSMxIwNxHNVHKqWoIVFS0EvCsvIlOL9jJH4YvPtKCNKplh0eHUV72jYV/UCJE5LwwuyRz6cByIBa3b0qm4VkVsyrlUN+K9OltShxT/dZjZZ+70J2Y7Rn1pGdcG4hcxOwJn8YvA26sScEN+MkqwRzw4WnR2SJVL5PQZ9DoGt+4FJj5YOQJ6Vwpf1xvzJZLGkBzC0DUNxbpuJ0k/cLAfTpzCDWEU40b3Tpcg6PdDyfuuhFp1CrFMUERmeAa/pUb1tKp/scPPqsF/t2QL+WsmmecivYe+6JKGaksh9V4THHCppCpkUCrksimG+7Lswk3aE7nywRUWI7Ffu1wa6iulsYJAjuwmX/sbksE6grq9675Tk6PNMljDmL5XvtG4zuvhczNH+JF2Hw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e4a93dfd-58fb-464d-a7af-08dc43bed267 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:43.4378 (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 3/3] avformat/aiffenc: Usw avio_wb32() where possible 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: dtYfy6vop7sZ AIFF is a big-endian format, so this is more natural. Signed-off-by: Andreas Rheinhardt --- libavformat/aiffenc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavformat/aiffenc.c b/libavformat/aiffenc.c index 37aca41847..2cd1119409 100644 --- a/libavformat/aiffenc.c +++ b/libavformat/aiffenc.c @@ -54,7 +54,7 @@ static int put_id3v2_tags(AVFormatContext *s, AIFFOutputContext *aiff) if (!s->metadata && !s->nb_chapters && !list_entry) return 0; - avio_wl32(pb, MKTAG('I', 'D', '3', ' ')); + avio_wb32(pb, MKBETAG('I', 'D', '3', ' ')); avio_wb32(pb, 0); pos = avio_tell(pb); @@ -93,7 +93,7 @@ static void put_meta(AVFormatContext *s, const char *key, uint32_t id) // So simply copy the terminating \0 if the length is odd. size = FFALIGN(size, 2); - avio_wl32(pb, id); + avio_wb32(pb, id); avio_wb32(pb, size); avio_write(pb, tag->value, size); } @@ -153,10 +153,10 @@ static int aiff_write_header(AVFormatContext *s) ff_mov_write_chan(pb, par->ch_layout.u.mask); } - put_meta(s, "title", MKTAG('N', 'A', 'M', 'E')); - put_meta(s, "author", MKTAG('A', 'U', 'T', 'H')); - put_meta(s, "copyright", MKTAG('(', 'c', ')', ' ')); - put_meta(s, "comment", MKTAG('A', 'N', 'N', 'O')); + put_meta(s, "title", MKBETAG('N', 'A', 'M', 'E')); + put_meta(s, "author", MKBETAG('A', 'U', 'T', 'H')); + put_meta(s, "copyright", MKBETAG('(', 'c', ')', ' ')); + put_meta(s, "comment", MKBETAG('A', 'N', 'N', 'O')); /* Common chunk */ ffio_wfourcc(pb, "COMM");