From patchwork Wed Jan 31 09:31:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 45923 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:8786:b0:199:de12:6fa6 with SMTP id ph6csp2712926pzb; Wed, 31 Jan 2024 01:30:33 -0800 (PST) X-Google-Smtp-Source: AGHT+IElnKWOq7TWpQmnf1asDtGM8zmyCeQslTN6yLohV4Ocm88jxbMmZQM8/aLkJnIR2zVSrTXh X-Received: by 2002:a05:6402:ca3:b0:55f:6b5a:6310 with SMTP id cn3-20020a0564020ca300b0055f6b5a6310mr610123edb.33.1706693433346; Wed, 31 Jan 2024 01:30:33 -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 p8-20020a50cd88000000b0055f5f0d8cd3si852833edi.440.2024.01.31.01.30.21; Wed, 31 Jan 2024 01:30:33 -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=twLmOIc1; 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 2424868D14A; Wed, 31 Jan 2024 11:30:19 +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-db3eur04olkn2050.outbound.protection.outlook.com [40.92.74.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0AE3268D123 for ; Wed, 31 Jan 2024 11:30:08 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Fiszgmbq7INaRL2e+1LLaDJl3li+55tM1m072RdjVzPfxjkzW+Gccs3BV6LlWP3i2hZJvQUc8BPFgFkX5fKGVXZ0UD0mJi2ODgN6dX0mG+MTAT+nD4HSFfvk1WlurpQvQL7KckunKvlflN5tscgqKWntqsUMfTYH6e2QndBwP+75i9xnov0R7oGSE3c4f95bpj5bO2cgaKueAfgGs/5oPs3BjsCsQ473UV2eFc1FOxyhr26yAUMdS4JpONlNLshPRI06QZ3S8q2dhlgjQM9gfJo7+tmjmvEcpft0pqsFhrdwzndOzOGF8pRJ2jjI9WewTg0lIJIR7AjJKkz2HdtOyg== 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=Siyx2wYDerQ3dLg7MMGzDc0Qtv5v8CtfaUvPUQcMGKk=; b=Kvm8t0CrmbY7QOxlRIJCOPTKSLvUmZjJaf/Ajiii7/tIKn8KjzPi4vI+bUEl2lAQhUnS+9w7BTvDjvOVlrJLmpW0Cj12jSa+GKnVFeDN1bWy9zp38EcfqqYr6coQ9wBE9oeOQoI1BLFJH0Hp9TwFnOASXBr3X1M8hF4VorJNZzZrlTzSe4RhdZ95k2JwcazyV8RkHmXQ8U16H9JZ0T3iv3WwZs8uC2v5RHDIjkkTRTBN5UbD1Fi1fZVcTI4JZXzEb6u9hOV3tiF+TOfSWTQRN5mxRTjFXlSpTUclyPWXiqywNUYUKqBwd4WAQSx6/owEZFNPlyL+mCg3cClIHbM8GA== 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=Siyx2wYDerQ3dLg7MMGzDc0Qtv5v8CtfaUvPUQcMGKk=; b=twLmOIc1UteyLe+LA6VfrgvcPD/fl5zBQ6D3DMHMbSdy8T4YWL151ZsnHamFibsYxgVXm+yQL1GbOQE3X1iTVuwOvTmE15dOWSWLIL7aEEjVWo1VRfXw2OyWQ3dUvq2IaGk1hjHlrJUaL21Rm4zp2csVbs7smMyquFKYz6NBEKfAqxzR57rKaSzXEbukKdRmyQ8uhW6L7tg7bmO3+gvEZEyB2Hmihg52tH3KQ5fvV1minUoJ9qU4O1obSd6sIYWEq04S1OjJvTP7gqQSLeRJnKkFveLvXJzVAUfpV+Cj0d7j7+Phwx47uxFMsMFatryx0A2IjX37V/Ls6DA3GdnvCw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0289.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17c::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.24; Wed, 31 Jan 2024 09:30:06 +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.7202.031; Wed, 31 Jan 2024 09:30:06 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 31 Jan 2024 10:31:52 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [P2VY9ozLdWH/mEF9ee9cPzLj0UbONR95Cq+DyAadZ0Y=] X-ClientProxiedBy: FR0P281CA0179.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:b4::19) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240131093154.749280-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0289:EE_ X-MS-Office365-Filtering-Correlation-Id: c96b8dd4-7404-4f90-ffda-08dc223f35b0 X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnp0HDrO/Vxd+Mt+RGIvgEHJB8opg24k1mOt0wwoE9K4LzJTGIItATd+x98oWUdW4geRVTXgtAtThtRcjba8pPK+s9drEEMCZeNmGqnSZ5ezTpFwxJY3eQaiwCH7RX/UPn8qi+fW2pyYPv5jkJPz6pkcXAm5+sZyRhkYD/+q/dAnwWQLrZmy+GSOWs9+6D5ZULslP72rQGXPpgY3hVbrwBKaCa5vfBqG8Wp40ipYwLs/ANYjW/mUXMwfytoJb6Z+vCSImPCM9jSgc9X4Nn4+6sDKQ8ocbil6MHwdZBePB6a1R9hUCmNFKA8vU9opTCJjpW5CuC1WQe2TuQmuyijYdIcpwYeKMTr5X13EADyXFxRkSIBh3vrX+uw/P/Jglv8NWlWeV9D+oeypx+lOb+LhV1qjcxAOrngKkXmaK96+0C3rq/Ie0j5Wb/fQeH5TKSNliGF5mkrq1hVbYZDgevcYrN7z5D1/BkHDBsJLUpMeRK6awRVbvHGopEJD+Xr52WhQM2OcvUgDonVX5sFzO14JdvDpJP3QdkFwbYRouwtwodTBDPiJzAn701DHmEG2W8qAJaRkJgEyqN6G3++11j9mDceHX0HKXeAY6pt/TGStPiTtrXuRJgCW0td24ojYfMMA8Y8XqMFR+svzgZkD4cvAlLs3YABUEpuKzA0dGug4coylQQVrZCFIzqkud9SMGP7khWEnP99OwrSlXS80Lu6bY6P/8aAP/PArte8KhiPWC4dbKKQghtnkoGG/Z7qVGHD+YMc= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ktZmovSDxhR32u1F6WKall0Wf1LUYNUFW8OkmIeMIVLe8gjcm0MWSU3TkhhZyKct3v4mR4Fm1Pt6ez+aC5v+ZEtIcYraRwtuhneRlFK5ylmZV8wsGyRGwQz8J8SWcCELS7E8Mvl0cawSLnZ67OYEh/2lRp2adx2u55fzWqWya1AGNeR3DoMF8XXDnh21UYrkaOgytWIemfLO+Zvr0ROxpdW8b+w3ES3xb0WkLNTyaXHPHr6+oMD2RHjoi2UKfirUmTB7d0l1NYnVgVIinKGTnUTXh9J+ztOwBG4Ml8V8N8HZydNVZ/rj6SYE4rA5lvEOzHvKQ+BKTCqwkasdtnNUTfQyY5CmBf1bDNI50IHR4SiCVFZvZ9aKCfQF3e35mfPw93wZCc8n2m7c3V56AhuTVHRVLjnFqAnPv57Yazx6o5/X0WvKDhLa77BFvcVADYCXvJoKuik0G3yKoW4bjesY5zUZry6AZi0oZxQLSEAEfM1hkY8gyb/d4hG3YL6jisYnK+P9pVPqzM5oWSf3Q1urDo7IMBXwp9fKKwsrVESxL+qZQImZeP/N4zxhf9a/dcMNmQIj7qMjX8fSPsWEoGqPXGYjBJTu8W1BhN+8oFxxKEAlZTfbXHXgQRqKVwb0GnC0 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: oA2HsJYsnaUYPOyuTNB+R2G/eAq0Kg/5H7FRMCmQRnlrN9wg583/wEmj7F7D7Ozom2sd41YxanR1RIU90Bi2RaxGzFZsG+3pGnny8g/IKy8iOHzNkXbsTyJ7xEvo/eCy6gFutV9lg+Fg4lLI+W9AKHtE/0oDqgBE+QjdO9nb588pvrRTixy3lnvGFsZdY88tbEVkECTT3zt/sYu59YzmxR9m4ZXPzUAnAzkTfFY8vT/TQoSYD3w4XjV0dFiCimXThZJG+k54hbm4qPJRuA/4UjvZboV7JzPMobXAt4MZg5u7p1FADyI1a92kJQM4pFtHQoBFqKaZ2lCB9t0NCFy7vCO1NRvX3/KgVkwaO03kcpVhrCQSbAQw54k9tHWIl0+/meD8t/9y8P6GWxI7+x7mmBV6LZrQr3eONpYaxWq6/W1w1R3eH9KqWuWjPgVLpojSzNChVDG/8RE2Vg5GVhPokNxDNvocOrFv3rP8o1RhKvQluU0S5zCyLtxVjnsnFdeqi+1agDC2nJ67DDp9CrfWq8WLTzArGoT1FRiqXHVedm/M9YX3uGQr4Qrf2iwezSPeZ57CXBtrHt0+3GJbXYHXapl18NJutu/ML8xHjouWo48QX7CZ29/YxLUKEPF1VXom2mQxhfYjWUfJylD4DbbYhCTf5yxGoAFySSWtNsCXBAZLFO8tDa6Y06fkdblYgV0zmYlZsLykRFkfQZuxrgZRkFWwqugKVj3rjAqXyo8DWPhErdtfGbCjgAEKxYlZRbbRIu6Qt6mA7zvVOss3dPoZTqEeDIxHQAl4T4zb57YZblTDjyrkWqH3fZ30gs8J/ryaSxzYyECBLnPfy5ZWcgeB/6LjhdpS7wdIT4dPh4Hf2ogm5ZdBDL7pdFdDqtm424CgMEEy6/Grc3WaVHXtUwq/zm9ixsFXaq1aFq1PEW/cCBvEfC4WJdfjUEBejuCU3LKQfSPE78jQGfIyscnhEre10zBUT7cIfOz4JVe56c+WP0hcuxapYUsc6sFEnULrMKLJGFtGYhrvPCx0qIIZWySxBuXs1w0PKeEwq3qNNzSXj/srknL0KYtEf/49zj/3oOrkbfqmt5kaylHzCeNZcKVRl1jCU6SUF9PX6SgIr2ARMZBUSIkLXbaKTThNEvAcqjjvekmcsrFkTFhHXKMPw4RIQztc2hYjkpWSfACtRGsYcbndHWjLr7cveh/C0AyE1ZVCrBYeKV/6vMIYLwbHn8jA0jRHcyOoASmsYAE68QNNqv3sItx6KvEWjmm1/nCsi5WG X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c96b8dd4-7404-4f90-ffda-08dc223f35b0 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Jan 2024 09:30:06.0371 (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: PR3P250MB0289 Subject: [FFmpeg-devel] [PATCH 1/3] avformat/iamf_writer: Avoid using dynamic buffer 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: 9bcLEI0085VR Signed-off-by: Andreas Rheinhardt --- libavformat/iamf_writer.c | 28 ++++++---------------------- 1 file changed, 6 insertions(+), 22 deletions(-) diff --git a/libavformat/iamf_writer.c b/libavformat/iamf_writer.c index 99602ae204..f665f45b7a 100644 --- a/libavformat/iamf_writer.c +++ b/libavformat/iamf_writer.c @@ -807,31 +807,15 @@ static int iamf_write_mixing_presentation(const IAMFContext *iamf, int ff_iamf_write_descriptors(const IAMFContext *iamf, AVIOContext *pb, void *log_ctx) { - uint8_t header[MAX_IAMF_OBU_HEADER_SIZE]; - PutBitContext pbc; - AVIOContext *dyn_bc; - uint8_t *dyn_buf = NULL; - int dyn_size; - - int ret = avio_open_dyn_buf(&dyn_bc); - if (ret < 0) - return ret; + int ret; // Sequence Header - init_put_bits(&pbc, header, sizeof(header)); - put_bits(&pbc, 5, IAMF_OBU_IA_SEQUENCE_HEADER); - put_bits(&pbc, 3, 0); - flush_put_bits(&pbc); + avio_w8(pb, IAMF_OBU_IA_SEQUENCE_HEADER << 3); - avio_write(dyn_bc, header, put_bytes_count(&pbc, 1)); - ffio_write_leb(dyn_bc, 6); - avio_wb32(dyn_bc, MKBETAG('i','a','m','f')); - avio_w8(dyn_bc, iamf->nb_audio_elements > 1); // primary_profile - avio_w8(dyn_bc, iamf->nb_audio_elements > 1); // additional_profile - - dyn_size = avio_close_dyn_buf(dyn_bc, &dyn_buf); - avio_write(pb, dyn_buf, dyn_size); - av_free(dyn_buf); + ffio_write_leb(pb, 6); + avio_wb32(pb, MKBETAG('i','a','m','f')); + avio_w8(pb, iamf->nb_audio_elements > 1); // primary_profile + avio_w8(pb, iamf->nb_audio_elements > 1); // additional_profile for (int i = 0; i < iamf->nb_codec_configs; i++) { ret = iamf_write_codec_config(iamf, iamf->codec_configs[i], pb); From patchwork Wed Jan 31 09:32:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 45924 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:8786:b0:199:de12:6fa6 with SMTP id ph6csp2713379pzb; Wed, 31 Jan 2024 01:31:35 -0800 (PST) X-Google-Smtp-Source: AGHT+IFbOqdbk7FOwZwYp9c6fNrSPzd2Y8U/XJ5h76wBeQJ9mIQ/lszoE8fFI6Z4adQtueAhur8a X-Received: by 2002:a17:906:c58:b0:a36:239:77a with SMTP id t24-20020a1709060c5800b00a360239077amr718939ejf.23.1706693495391; Wed, 31 Jan 2024 01:31:35 -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 l20-20020a170906231400b00a35fa6ca2e0si1992670eja.312.2024.01.31.01.31.19; Wed, 31 Jan 2024 01:31:35 -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=rzaTqnnE; 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 3F59568D13E; Wed, 31 Jan 2024 11:31:17 +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-db3eur04olkn2107.outbound.protection.outlook.com [40.92.74.107]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2DEFF68BDD5 for ; Wed, 31 Jan 2024 11:31:11 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dvu3WlYis54BHKKtm4nlrECWR0yWgTgRDxw+r7gjG6kNvjD86s4MgmEqnLJu5S1VnfDNkL6qe88XxoAxlUfMLx0BkqVoMbMTwnn8t0ERN0lomicc2VFgnH8TyaGCZyfQpQTueFhHzgn7Fg3kzvhMC1dKrh50fyzh0YogDs/JoZovWGaPrjuymc72+dYzwDK+mSDzZidAlN+CiAKPMKKumYxNTjz1F4BGK02i8biE/vsy/wgnV0jFHxCE6cXUhfTt7WH/x31X9qvIRUI1+LGopkVJE926Bv/xKgZqFnlHy1a22t2tQK9sPkj4s2ecVlvno1pmkdxJAnJhOquROwx7RQ== 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=MY1041bNmlGZcLgA07ok3iFyWII0+wC+K0sHzjf4QuM=; b=JeFFp+Unk4NXAdFdYcf6FzJ9mGc4JkNeFitRH5s+h65FytVGMv2LaEmRsd3d7q46VKqNvqKqvm2Lw/kRTIi9+OmACpQU1gG09Z3U/KbZz4COanb00a1JCa5/2N2/T2IeTHaMwctP3sdLy2ZUCbsWBTjqVVKwGkkTJ6BhRbOYIZGLN8ilmU9cjAWBiphVSnGh86LC2tN6J5lpKiHt5o7u9zM2lnIWm+p0oQ0Vm4lA8CKQMJJrjpfqr8cd/8aFQzpdy/+OTkiA+QbzkhxWOIxgCSlWoKvDMiioiT4vrpLVwt1STz/fc1r/5hVZZdrwprRsVydOcdv4aBMrgrtYA3/lCA== 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=MY1041bNmlGZcLgA07ok3iFyWII0+wC+K0sHzjf4QuM=; b=rzaTqnnEGoyMQA+E9ETwb3p8lH42Ab1n8gE3hUB6yovByirlf7mW4vI4XjzSfW6vMTmEYxqYdQDcZH1kj2LYPL6dWCbBSx27Y6EfaH/FtJCypzufC26UusbyPoBzR5EL6WWEpamnqyoNP+TDd3f6XBX0IFQlKiM/Q1XACzuFP3L//NPocKnOPtsutcoVR8KkclcOXEGaMonm6mLHJ5H81pXzlI6gjQkJE4VA7M0u7/FMvaZG7IrIQnjzg0mpLTYpZDF6ns+GIg9c90WvSpEIBSuFHsH/SkvYae/nNvlA30AYGxIsDgcU0rmu4fclxRbUGKNJU2OFE6hpbfPPUXPE/A== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS4P250MB0414.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:4c1::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7228.34; Wed, 31 Jan 2024 09:31:09 +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.7202.031; Wed, 31 Jan 2024 09:31:09 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 31 Jan 2024 10:32:55 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [6DdiB2dB8hip+zizSKthy/MQJ7Ejd2oU6NiGoxcKGZ0=] X-ClientProxiedBy: FR0P281CA0235.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:b2::20) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240131093256.749308-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS4P250MB0414:EE_ X-MS-Office365-Filtering-Correlation-Id: da48d2b0-690e-47cd-ee4d-08dc223f5b69 X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnp0HDrO/Vxd+Mt+RGIvgEHJv52+Q+azDyn2fRfoZ0bWNC0bVHZAgY+APxVcvNWD7xbKgqQzQKyGHsBjUC+7TVmfOOxocIqjAeuSWuMgoBJzJ7MKZWNB/saVt0O06etXjZkrHBb6QFsVSNW6yGbrxe7eL2na6Z3aDsUBCvNjbHZZCFs51+4iHZujUp14U51RQcNSmqb7GHsWB46Tk4ylDM5seVB84dX+AFAPkDZ5yKHbfG/SYwdSNrPhXdrrZy8SRkIiVNWXTQ1p2wZk0z9JNCJAUw2oe+Ypi3DpM/P/9KS5Iq1Y4ZoobyFxxKf4Eb6SE7T4In+KHVwTJ+ARx/8vv60RAkaou2oo9MAep++ziqAOB2YGCmmHIMhxOXzcX8lRJZStEEyOucQTPPpOlz83T3teVtXlJXlxC4s8TVvEIcrWm6Frb0cuj63ckQds5MQJ6/1Vka60Iv6VMai87p4u+EFHAwl2aOspEuYjYa3HZLM5fBwA29fNCMlSUaHal+NW+KkIchxvtRZCYBMaFOXfzqlxzkdfl/R+M4GDMMFk0tG8RXlCFHVV27iKhITBEPsxQwSMDquckIGpafDoAI+oOa8y+9WzQEZqXSs9ttBFHn+yYm2Bqe2057mGqm0CSXQQpvYEFNwNLpmkLqaIU4p14cL9wq8wtWG2RKZi/Ij9NpRBol7rpp4erigdGD3oNOkSUSf5I2BFGlWKM0z/DKX1wCw0XeM+OVuxZ67klvDcGTVps/J72hm0w3tOcHkJ8xtWldk= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WtoCqH7nqGQhcFGjEvEEkQsnRO+dvwc8S4Zr033hIHSiN04oU/CThF907GwjxuBo5TZGcRvjHvhvCKf7uBvOdmOwbbLw+QDCnjJ9iud1VO8s+ByjMgMvdaagKSlX07ZJnLexg/ZZtDirhkOH01DaqzQq1xoeC6mg8mYIFBSxOTqmUagSylXMzYLnHypjTc7XqUUv/sPyO27TzmDSIXSL0KQM3onpVHMs0nuKZNwR5nHjA4WhlkTNddLQ72CMLU/e/WMseIxQQU3EBn80lbEMXN9SW13Oxz5qGFNVrkRjVKjt3z6wmf0dFgIZ7iKzLK2iCUpcJeJ7Hep6CjV7Vv4qAU4m5+h/YT2jySGcH8TPBeYyKNW8ap3gByDbO+E/oj4KkKSlUGsE0pNVUAaF57+E/kBpchtyNHZXUrgZ7DKRN8bu8ABsGjlU3EZMB44Frt44qUaPdfBBbysanCaZeDAS9AhhrAQ+GVdCLml94aGm+H8Wfbho5klGW/S4ybkBKV7i800ExrbPKI+4oNuv7vxfVkggignuqNeOYLvvIcBexSA8/qjFsGGyEmMV80EqWTKbbvQU1vPFrRiBuMPPQh0bAl4Tb47fxDb7homgz7lTEJafkCZ/MfH6hKQ59DA8LMff X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: AYjvsgkrFMBFbguMG7S3qQ7BCx8yMRNIiKgCRm7jhQUkUFNnCy4DRv24XffiGYAc6HmVZvBBR1WjmTD/7/LCeIbtXdu+j8IcopaStfDFkxRhduKWLGZcX5vSWQ7/lmcR+wudVy9OR0aYrMtr64YRPTLhBxAteVUdAJ4EAXk5E2MeTNO1YosCjgotidCj+EqX76TqrAEgU23TVNQCwSogy7wpbdmWnvCc7Z7bRSvHuHvJmUePGnc+Uz7/hpZJE0FCuSD380N3jJa6CmF5MhsWjJDuByaB/VhJzeUhHauGAoC3dRKLiYXSHnnuHrvx2GPvzpscnJGl1yTSSRLfJ5E97zSbCijG/A+REpFjKY88jB4/HpUzc0Eph2U+P5F8pnyRblrtIYewnMM8NLAML4gN867umXPMaDgy3HTVvOwpwGOf8Rr4zVGTvw0Q/PsHYhK7WWGG4+fk4iAHrp2TrvfItqD13bv+6VBWCCWyA9C0qjW/HTScMK6YdZQfjeYYZnLiY89QWg3XxEDBdsl0W3XEDG6foUqIRnhWunyPzwBOLAzyDmXJ2/aLQBztmsjDbwWLA9dQ2bbLt/RsAUjaPsemOI4iq/cjKKpqxRIUTEwpEw6tFMU8MarIxfDOguRvrhKTb5fo/xQYAoEc+srE1mlUYxyqnYdyr42mmb2c6UfQ3/PlxCokleSzNcbKeInr07Bqw+BUXblI4UL3Qwx4bFjB2nlyATQjOdrNb8YwE+UIXIv0JtjQgU7z/fVB2OS50GzKhdmrXvb38L2AKZIUew+aI9soH3XRslrdOLS4YhZirSBJMcbMkn6wVi65r4ozKZ6jPlF1OrID24lAG6pA+Bu0jwaGH/4DI2pV75Vks6MX/HLfHLUXOw9uOxeIGNJiGnppvxAVpzu1n17kYqyuGxnD6RlhdkI4OaI3bKuJz0oyEqm2U5DaagHGOhYlyDqslBMaK7g4J1VYWrQUOUtlyh72sf20LMGuJkGsPOBv0rqQYrUMVM9MzmOXoVBzYIdp3xVHSu6D6xhoeaHCT6s55iEWoSJCCiSJuA9ilJzkPzmhCy89oukyd3eP4tOXgCyhcfrWjDBKqazxHb8P5K7Ecj+2nCWKg+U6iRjBEHOoUHGaMThx/NYDpSZQiTordLNFJzCq3nY5iC0bTsQpDdvABIm7xcT4u9/Efz5hxqs/lssULyIizCrHaPuzXReAtDQAuo15wruZNnDxTGLRuZR65nDpyiluE6WTNiy6MKdMNwy3uI+XTLxy/cZ1qwOrGKYf9aZx X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: da48d2b0-690e-47cd-ee4d-08dc223f5b69 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Jan 2024 09:31:09.3315 (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: AS4P250MB0414 Subject: [FFmpeg-devel] [PATCH 2/3] avformat/iamf_writer, iamfenc: Avoid allocations when using dyn buffers 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: uVrFJZhdcVZM Use avio_get_dyn_buf()+ffio_free_dyn_buf() instead of avio_close_dyn_buf()+av_free(). This saves an allocation (and memcpy) in case all the data fits in the AVIOContext's write buffer. Signed-off-by: Andreas Rheinhardt --- libavformat/iamf_writer.c | 12 ++++++------ libavformat/iamfenc.c | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/libavformat/iamf_writer.c b/libavformat/iamf_writer.c index f665f45b7a..5850c53c8e 100644 --- a/libavformat/iamf_writer.c +++ b/libavformat/iamf_writer.c @@ -453,11 +453,11 @@ static int iamf_write_codec_config(const IAMFContext *iamf, put_bits(&pbc, 3, 0); flush_put_bits(&pbc); - dyn_size = avio_close_dyn_buf(dyn_bc, &dyn_buf); + dyn_size = avio_get_dyn_buf(dyn_bc, &dyn_buf); avio_write(pb, header, put_bytes_count(&pbc, 1)); ffio_write_leb(pb, dyn_size); avio_write(pb, dyn_buf, dyn_size); - av_free(dyn_buf); + ffio_free_dyn_buf(&dyn_bc); return 0; } @@ -660,11 +660,11 @@ static int iamf_write_audio_element(const IAMFContext *iamf, put_bits(&pbc, 3, 0); flush_put_bits(&pbc); - dyn_size = avio_close_dyn_buf(dyn_bc, &dyn_buf); + dyn_size = avio_get_dyn_buf(dyn_bc, &dyn_buf); avio_write(pb, header, put_bytes_count(&pbc, 1)); ffio_write_leb(pb, dyn_size); avio_write(pb, dyn_buf, dyn_size); - av_free(dyn_buf); + ffio_free_dyn_buf(&dyn_bc); return 0; } @@ -796,11 +796,11 @@ static int iamf_write_mixing_presentation(const IAMFContext *iamf, put_bits(&pbc, 3, 0); flush_put_bits(&pbc); - dyn_size = avio_close_dyn_buf(dyn_bc, &dyn_buf); + dyn_size = avio_get_dyn_buf(dyn_bc, &dyn_buf); avio_write(pb, header, put_bytes_count(&pbc, 1)); ffio_write_leb(pb, dyn_size); avio_write(pb, dyn_buf, dyn_size); - av_free(dyn_buf); + ffio_free_dyn_buf(&dyn_bc); return 0; } diff --git a/libavformat/iamfenc.c b/libavformat/iamfenc.c index a02f84035a..e1003d5495 100644 --- a/libavformat/iamfenc.c +++ b/libavformat/iamfenc.c @@ -257,10 +257,10 @@ static int write_parameter_block(AVFormatContext *s, const AVIAMFParamDefinition } } - dyn_size = avio_close_dyn_buf(dyn_bc, &dyn_buf); + dyn_size = avio_get_dyn_buf(dyn_bc, &dyn_buf); ffio_write_leb(s->pb, dyn_size); avio_write(s->pb, dyn_buf, dyn_size); - av_free(dyn_buf); + ffio_free_dyn_buf(&dyn_bc); return 0; } @@ -340,10 +340,10 @@ static int iamf_write_packet(AVFormatContext *s, AVPacket *pkt) if (st->id > 17) ffio_write_leb(dyn_bc, st->id); - dyn_size = avio_close_dyn_buf(dyn_bc, &dyn_buf); + dyn_size = avio_get_dyn_buf(dyn_bc, &dyn_buf); ffio_write_leb(s->pb, dyn_size + pkt->size); avio_write(s->pb, dyn_buf, dyn_size); - av_free(dyn_buf); + ffio_free_dyn_buf(&dyn_bc); avio_write(s->pb, pkt->data, pkt->size); return 0; From patchwork Wed Jan 31 09:32:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 45921 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:8786:b0:199:de12:6fa6 with SMTP id ph6csp2713460pzb; Wed, 31 Jan 2024 01:31:49 -0800 (PST) X-Google-Smtp-Source: AGHT+IHT6+mQi2+mDXo7YSEobNm4+VRK6qOexZKU7bKXYJt+vUwrEcTcNISXOTGCWnnTp2uphptD X-Received: by 2002:a17:906:a889:b0:a35:7d90:151f with SMTP id ha9-20020a170906a88900b00a357d90151fmr687406ejb.47.1706693508846; Wed, 31 Jan 2024 01:31:48 -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 u22-20020a17090657d600b00a3599b5fab9si3260969ejr.434.2024.01.31.01.31.28; Wed, 31 Jan 2024 01:31:48 -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=eEwqFOLN; 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 50DFC68D157; Wed, 31 Jan 2024 11:31:23 +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-db3eur04olkn2107.outbound.protection.outlook.com [40.92.74.107]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 68DEF68D14A for ; Wed, 31 Jan 2024 11:31:16 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NOInH6hLnYAXHwG+qKgu6uoT4wRaTqwfXQkWk3EjKOeF+fK9t3cfqSYh/eiIP3NCuLI2RwerEdWefYwI+ig/HjlCGu75obJxdPJqmSI4WiPa2tq3dV7yEx6pvGwgU9GrFp77fi68B+tcPRoXHAfnsJzTI5lOdoeM/Rz1s0s52gSsSyX4Qq8746XEZOM5tV2JKN+S+R6vyoW87H3Ne+ogUwtxdbiAg8GwAOMfp1DK2EzkQIg9KZK8ju2gj14Mk70vcel5vedJAhA9Wz6XoCfDxw782JP0LbDGqBzRzcN3KOPRbPi6YryqlBrd+40zi9m4E6iZw36aFcrMmOWKcENGjw== 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=fI1lsoeHQjf227mTjh9IF6KUzZdNzkscvmoOpXItSbs=; b=QF1RVazXOYeobL2ZceMx6bk9gGyYKPTllPsCnq1bff1Nfyp5NnBzXiT/w/PLzpsmV1hfKDWoC/9QLfN9Obx8B73tF4y9KzmxNFf+a2Zz07PfdA5Auols7NCr2ep6OWf8iCAoAFU7PxT04FoRS5zFHr4j0jzqlvnFV5Wiqr8tjQDjQGhL5KV85j/pnEztsyb3ntBo6Lh134DTHcTQlvJf64gOcenQIa/UzHDri8PS4LoFEd9pkoxMNxz+wR+Xc4cyQDaE1LhHzlYDUdF9+3+or0W7EpUtKJ2XNOBg4bmpRi+Dj70suganqSfN8mRtjGdGTvqxItK1G5w+BwvHy0uT6A== 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=fI1lsoeHQjf227mTjh9IF6KUzZdNzkscvmoOpXItSbs=; b=eEwqFOLNcCsr4vyqVVwXeDInlC6ko6Bmt3YFxHFuGon1CpDaS6vgwO8W+GK5+X3dAGmQ6+LbhH7gAniUHR03DN+PWX5wJAVbyfPx1IS5ZY50e3wKEzQ/T1Kz7jTqNAMNc0YE9Q/80ThAs42Z28n7bxiBFXNW8knKIKo0fIhJfP1HS7IEqFXscN1KUxwkovpM257uujK8BeZZEzw14CXPy0t9CT8TEgaQt/u22AwOYpJ31FmuYoKuO74zoOQ7blftfHsdVSK2iQGNveH/Hsrksb/s/CeK0CloNJoeCbCwzq8dOSQhgnV8C4gz52589+HT7iwf9WCJvO4R9aJR862XKQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS4P250MB0414.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:4c1::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7228.34; Wed, 31 Jan 2024 09:31:11 +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.7202.031; Wed, 31 Jan 2024 09:31:11 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 31 Jan 2024 10:32:56 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [Ik+AuXo/lbDbNQK9NJ9VmLez4vp35F1nWz16THaFuXs=] X-ClientProxiedBy: FR0P281CA0235.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:b2::20) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240131093256.749308-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS4P250MB0414:EE_ X-MS-Office365-Filtering-Correlation-Id: 5f8f6dfb-3c66-429e-8e68-08dc223f5cbb X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnp0HDrO/Vxd+Mt+RGIvgEHJAngQuvbWmKGRYbkm5p5kSwjGXBmIl8BR4OJLXSkEv4aJN+SH79WJ0qWgQ8EhJyfL3aI40dOF3BK4Szpar8I4KOILP6GBNtyfy7m0o9tqU4n1thc6zsMMUe5DDvlZ3O1onhX/IlNf8WnpmoGTcQJhJnn5fBQo//Clchksj7VGNN/Z1EJqxK6cq2wnqkPJlmwArro7hCxyhFtxl6NWtgL65qmaoGrk8mzd3cHaN0+LC8Z6Be31Q2gOTcowLJwumZ2CGz4WR8uLrTzJb5jIpb2o4TcM0Ofh4hbuDBUiUqKT8aRIpX2qAP1GLcCRyDKa1fLwqj8s9G0qAheW28zIGjYCYZBc0UXGYiN0A+CPx6X+qpaZVbof9SloZHjqMltrw/PVsuOpi3LVbsVRqmqml5ukNCL+iKG5hOWDVzZOT4gStg/0uKAeXsf8T6HJ7UWa/E6+Vv8v8SCh9G0N8vtpYwoLcAlQoVGEaOIF/nMq5mqP2vsLrNxlVxmMLDDl0nBkrwOBTi8bW92k65B+sWJW+if6pno91qG2ezfX89u1/HwUPzl+UXR+ABaoJZSjm98DRRiQsDuRue45hoB6ZydlqLC5vblRh6Bqt5NEq5phEMVGn/mw6ni9BPrMk5Bh1HRw5eg8QedgL4/0zM7SouuP8UkPphTf5G9of7zQ70pT6IVlb5r7TovuPn6CoR7tVsokLp0NXzpkN5wW6rtbUraMrSf6pmppDbaWGxcpJbAU5ItRLws= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8wvlnV3YkiijhjIz6XTd4tJHxaGgQyS0q1ISaVKqogv3GgpBhXWnBUBtZ6dFxp0dEAyqbTRq+IjwJtOwJky6ZGqxESunYqQzrw+A9ZCWSfg25I4PSWTbBfMb8WkTnxWs5KBSoLugzlUinQM/4y+hbzjduhl8wpOCWKP1JjBEmxX/DHgQ6/xzVCb6MosSJHOy7wVXRM8iRTLS1cXVqvOwi8mXD7kFTv8nr2Ta8AUmAV3tCMJicxtWZCvxDfosEPwCSFdl7s/UX91mHzf0j6zfoB1Gr7ZDtgqoUzkYSSOAG/TaVPT0vsjqWeGLkDgV4AcL6wQpfGufrNVP7HhbzjQvJp/J/mu+5MkIU5E607RDUb/jwXaTz/nR6IO+3iIP0kyYQB7Euns+yWWJuHmazGIqgnyIeHY4gPOenzjizqUkftyR37dU7WKOPqfnxLLaKKfJZaLWoXbcsCZvyz+mNBJdV1H4QuJWVX0lPQvFJPoUH3mYGZDqx/4Z9Wt0IvZbBZ0A/dEtDw+NsOmWRJSAOlIX8EFu2aMjNv5lw7mUw+2dS97ilxwUTB6Saz7sRuE6Ds56PdUQh12Oqbi3llMckdjPKiQzJmpp2SccnVYWVGXCMEhfHP2ytJOt1UpdCKKY3kjP X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: uNGDFiU2b35JL0naLR+SNoV9j50zKLEFTGysVqAhoxeKHyuP434B3ifn6ZYtuM4P8hlAdj8N6DkZeJaderbygMQ5wcM4Z4HHLCBaAssQmcjgUtYPZithURb42g6Te7fvOHwnDGc/+IClkTrtw63iOZxtH/JLL9B91BF7V+tV5hfIWcXDNHcvTX4UbsqqE5V0KhbEMHLA23RfJb/FFlvM3pr7tHNP2dtjcuY+58w1+YBh05nVOXLFXI9RSaoSmuX+F+MrLRVM+FNEwa49zjMwmdQHn0bPd9AYEk8Ox/JuuY4V8QRymfQYJOt23k+wKrk+fRfoy7bTOgEkDoimiAGlhTLOXSyHg3Lje8FXxj/XdJuFdPcxCBcvxL534F+iR/s14WAxNbmACbMGdR2tbjWDpj0597nO/KeWocvSJfbTmav+u8mQ4amqWCZXTQVqtS5q37kHBC0K7C9R7PqQGrBp70BMEcagrsXo9nNFginZMgrN1J0VOeZ7KpukWC6xk3mv9UMuh/ITtPkOKJ8ccszuPafNtN4uG5gpK3/eJckki4xVgMJ2sjJKcUPgpcQTkoSQW/a59qIPPkhV6hdxAdhT7qd5vBLWfCzTLBOW/JJvtjQFQ+LMpPmN/sTcVIrtLsyw2+Il6unwiCsWu151imesgrOwBYPh74SBsG1zp3EyDjxeQxdJynFDK5bXvltTuYivWdLX72v1bDRcZZoZNTAWWma4XGiSCBn4wQFXK2sMUSdanFxt/ZVAXmxUZ9M9vpooWhmD6l1QTQIOQzMQx0lWCw1bycyuOP7HW1mBmgJ994ASa/20OBzAvBP+1PtFpOSXLkywP0fE9shYewrHQcYEbOl2cU/B6b6BKyrRqSN0/jTcim3NJwal4qkdt1FqFyN4T5FRvA/+3k1yVv5jecIW3RJpKJPzFsuQx3JsLwiAXtzi+Y6ZX4J5BaCgSg8wRh2uK8cWUmVZEwn0IOQaZoIP47UKOfeaa96qppe9hUhiWOWUePEAxQj6C7/77ThPVNkDs7Xk2RiskjRynO81OrvGR6/pYvEo2ckmsOun+ZtgEBaEbwBnqKQteSCLFJtDsZqli1zr3zJhHo+XLEmieA8zOJChmt+9zDcxVJX5Z+tIOLeYE2V/wXy6JAwLtV8N1kbLkp/6zRztUSt5Rq74PAUnJV1uc5Tu1Ts2DXsShA2GMD73oyGFnD1xILjEzSK3xNllvLL+E7Sy7U+8u9Iajhy7NlRbp4ygsiHBexcJVPQkfr4x2BOYG8MCT/m2BiopwM58 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5f8f6dfb-3c66-429e-8e68-08dc223f5cbb X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Jan 2024 09:31:11.5730 (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: AS4P250MB0414 Subject: [FFmpeg-devel] [PATCH 3/3] avformat/iamf*: Improve included headers 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: TDsWmjePODCi Signed-off-by: Andreas Rheinhardt --- libavformat/iamf.h | 2 +- libavformat/iamf_parse.h | 1 - libavformat/iamf_writer.c | 2 -- libavformat/iamf_writer.h | 3 +-- libavformat/iamfdec.c | 3 --- libavformat/iamfenc.c | 1 - 6 files changed, 2 insertions(+), 10 deletions(-) diff --git a/libavformat/iamf.h b/libavformat/iamf.h index ce94cb5bc4..d88a24c435 100644 --- a/libavformat/iamf.h +++ b/libavformat/iamf.h @@ -22,13 +22,13 @@ #ifndef AVFORMAT_IAMF_H #define AVFORMAT_IAMF_H +#include #include #include "libavutil/channel_layout.h" #include "libavutil/iamf.h" #include "libavcodec/codec_id.h" #include "libavcodec/codec_par.h" -#include "avformat.h" #define MAX_IAMF_OBU_HEADER_SIZE (1 + 8 * 3) diff --git a/libavformat/iamf_parse.h b/libavformat/iamf_parse.h index f4f297ecd4..bb506486d7 100644 --- a/libavformat/iamf_parse.h +++ b/libavformat/iamf_parse.h @@ -24,7 +24,6 @@ #include -#include "libavutil/iamf.h" #include "avio.h" #include "iamf.h" diff --git a/libavformat/iamf_writer.c b/libavformat/iamf_writer.c index 5850c53c8e..1a360dee2f 100644 --- a/libavformat/iamf_writer.c +++ b/libavformat/iamf_writer.c @@ -24,8 +24,6 @@ #include "libavutil/iamf.h" #include "libavutil/mem.h" #include "libavcodec/get_bits.h" -#include "libavcodec/flac.h" -#include "libavcodec/mpeg4audio.h" #include "libavcodec/put_bits.h" #include "avformat.h" #include "avio_internal.h" diff --git a/libavformat/iamf_writer.h b/libavformat/iamf_writer.h index 93354670b8..24f1c14769 100644 --- a/libavformat/iamf_writer.h +++ b/libavformat/iamf_writer.h @@ -22,9 +22,8 @@ #ifndef AVFORMAT_IAMF_WRITER_H #define AVFORMAT_IAMF_WRITER_H -#include +#include -#include "libavutil/common.h" #include "avformat.h" #include "avio.h" #include "iamf.h" diff --git a/libavformat/iamfdec.c b/libavformat/iamfdec.c index 3b8d2ff358..99622f697b 100644 --- a/libavformat/iamfdec.c +++ b/libavformat/iamfdec.c @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "config_components.h" - #include "libavutil/avassert.h" #include "libavutil/iamf.h" #include "libavutil/intreadwrite.h" @@ -28,7 +26,6 @@ #include "libavcodec/mathops.h" #include "avformat.h" #include "avio_internal.h" -#include "demux.h" #include "iamf.h" #include "iamf_parse.h" #include "internal.h" diff --git a/libavformat/iamfenc.c b/libavformat/iamfenc.c index e1003d5495..b588a507bb 100644 --- a/libavformat/iamfenc.c +++ b/libavformat/iamfenc.c @@ -24,7 +24,6 @@ #include "libavutil/avassert.h" #include "libavutil/common.h" #include "libavutil/iamf.h" -#include "libavcodec/get_bits.h" #include "libavcodec/put_bits.h" #include "avformat.h" #include "avio_internal.h"