From patchwork Sun Oct 3 09:48:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30887 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp3289802iob; Sun, 3 Oct 2021 02:48:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxPlHBmUeXOqZiSZjwkWmlBp6jJa3RJnrwQxcfejYfYyNoH8yZFXVqCdyEsLP7QviHQ2d2p X-Received: by 2002:a05:6402:2689:: with SMTP id w9mr9913011edd.188.1633254516733; Sun, 03 Oct 2021 02:48:36 -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 dm15si8767740edb.88.2021.10.03.02.48.36; Sun, 03 Oct 2021 02:48:36 -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=HsakdrIX; 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 E653568A6F9; Sun, 3 Oct 2021 12:48:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073037.outbound.protection.outlook.com [40.92.73.37]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1F4AC68A607 for ; Sun, 3 Oct 2021 12:48:27 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kAdUQRJD9+D81gAd7WKFHbYZ0MmpsXv+96w756Kij9gi6GYj4UzH/VLeRSVtuhTsF5jcS9rW6WSB9ZPTHl6VTguh7k+vn0Kgy98uRaK1gZyb6OB1b6XGTB2GiUAYq7ebrgndhrWePAD0Sntt2ev3IfIpNmLgg37EnvBgUYKXZr9JSBQwmZiFN6bm3mB5wLwEpguMnJYBIyp357LB+jJzIlxD6JnN7f3ttFHAKDNpzBYxef2fPPtqdJAJgIzA9jWgAOlmA+aLyRZDiDtpYU+qoLinsuzEKyWcUsAFbSAhaSK0euKB+NKp4op7DD2gcOyTByIl08WbwyajNOxEncd1WQ== 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=8nUwFm3yjvrpjtdRT/JAu4ixwnRGciQk22gfID/E7JU=; b=jCD+4GhrNhqnKiB8zOV/wSO/MyGQrJF0txqe5hdCwSUvi8GrWr3EOWydyueFQWHgaq5jUmMjQtazdwDuLN4hpSpFgPJyMmrs//ON5avr3L2PiG9yQ6W5LSPWAoQbBrfjpnpTeo3F+cvqAkqQyaURTQMYcY0NS65WxpOwpnCo2dDpF9jqoMe93EpAisCZ58KNtHaxT276klJH5xE3zFmvQK5Xs1EMXnwp+NJSf2M3Upo59FMnD+KcHHH6n3LUD2+YE9bPN7OdMZNa7A+z0p2LnrBrbZ9wr1jkbidnhsQ8J4GFckyistnUgAjuSDYzPYvLrok2k6txOAfH9yEIL/8mYA== 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=8nUwFm3yjvrpjtdRT/JAu4ixwnRGciQk22gfID/E7JU=; b=HsakdrIXX95sRw4ukTSUk0tHM1A3VASa3W/PwZ9E26QfZenWsmiclw9ASNtvzPT03E1ZJMpHARptxmQMpTFicnnKchXP91lkpEorJbCk/Q+o/sgn7i89uWQ6F2veaMUULQbQhUW/6Vrt616A5/QKSSPKFJ3oI3P292VnqfotN6G4yWwbPDBqF0nh9J5kWYcw2zuQ9zHAerof3TWMQCxCeQ8UvtXl8peDKKFz349BmCoWuCHpgSqRDDodTesJhtkW3azbkIi1RVG0e164zHcBOIDpm3WsUpN36zaNTAwC/zHVhx72Tdiy17mq+yOvDCNfvPN+Zht7XAuV2YbyXEWJkA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM7PR03MB6328.eurprd03.prod.outlook.com (2603:10a6:20b:141::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.16; Sun, 3 Oct 2021 09:48:25 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%7]) with mapi id 15.20.4566.019; Sun, 3 Oct 2021 09:48:25 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 3 Oct 2021 11:48:15 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [NHnZ+EKTRy6os0UEqtu4iI1i3hAvaxzc] X-ClientProxiedBy: AM3PR05CA0114.eurprd05.prod.outlook.com (2603:10a6:207:2::16) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211003094818.3416770-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM3PR05CA0114.eurprd05.prod.outlook.com (2603:10a6:207:2::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14 via Frontend Transport; Sun, 3 Oct 2021 09:48:25 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: eaa5ea87-6bb5-4276-97c0-08d98652f1da X-MS-Exchange-SLBlob-MailProps: f36zkjAOy3XUFL4L6DKxdjpUfKPS+CcfOLBH2R5ke8r90KXIdsXxi0RFLyICPrthoxuuUrvOEimIVVNZWO9mdeS9S0RdT9IhO9Z6lK/qVlIFAeZOcqNHJN2bVW3XBCrRkvtnr6jvIxKhC8WaqeCfIWeKVbRxUkVKvz63jl1QM6fCx1dh+5PSjwTY35zqBdQGI1l9dm4Hh3Qw+/BaEmagGWin878B5HKZAlZFCR/gIhCJ13J1oZO1q0jP3sbowMPO2Kwq8bPjvMzB/Y3gEdCSji82EgRRMC+TNkf3wTkSzEh6HxBP4aCpmmOOjG0+UrBqR3GShFfVKCY4p6QdQUwVcG3Qnz1O3G5FrIj6gBnc/F6pb+L6mbqheF6XRyBmomdUkmZ40V4ZOBJQZ9CipKIigXlhglZB1jnGmXmtH3a4oGmwy7xjSgHYxO6J4QkGifr9EzsUjae+89e7M/WhMKSDeTNEjCjDuRBqaOvBKkeYTrG446iJvRKcHS1qdwxQavmS7GRO1SsedEh1fmmHGhQJeBtRu0Dsnd3je3SpvlN9SxuEKgKPLYZWFTxYWcs2WfeUciebVXE5aHMM+W9n4PGGr9JsnhyeGthfV4aAnyNoOwWnmSOb2QBXYgGZkTPu7XHtfzPIYgjcd6Q+v29NUhq1tHceyzgv0mCLfcQ5MayEz7wd90QsQEh8dhneW29qCYwpof85EK3jevRLXNS1U3mmXN2oXQh6vV0b2dKjDbzAodA= X-MS-TrafficTypeDiagnostic: AM7PR03MB6328: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EAwWS+EJZvzLJhGxjhbZCYeP7mSregH/8zZltFILy1hE/jp4F4R/g19oCMDlJLclwpJAUrE/vK7gFCVJ5AQvleY3i3wEn8bjZOfLW2+x4vY/otX6V2ouzQFrLl5Y84SSjI9bE8xH2VNZDLq7x04NB2DFfmZjy3qBJbeoAbfKowbTiF10kK7OGbsaYs3ig8I2F6SdXUkFTZqpuq/WK75BfbYgV1kT2SsJD3pR+TGbancFC3TPuUj/Rn6uWSSNp5kDe7ukVSUJXvLXH+3D7Z1viK/UHRsR7aFt7nuFRdVZTLuvPn/x5o0lDvABFSFLaOgEDwq13zkKRlnpWFR5AGUZjE0+y5d/F3Y8yjeBvHTZdivbOpyX7Rd2vCGLQKlcoisi6pcyhdv7YwSuxA431cQEBc5iaaZ8nN7hULwlHavbCn8+Ax7Sw4ygmz3YRtECALUK X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: SBQZGc8kEx3H9j58fZemuJNLiG9Jc7UXqQDFQ5xbAnhQHZacfsf+bwYJynSU+5yMgw5lPRahqZSbXEoD/DXKa5OIfmNSWrEriUH4rb1IZ61aFcHEWSp0PC5D8CuwY6MYmXBrM8ALT/+caacjN9rWwA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: eaa5ea87-6bb5-4276-97c0-08d98652f1da X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2021 09:48:25.5050 (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: AM7PR03MB6328 Subject: [FFmpeg-devel] [PATCH 2/5] avfilter/vf_morpho: Factor out (re)allocating lut 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: 3yhU+PNmrqjK Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_morpho.c | 60 +++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 32 deletions(-) diff --git a/libavfilter/vf_morpho.c b/libavfilter/vf_morpho.c index ac561c017b..d5c4801006 100644 --- a/libavfilter/vf_morpho.c +++ b/libavfilter/vf_morpho.c @@ -315,6 +315,28 @@ static void free_lut(LUT *table) av_freep(&rp); } +static int alloc_lut_if_necessary(LUT *Ty, IPlane *f, chord_set *SE, + int y, int num, enum MorphModes mode) +{ + if (Ty->I != SE->Lnum || + Ty->X != f->w || + Ty->min_r != SE->minY || + Ty->max_r != SE->maxY + num - 1) { + int ret; + + free_lut(Ty); + + Ty->I = SE->Lnum; + Ty->X = f->w; + Ty->min_r = SE->minY; + Ty->max_r = SE->maxY + num - 1; + ret = alloc_lut(Ty, SE, f->type_size, mode); + if (ret < 0) + return ret; + } + return 0; +} + static void circular_swap(LUT *Ty) { /* @@ -362,22 +384,9 @@ static void update_min_lut(IPlane *f, LUT *Ty, chord_set *SE, int y, int tid, in static int compute_min_lut(LUT *Ty, IPlane *f, chord_set *SE, int y, int num) { - if (Ty->I != SE->Lnum || - Ty->X != f->w || - Ty->min_r != SE->minY || - Ty->max_r != SE->maxY + num - 1) { - int ret; - - free_lut(Ty); - - Ty->I = SE->Lnum; - Ty->X = f->w; - Ty->min_r = SE->minY; - Ty->max_r = SE->maxY + num - 1; - ret = alloc_lut(Ty, SE, f->type_size, ERODE); - if (ret < 0) - return ret; - } + int ret = alloc_lut_if_necessary(Ty, f, SE, y, num, ERODE); + if (ret < 0) + return ret; for (int r = Ty->min_r; r <= Ty->max_r; r++) compute_min_row(f, Ty, SE, r, y); @@ -416,22 +425,9 @@ static void update_max_lut(IPlane *f, LUT *Ty, chord_set *SE, int y, int tid, in static int compute_max_lut(LUT *Ty, IPlane *f, chord_set *SE, int y, int num) { - if (Ty->I != SE->Lnum || - Ty->X != f->w || - Ty->min_r != SE->minY || - Ty->max_r != SE->maxY + num - 1) { - int ret; - - free_lut(Ty); - - Ty->I = SE->Lnum; - Ty->X = f->w; - Ty->min_r = SE->minY; - Ty->max_r = SE->maxY + num - 1; - ret = alloc_lut(Ty, SE, f->type_size, DILATE); - if (ret < 0) - return ret; - } + int ret = alloc_lut_if_necessary(Ty, f, SE, y, num, DILATE); + if (ret < 0) + return ret; for (int r = Ty->min_r; r <= Ty->max_r; r++) compute_max_row(f, Ty, SE, r, y);