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");