From patchwork Fri Dec 3 18:28:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 31920 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp1032441iog; Fri, 3 Dec 2021 10:29:24 -0800 (PST) X-Google-Smtp-Source: ABdhPJzyTQnAfz1O6wRzoJgDnF15Nytqo+9yWp9aplmMs7qtsGfXAj9qCwwnwDG9J4XCACCIOmDG X-Received: by 2002:a05:6402:845:: with SMTP id b5mr28749480edz.392.1638556163711; Fri, 03 Dec 2021 10:29:23 -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 o5si4942486eds.560.2021.12.03.10.29.23; Fri, 03 Dec 2021 10:29:23 -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=NN7ezWIA; 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 61C1968AE8E; Fri, 3 Dec 2021 20:29:16 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (unknown [40.92.90.78]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1C3E968ADF7 for ; Fri, 3 Dec 2021 20:29:09 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hFQAFS6AWEXriWG5jDIuW37h+oCzkHh+wFln6nkQe0J1YRKK4irDcDfrI9LkoiTvdMAa0Ik5tkASLpRbua846UtKW7IHBc3kUbekNctkvaMH4EZV8jjyAWS6LUm5MoaO296n+ZSE91vt8zNWqBDxf5PqgCprLqL1HhQgzc+FLg8kDnkGHFG44DdZrYVHHU974Xct4jXq17S3pbD41Ot0YoDiYofm5kn4NAjmgY4tX4Ibxl+ci+UiC7g3U153sy6byoKyKa2kLEzG+s9hCj7p78mojWtYNSCObuthnaCxpCj44/yX0F7gbvhryZegoBPltQYPc3F+VyHihyqC4Bc52Q== 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=P4TC63Ub1QJ8HKgbTU0B/id1sdl3rdInurWXWIJvZ6g=; b=Xy/WiJKG8kLJHrmifbqId9GpjQXzjWLczdz+hZ4XbobAonfoNUvkbtzVv4Cm3My1szx0TlvU0pwu5WydtN49g+er3vQQCNAuWSvO8pfyQo8RAfskVX7czL5kv1L1UpdhWj0xaU5tcMvG6TwJApvwYqtS+0IyhGJ1feEV7ebsR7lTYoPYWaogyf4OWQoZqLLNU4QCHMsO8Bz/aTfrTfFvmP4JCUgxeENenOZpiPKjDfQ8H3OiMt601DNP1a5myMt8U4ROassP+gKqJDHUPGbjByjKILQnyPW+ebz2Fj+boy3UwpVBLlmUMdm7+maDpCvEymWUGlOX2FU04nwegeuogA== 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=P4TC63Ub1QJ8HKgbTU0B/id1sdl3rdInurWXWIJvZ6g=; b=NN7ezWIA3/znvCaJgpc88T7nnIj//Y1JXHNEiESLfySMvE16w0aniHkHs67+HCBs65rd9MXpVF3wscX1LmyST0LpFuX0ju84Xsycmzm5XHouqQsrdEesy4MWVGOYSCPVmFN0SC/8SPbHH4nHANsCzGK7USfVjMbQzoNrozZNtg9oh46crS1iONLgpTKGtbLtpnueGAC+IiiYYVb1m5oM4r9rwZW1UNRcpSPMRQQgt3vXMxJwD2pbuHEDEtZ9vsdLTGUJbifjAR6161JT9ZCEoy+6vSjYEcryjd129MG1imd3VDg+kV/4Uaq4vDkn7j6kvlbaEevwZrfC94Q/yY4M7g== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB3605.eurprd03.prod.outlook.com (2603:10a6:209:2f::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.23; Fri, 3 Dec 2021 18:29:04 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca%4]) with mapi id 15.20.4755.016; Fri, 3 Dec 2021 18:29:04 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 3 Dec 2021 19:28:55 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [uJfskU4f1+r6LAl6TQNqcvYz5PqP+wGk] X-ClientProxiedBy: AS9PR0301CA0058.eurprd03.prod.outlook.com (2603:10a6:20b:469::17) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211203182855.1688900-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.248.74) by AS9PR0301CA0058.eurprd03.prod.outlook.com (2603:10a6:20b:469::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.23 via Frontend Transport; Fri, 3 Dec 2021 18:29:04 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: dd4861f9-dd27-4bb2-5ce2-08d9b68ac8f0 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQtx8w+3h2yNNoYV95SbXd9f+mywLsfOIKZislwOY2GiNcLiIAYN/OGm0wcpSsjWtUo4S8tK5spACSqd/pKUUPDm1DjodGTLKYsvsb2nPb7HDYmzwcQbl3Xfrc0CEV3Ag7kbeE3nqoYmpPfSg8QOIlWiJI6EO/B+ASB2ok1j+LDC87xPAOQfGL2XRRU43GQAaDb6DOjUUxj2mjVK3kK6nLRiF3AkWc+PPImqDZMXRrfNHW14a9rcBS8wMG9J5KnDanTwOzsWtG4eu9ZaLrEmDHWmoO6zhIWRCWi3sC56DB/HUWDZHGRxyAsX4EkC6HiLb5wEN3T4Tg/sZA6BQUJHDsgTJuujAtMXD+NY7HnQYFHU3Q2wjgK0jPcATnNOfLj3AH+qyQ/jJGw9h+8Ph2pW65CzFsn1ocdGqxTe76DatWKq3YowW3KlC77YwIdWx+bihgoTnuezi7yfq8scnd96rForeJ1ysKZQNnz809nlJIOEXCd3xL3sW9A63gAh3qe/T8+mDi+FyDPaxfqYD6KZ596+FgrJqu2+XqIix6ar+YiL+CmmebcvoTRLdMBvLab86ibqLTNk4mwAgBOX7MK7ZmKBDdKyPXJSbyunbmYAtHWIT+mrP0q3fOfURSBFwHNNQNyeKxWagehmV4czrVUdJgKagD4M9e/hoyJkFDzje1cp9T8+Kh3UZshdwEpvBVHgmCBndEs1Hdwn64oLVSil2NNSIvodCsMRRrMJlqiWha1qKj0INHPUfty2zhz3a5+WPc= X-MS-TrafficTypeDiagnostic: AM6PR03MB3605: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: D9Khd2z0st0rULJ7BlGbQZn9uJOfnuDm1VnqxW/5igOTfKcv81O5erVxwv0uAgxjtC6VIAU1CtHTgrLaahtgojO2OafPtUHfa9Rw7FhjFolxebMGWJKk7oooFh9rKKgOyMaS87SmoOcbEmcbuW1hBQ/Cqqh5gLONLjNog1xeQs+++6CN7KJW2Ao2qDiUL2tKf8rAjfJpnbRA3RkBXqjNwm8TuBNukrrET/SpkawixBqmb7e35wn+mctPYnHHeWH4wxLtoHD7ETeM1WX5cym4gEyrhH4WFtUGdZBK6i4PD3Vr/Tt04nwVnWUD3fP48XNvIQczrtX5NCL8mEDAZ39VIWUWW/CSaBIywrkPmSWzbGX2tijFtNhbTknxDnQL3KaI3+Nn94qA4tsvJpKQhJgt+4SCMOuuGI1Z542Js8qB2h/gPw/PaQhGB61pjouMu/W1eTWcghwSRGQgnp173rIV6UyyaUs29hVf8tIkGHrVEAo2i6wJIVHnhM2h1ojqFv7bO+LP6Jvx6TGqPJ8oOqgjYStZeY6t7zp3HBezU5lz5GY9wL+H1OIieZ8bU1Ri2wqR+Txb8dmb9AnfnPTpzIGKhQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: HU2jStya1e7c99RfWvuYGlnwzeb/5OrJHwk97QLoHvG02p2BgNTRwI5y7YvrAgfdifdgcUb55gSF9HiZGA/8nQZ4vQTxJiHDE5WQ4Liv1QQN1h5pC+fkaI+kxEbt3OxhZjNBJUj581lWKUTHdmwRKhKj05Lq9MF7N+fAuReNY6SX/rq7X9vzmVRIejrihjF0U/vQ3t2mJRsJgfWC2IRSfKBZc64F4M11CzaOcg7buodb2wfzvdgcnXT7X9toO8KRzVlGi550MaV66XNsG2NuMoecTx2FYLm5mRRJpwumJV9pHt8iJYUTot6IPspIO5QrDKFOUo2knPWq5A7NMDa3pwQ5Q/WCZZkE15P9WP2G2lFiS9PFgCCKBghjYY8en2+C3xjBQQTW+VRqNEwHNao7vb2/k02nG8WueOHBvxRGhy3lDjfZ3AS+mChuqZVCDh1Gbr984ZvH6+0oNbC75Q09NEBGwqktaQN4RMoJXfX9bCgGWLDFlRi7ae+n6gnKmtCKJoLm8IiVHR4KymYlLhTXypWxwPMYx3W9z9anJd1EMh9SnPyg4RsgRX2nuzeZQVFfZfwy/y+CcjzIpB9xq83akb0/iZ6+8M0ekKvrZPTVVpEXWL08Tru0zcExtakqjPviqXUBS0pDmci11U1HOTqnpSK6e4CnhO3qtEN8G5yRmNeL0PtqtqLzaB/Zy5fDG1j2kagLhUYbb/maG+0DLQaVLqlh6ekl8bn3gW5inXWUacLDe3HyC1UE4AnA7Y0MSLvB6hNlGPed8p+iixI3AFIyqIRE2rWkWI9Z4PG6qorkWxlolEgh9TVsoERj7ZZ78h5UFDwAY/WLDnvIPQgUDVx+JCJRbABngl5uNyR5DhwKU28l9Sr50nLOE/Rw3+KJDJryej8XFNmeTWm13ud5Bz9mdzPgkb5+g1I+dqMjlJhYHMcJ5s1qGELgNhWWYKCOwoLRoYJS3FNcBxXIDrK6GmeTaQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: dd4861f9-dd27-4bb2-5ce2-08d9b68ac8f0 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Dec 2021 18:29:04.4135 (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: AM6PR03MB3605 Subject: [FFmpeg-devel] [PATCH 4/4] fftools/cmdutils: Use av_dynarray_add_nofree() 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: Zge/6Y+U0jXV Simplifies code and reduces the number of allocations a bit by overallocating. Signed-off-by: Andreas Rheinhardt --- fftools/cmdutils.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index 0b57552e5c..3c8e5a82cd 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -2216,19 +2216,13 @@ void *grow_array(void *array, int elem_size, int *size, int new_size) void *allocate_array_elem(void *ptr, size_t elem_size, int *nb_elems) { - void *new_elem, **array; + void *new_elem; - memcpy(&array, ptr, sizeof(array)); - if (*nb_elems == INT_MAX) { - av_log(NULL, AV_LOG_ERROR, "Array too big.\n"); + if (!(new_elem = av_mallocz(elem_size)) || + av_dynarray_add_nofree(ptr, nb_elems, new_elem) < 0) { + av_log(NULL, AV_LOG_ERROR, "Could not alloc buffer.\n"); exit_program(1); } - new_elem = av_mallocz(elem_size); - if (!new_elem) - exit_program(1); - GROW_ARRAY(array, *nb_elems); - memcpy(ptr, &array, sizeof(array)); - array[*nb_elems - 1] = new_elem; return new_elem; }