From patchwork Wed Feb 14 12:05: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: 46261 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c493:b0:19e:cdac:8cce with SMTP id eo19csp331003pzb; Wed, 14 Feb 2024 04:04:28 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVHiMFKX7tLCR0YmrhbtHRbm33AOao6oekeshXJhReU6qpsWI+Dp1Sqr9+PczeXGVj4//0doyuL8w/lfEV1Zx07PTmDxkfFrwy0AQ== X-Google-Smtp-Source: AGHT+IHSG8zCy7sdv5pi8DQuOipoebzvggmazWZ/OmN0mdl14oiyr7Vlcilgm7qzQn4YTZ3sEK4T X-Received: by 2002:a17:907:378:b0:a3c:8300:f4e3 with SMTP id rs24-20020a170907037800b00a3c8300f4e3mr1932392ejb.11.1707912268648; Wed, 14 Feb 2024 04:04:28 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCV6hpnQ9d1w8zoHJ0oclV9qRMkMlqqJGps01YUDBiraEHVvX27FkpG+aZYPv+qhqkg3a/ia3JPDwm3DC1mC2bbSnHMJiHVYEfCd5dBPHAEhEaPfQEvrP50o1dcZk06S2p/kbM6cjXt8soqibMx03Fp0dMKSKGXnF07SK4CwhRzdyi/RPpJQl8FGwILES+xO/cqEG71VV795v+XVPUZATtT9pR4Ku8AcsQo6mo/aGHIltfcKOWPKbS61snHtaljHsaPTJS22Qya57Ft95ajaJBiBBCjADAA322pn7llpRA4/T0WOU1e9WxxUe9OsCN4iposNLQwQFSYA16JJGRTUxAa5qkCAfHrf59XYriJsQuBOLOFWIldtkGIfPC7adnq6ZNi5dGHZ8w5icnCrBFhtT2wZ8gB/BeKPVwZd8YKyu7V9jzcNdYq/A7wawEv9q2KEhYhQCAxk1K0QNPAhF3E0OPMgiTy/LI3KEMeEy0PrJlqN6L0KTUVRdGs5fb4RbwE/KrBxOjs2hR2k4S+ZTm1NDlwzRAJo5nsVABQFkldI4p7OxDb/yvd5r7u0+k6rerfrf4nWwxdlvbws1IhMpXfBHs1dvzibOlOwcYQNfc4QeVvFwHnk5luQBcCIqUTcmvwgeeN8SzsXcS0r55+Nam7v3f+FvemAZzfyyT02CQSwJWOspUFkiTWa+xFUelIROemV0GgEUNEX0frJDg90qqTuKVTy/M/1//szAsFmul4BncawJEx47+LY1Rfn6YJNXK1T/wmE6xta9/wVwnml5rb+ZyqspCIceasUGwnea8nfzQNXLktSqHJJlIN+h3KgidZ3DdoT/GBN/vW7Rz0ndftJonRvA5DItif807TM9wn/qIWHroragb7FQU+Bpp/eraXxlOxk+Y/fqQ2j9p8fX5aCQ0lTqN0yYYGHyhAL06TfUu3CybNWhP/LxRJ7jxt2VNxk3/0OL/ dm+YzYH6Uu0FxW+6Vjy8YH4gu1YfdQi+RZaOivPN8y5KnZOrSIJpdVO0dICzXE1+uPobu6t1SqimRMHu2bRnmh+ao4rbHMbSEBGoae9qQrrDhr57naW9TJmF/o5ueVNOCSGEjKGJ8V92z6q53sAVMPAa79FOuEVM13tKEnGHfZzGKh18smbDuo75F3kMItZzQdGNgTsC6SVnIKglbDe1fi9m8hjRgJW3IOhqHsfobHi95dPnHZpyqfOMEiuTNoF/MPqnVoZXgU3kUNgy6X/9mCBBMd5we32u7pzVQtYdblhSNbd4Y+kjIsThlK+DWSoDWxomF51uuxzLruUqyeDys9PE8dZQ7wkK+zVV+G3PU+9lE50TOwD2Z+bwRgmVhwr9gULujvmg7eaCSyBK2JwvgcBy16eo7WVWismwEtYHUJWj4WK6zAOe7ak9xzwvcMP0J+owytKVxqXGB4c7SsdSrKcPAmO5rNDP6k0Ln+m7TdF6PKUc/+WzDmD3aXOnWf7qik1AfFPXDLMytLqFnG5skNduTH9DlVp4lXMAXB/Kvizy5WFh5+aiIB4pwSS10bPLtE4k8w1XzssAMSyYVBlKAif1Cu9XsRsRPrqVxMChE4iNVgYxriki2XUNwBYuX2 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b20-20020a170906d11400b00a3d52681373si424979ejz.805.2024.02.14.04.04.13; Wed, 14 Feb 2024 04:04:28 -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=vOxZT67A; 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 2A20668D1C1; Wed, 14 Feb 2024 14:04:11 +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-db3eur04olkn2047.outbound.protection.outlook.com [40.92.74.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 269E668C44F for ; Wed, 14 Feb 2024 14:04:04 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ecF9Kb2t31idk6hDNgDMQjmiSVi0Or/i9XnGN7X2uMqv2kx/Tl4GILvrJql+os+YInINTB2wIexIxCm4Gu9oHfdcH3rNritDDPKdJAk6/7a8ypJEix6aPXnhrwKZvvfXu9o+PO2hzRtr+FKB3euO7Hud+c78wvwLAgOxl444vLwHc2/3gkhL1wU/4p+belHQapy8PqEBitqTj5KaxGQc7ojnvozUKqzhvmaTVL50Tg9yhTaWy+Zy7+ttWONAcw6F0idVKMMBgYNHuTOBO5Knug0N65C5UQlqHqyeoILdNl7rxhVSDDacUtFdwjk3QdgUheyDR34nP8lKNb0LfTz4PQ== 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=PyDTUJk+/vskcYGqEpsx/zTClhxC9Uops2+aDuC0m6A=; b=U/ZtaiNgEoFF4glFGzYFPZZAAOjXY12wp5eseZaGxQdyJaxVRJMUW0E5DVcwFYH8BlT4PxqmzbdZ4egQ6L7FBLVFQn2NVSMVClBPdAXEiq9p1CEYHjYFSardX4PiD/xAiJQm25zQ/lRuTyAgKIIy07UvfTt1Tt4xkyE/uL7lS2UBGzBqfU1YAt2BjjyCnDnNgxlJqA7tTSuJHPfjtlAJc2sl7c0h5THu8lh3E30jyzx9gKphj2+glZ3YXXdDJyqQ3XU/CSiA9JqBprDGjSP5Uq+VHVYYcphiXNtUFMv0KlJ9ZDbG3Hgs999JB+hp6YzGrpbAt9oqowaCmRlez+Wnew== 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=PyDTUJk+/vskcYGqEpsx/zTClhxC9Uops2+aDuC0m6A=; b=vOxZT67AuONHk3enOgjrzApndp5XvGSuGVujKognV8cZeN4XqnknFlekffAY8GPfFiBcSjGr0iCoOpIn6bUWPnAH3HaqSSf1kHo9TYZlzZnLuhHyhrS9bn90eU5CO0zCpBasLpAPb66pp3nivoiSrVy4LgsZEKe9noU0NdRSSizvbkSBN/VKXNYmE3Cwc1nClqU9d1ocGtm0jce8YdXqo188ssV/zlTfaRvHx/oREi3nIvXd1L2vpqogIF1NU57sEpdFmq9Yz8hXaqfJSKfYAnzTyIKm7G9ryH90sPjgftIVbhVYabcftjywUmLGaYHxMF7x9xIlRdKCESlYA1r8FQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0173.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:27c::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7270.39; Wed, 14 Feb 2024 12:04:02 +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.7270.036; Wed, 14 Feb 2024 12:04:02 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 14 Feb 2024 13:05:32 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [KQ0fM1yO9YVC7e3Fvzi/ruWUA5a9KlwlSvwmK88ydQ4=] X-ClientProxiedBy: FR3P281CA0169.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a0::8) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240214120534.587472-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0173:EE_ X-MS-Office365-Filtering-Correlation-Id: 85a21bc7-fe0e-4753-9ce7-08dc2d5508cc X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: b7B6ZIDaap6Z/D2Mqm2xuboQhWDVgg10q6Mk0WJmRnoFfpc6RiaCaOPy/L1zZY7w6hDDDzbPMGUVlh/ZV3ZCP/GXNDeg0SxC25ekCnGE7hlb5T2ZVaVM5AVEtR2fzQrwNaK6XdpjqFgIZyr+yUd5tTx4NCEN2gLI5RY6Vy/9uuv7JcduQCQV4MQmb7Q/Uzl9jyXXALNZgLm428rzEuPz6bPAbRYQyCXGd0WIS3D1FJSMITPySSc1rHmQ7tZstS29SFLP+4REiIJ3zgjH9TnUI/yU2IXambi6srTW9cT5DnOEJfv8FN+VVPm/nXVJMytyUKOqXrJfLRKLItUCmBKAEDZ2IzDRxhdATlGVRW+4EYunMTdN2q2cnbylgf1cVQ8dTu2+sOpfeXDdVyS47hNVQFWD2ihr0H5x28x1GrGt1sxxwXZsS7B63NiFppjiUdBOd41CG+8K6gtd5XWcoMoOwKrqYxVhThzsSfYYNRW7ao0P28kBHCqObfvdhih9EBUUqinPUb8LIpwnllI+XqP49T0YOVmK3A9Mqax4QK5A13DnOYq5Qx1j/FNYm7ntLmajwzEbgTMRInEP02xldoEf+m2xCdnHpZd3udZglcbjNvA= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: h1oio2wNdjwuUq+Q4FPdzi0Y1OOotToq7uPu1KsD2K+gDa6RvqrGTFfn8KIHh7R8jCwn0y/+T9x4od1LdZDSEAbqjc7laykBSINjodgK4X6Bl3DTGpXd4Ti90sZhQUv4s9YMJ98RtRn7ch2M/byVZ21NBwAyhNSFTs3NAduIF+SShwKoWLj+g/XXxou4gpuQoDcw4KzCrAUUpzG0A/DTPhELBNmIrtDAQHSPER5kGGyyOGyojIsWIyu/gbDe0byn/jLUlTBkRh2k3nKQjJj8A9GEsiZOMYJvrpr4HY6yXDhVLiI27Bjx2JT2BXyRe7a8S0LkKOGa8RVr859jhdkxyIrLVlFdNiXy03gwPjuOaXhQrxudZCs+b6xVtRp8+1ppDdT66M0S26lLAT4+rKYuAxIcmvQwfyjSQBoVNfKilRg3PN3IzYjVlOfdVmCHUVWVIA6Dkaim1rzn3Mx02SaaCEYWXXQX/Uu3EGh76t6f5e07xcDbROPYhD/W6/nJOibI1zkn9XVsVaDig81AVyRJdr1Szc0r52Vcxbv84fEv+zQTJjq7JdWnZ6X+pJPIoIYBqW1F09pQevpCoGumaMyszj2jT1LWq6hzyeo+MuaU+vcktvTDbyB+FJjTYorsW85a7Ot5yyVE2ycs3qurrlph6vJIysYXiMSbcx4mL4yFQJ5KdfTKAAwL46rjtvtN2SZpY+3bovTdxtouE9KY+Npjll2zdN0fS6XLYFdrPQ26t+xbGQE1mIaJ18DrxyMM/5RBSP8gfb6+ip589N/nWQBw1zjbvDMo7J2o8x55XaNxGKPiA+sS38HpHmfE81ReJXr3536SYO5JBtSOLVL+4tyWb6wRVtd1zIFvj4zmQaj7QwN6Clx18ZypMOM5ZhGV+g953jPxz3lDsogBaPxDMiKdgsL0Z+dhjym/hMTW0s927AGQgxryQwNvt97qD1twZ5BrjiDVYIk8tLIKABdmbM8+orSVBUeErP5g4/5zcwPpIW2qL+m7Bit7O9Jl7arbwKbSlYqc8/ocyursLlkvYEjuQOOZJIF8EZC1fpaDnkpCEg1GY2FNNgyh6oxg6Mb86LxTmbOSTUDQi4ngNLMq8mm7qFiOqW51DQ7uCSH/Fior6VcYeIFRxzOCl75IEFnt8WTe/zzws6ZwVC1hl1OHwBp4+cDW1lC0KTGOLkrBh5GaoYU3NfB5Zxs3UFROfZxUTpfe11vmzhPsmvJhw/FBpXyMrZgmvcR0UdGwuywsXs7DXeb4eEz8NXPFMKBsB/lZ3hR/ZUVL9Is9DR/i4ON2zCKMkg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 85a21bc7-fe0e-4753-9ce7-08dc2d5508cc X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Feb 2024 12:04:02.4670 (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: DU2P250MB0173 Subject: [FFmpeg-devel] [PATCH 3/5] avfilter/signature_lookup: Allocate buffers jointly 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: sGyb3QtnF1qO Signed-off-by: Andreas Rheinhardt --- libavfilter/signature_lookup.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libavfilter/signature_lookup.c b/libavfilter/signature_lookup.c index 90b1d0eadf..3a42737e1a 100644 --- a/libavfilter/signature_lookup.c +++ b/libavfilter/signature_lookup.c @@ -205,15 +205,17 @@ static MatchingInfo* get_matching_parameters(AVFilterContext *ctx, SignatureCont } hspace_elem; /* houghspace */ - hspace_elem **hspace = av_mallocz(MAX_FRAMERATE * sizeof(*hspace)); + hspace_elem **hspace = av_malloc(MAX_FRAMERATE * sizeof(*hspace)); + hspace_elem *hspaces; if (!hspace) return NULL; /* initialize houghspace */ + hspaces = av_malloc((2 * HOUGH_MAX_OFFSET + 1) * sizeof(*hspaces) * MAX_FRAMERATE); + if (!hspaces) + goto error; for (i = 0; i < MAX_FRAMERATE; i++) { - hspace[i] = av_malloc_array(2 * HOUGH_MAX_OFFSET + 1, sizeof(hspace_elem)); - if (!hspace[i]) - goto error; + hspace[i] = hspaces + i * (2 * HOUGH_MAX_OFFSET + 1); for (j = 0; j < 2 * HOUGH_MAX_OFFSET + 1; j++) { hspace[i][j].score = 0; hspace[i][j].dist = 99999; @@ -325,10 +327,8 @@ static MatchingInfo* get_matching_parameters(AVFilterContext *ctx, SignatureCont } } error: - for (i = 0; i < MAX_FRAMERATE; i++) { - av_freep(&hspace[i]); - } av_freep(&hspace); + av_free(hspaces); return cands; }