From patchwork Tue May 3 06:37:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35555 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp257569pzb; Mon, 2 May 2022 23:39:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzjoAGv+ozLzxSMVzRsqrCGJtURT0aq8Kyy7LjP+CDwHotwIRXNK7XgdUCgdmtrEFzc0UL2 X-Received: by 2002:a17:907:948b:b0:6d8:27f8:ab4a with SMTP id dm11-20020a170907948b00b006d827f8ab4amr14437660ejc.39.1651559964493; Mon, 02 May 2022 23:39:24 -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 o19-20020a17090637d300b006df79ec22fdsi13185243ejc.567.2022.05.02.23.39.24; Mon, 02 May 2022 23:39:24 -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=izGwj8tX; 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 8D99F68B399; Tue, 3 May 2022 09:39:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075011.outbound.protection.outlook.com [40.92.75.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6C16768B28D for ; Tue, 3 May 2022 09:39:13 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=I4+4/CNcnU37OD5RIqZQv2HwAb5ZNXGuft6vbit9ZXE8IiUleqR9aCiQucxghEFvgPkFQzKfy0khZ7OdZYzXFmGk72Wgkv8L9zter5WcaLZkEdCN237alafNh0MlMEHnqturCRsJynTFFshA8Fmr41DrKkEfcq9espwRSmjB0mEgx3Beeqr+cto03fGesjaN7jaN6rQZZNcQ+EbGAOMmP/CzEDcJ17XKu7cOBQbx5us/HZCuDtHhG0IdofJJdaBU4NwuqDp7cksQtaemCzEdhtv0w3exRBIU4w51Ps6P9m4aKwyYxhbHQ+rqKlveI2ohYgr+sEc062LuTGjGeoTK1g== 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=MOntaMXq5IXXTM+WeQPrgeSaP08WFvU5bnuP2EjtgNM=; b=nkMCKch8yU24OLWSmiTUicvTFU0+QdcOvkVe/i5qZTxPVLp9GAnoWqZHtqzYcn2AT91nMY1hYG3RzIDqTmX8KjnG8uFxlk1AnHgcxhLILoOQcwyyDJeNhBPm3lh1AJaUC1GjJaixLdk17DAbkYkaJAWB+NtFUEpel8erFAdI+gK9I6CCZObFV8l1N6sPBG7sy/ydY2unG9CUzhNcLDNsEzgcMHT7LZB4nm2E7yQREaPQMrwwBkfcu/FgKdwGjgnmwqjsU8M2ChSO0GW8vY3wjzC10vaJIJB+Of1TjGKpLtnFKH3/FCKjt+nRxA+xg7UiPFuVRk4Tvf1orUhNOfDmyg== 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=MOntaMXq5IXXTM+WeQPrgeSaP08WFvU5bnuP2EjtgNM=; b=izGwj8tXamcCsfVnOFcJlUaRjemg02a2RaPM7SxxWdVLoXxvRqOVj4kqKn9joarprMaV4FvmZSruMl/MPc4BUP8Fn2zUVbHkkxo56S3fIcjD29lM8I/NiHdzlCsnw7UgF9uOm0E4H60uP29qD3QOHgysUYS3S1SmpbwaQgXjTT8UW7RVLWEmlfMKgJGbreln9sPG7UPTxIBAjQAvFYVkaXsZ5vNPJ6berqHUMSfuu5T+WBVeB86F6nUOH3QzI+6rvjCOXYhDWbpDuB4WtLdSVyvTqAJ4500Fv+TtmxqAdXRM8vCKG02LJFxMUAJeWqEGVm63FpkEAb0fKfv+0QJG5Q== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by VI1PR0102MB3230.eurprd01.prod.exchangelabs.com (2603:10a6:803:8::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.24; Tue, 3 May 2022 06:39:12 +0000 Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::1854:2c30:7ba1:c431]) by AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::1854:2c30:7ba1:c431%6]) with mapi id 15.20.5206.024; Tue, 3 May 2022 06:39:11 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 3 May 2022 08:37:46 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [RHNCNekHFqymPfUlKpLWkcfRmW3JVtXK] X-ClientProxiedBy: ZR0P278CA0014.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:16::24) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220503063751.2261222-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c5e44874-cd15-483c-1a92-08da2ccfa21e X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTQEkMEhbgfP1CXQyS+IofoA8939WrUHOZbU2KC5WHQ2flYpWD8KJ1PzAVwbgjQpCWpmM46Zb3bqanj/bghFognw3E5SOyp5V67Aatu8wdQKt1HlihfRY4kQQYNY+69P+H16QcFHKLuinOP3eOZeKFNbMvqjC49raRkELcttv6chIOAr6wRVcl+u/+xAaod8ZX3m1qAnyDhpGnX20AqjLl9rb3PGqwYVLwZ2AfhtzKjzaoLnyUrUrT/JUaryE0QtOlb7bynaerwKA/YZrrDI/xrvDExXHugGz/kuQBiumMuUx7GPrhMyFNK+2X2hMdiGXdV9HPhM/s6HGYKV3FsZMa+fVOxoWUtjVREwCpYmG7XXH/j7pYqTKXh3GAi+0sOR2ymymv4bBEc3J6HpUfWY9yC95hWw/cIN3dcT4laQzE8CB20LjenJPVJLHkZlUkefKuqHMe+/gWyJwgF/oMeLxh/xA3vB5KmqxK/uWFWQeNvBo6pwctU99bmlDLmW9CBo2gcZMm0THnAkKuy5zVflTTrCvMY0ARCw1olqjNfMIg/M+NiSb2t3Y1kWqNpEf1uYSs06j5FiU2F3Szb6ekh+6TcFpUreCI3VtCvNsiH41UgM6sdpGwScJLqm1sbHzqF527Z23PfyRo0qTKqDdbQkwpX+3Wezvpbqs8XosnJ5373X8m756cVDT4+P2WkS2VSj2Vfz6Cp7At2Ed665BGUc5l58ZJO1Bf/2zRuyfkCo6oMXxeNoKZhsumYbw/kuxuqqkE= X-MS-TrafficTypeDiagnostic: VI1PR0102MB3230:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CJiniSd4tzXLUuBS2BASpyj0iPVXt+T1aUSm7IYQK/MPAOASB5Jae2dwhAVXf0FlsIxO2V341jiPtS9GTegy/bho1tHYUO6ckmPQFai28ulnDOnmmpXJJkr3LsN0/GLyRDf/s0C5lC89x+0VwAUn/EFummfVCVcAAGFLglLiPobJbpZXpxF5YBN8hpLbioSj7kMyshxXDyU9KrIMX4JjS6KGNpwzsJqAAw7tMvZ0ntWXwBND2/8VAjWakgPYx5hL8aSSBr1CbhlPKEcBqtho1S+TloPsJ2iPOlqMTXncTorR5AuLyFUKQ+EhfIwsQ9+nYqsa/h9VxYJg2kiIF85GqichixxtbrOf3BKQ8ZePy1SC7zGRUgqfcLAiMWFoYHi9JGXhW3Jnl4bOFs2GFJuOy2mxnSMiEFdkzcQbvaUxq353CH+ZEd9/3O5I7UDmBG/QA4WHbzGeQwTbGHfars2+TNDp904svJRozQbE3Rj39XWyz19Jd5xSxXtEYrXoyCz/5QomgERLa4jiDsKewFFQzwknSdmD5++EBxigon1WxqYpWORWmwgfoDkEoKT7xtY0FOslf/3qMwnvjjYZNamUsg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: V/i3T60l67Oehf0bYY3K3hOmOoJQr5slUxf390FiTGL3wLzY9VEf1DPZxeITqT9ehYbyZZ64MLNPDBbWAs/jRTKFvQTzCJtXV0J9vnarm9YBDYk50ZuzMKEckxT30C9gbTGuMokV+sSpkATu/BrcCaEp6sSqtXVd47PD4dbYoNooUQtUXZ8ywVcIocf3cwWqULxVZQbV2aDvRbsTW0YEbeD6SjOWWuTCjPYi6RuBLuGOi9nx/U+zIb/miHN/yRCZ0v0MvJ4jPYG69i8RWI4D14GaXEp16Mt3hbGoMNaoZVcNwKp4N9aVNhOknVTjtht1CJCUMvwQhmpvktO8mcKU0YeoF1dWqpLWyWFeaA6oozxIH5A45yK/00WMfo5taAtQdYlEsAjvnV81JgJfn+d0NgsFOLsqX/Oy/w40KzRxKsyzwFi7FGcQQZYbS+TwpQnmiUC8YOB11MfOZsXd2IqVlcR9qVoKhF3TS1aPgUyZk+4+9jM4sypH8eC6Xd3nO+TNkVETBEq4h1yeLPWPsTHzmFt5B2hcLq1jDmJvCNjBXB7/NQh9dmd1yOGsLQDI05KgjICeQkC566FbTE/6SEgILYvCAN1Uf9OvWVJvq3mYNMbQK7LrwrhWRf/VmB9Q02TVE2ZvZ9r7LiribiqoPriv3Cbq87lO6HoaN2R9nHbfmq14COLsm0+HPNsptEdAv73Bp/NINSPTZh3/qS6M3+U0ywfv40f1/0ZJZu1ENiXxbmXFU/Z5RFEXS3fowJn4mBkWlL1op/YsgKb+JPf/fvxSKUxPPMsubvZVPezntnk5J4ciQsFA6QCkw/MiqxFNbocS1EjYnCaAKXZq60tApf3rO8juuNI55oS1UmQgB1Jh8ELByc7QgvOyu6dYHpqXiukqZHzhxdcID+lg1xHo/xSr/aJLz6v2TVziIpZoKin4GpQCtrsW1lSZCczU4ABn9OrptZY6Cq8BKm6AjxI9Yx6tLQW34IolcuKRuLBDc5ZnM9+DcQF6fH+8FSoFbacFfHaPBrIDchQF6dpieXT3r0hm//fge85KWpQscspQ0wU2AfT/tVS0FOFJVIXOE9J0pOXyJFmA1tdwlOh36B+UWP0vvgnBaZlU/6mgdZJoJFyBE7dTNhwTDI/ZUeBLfllio8K3r69MaWf2f+Mm+4pZ4jHnyaaMQf3TSU4v0KlEW35+03bxzoBbeXDhcqyj4NHM3nRIwYZPde9q+rRiKkfDKWy7jAgI5aEHcGhMw4Y1DZzHnwxzZYqvFO/5fbTyEZolOGcN/l2ibA2x+w3o3NUyJ7yuUI2PJxjQvx47CkKcIkdtp8IMTFqbNFyZxLEQZJ5qhH4UoALR7/Q04mOdBLIA6D90fMg8mdAV8jtB58ClvA1pDLf7pYHJhJslshJ18mMvRRoGqWhzUPHGWcQb0y9XrhxcnnxP5Zpx0QYWANIT9ITt59lJJS/oVhnyrJAV+wQOxp+s5NNzfIU7NlzRhkzPwtbvHA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c5e44874-cd15-483c-1a92-08da2ccfa21e X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 May 2022 06:39:11.9218 (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: VI1PR0102MB3230 Subject: [FFmpeg-devel] [PATCH 05/10] avfilter/vf_gblur: Move ff_gblur_init into a header 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: 8dMtjM1skxQD This removes a dependency of checkasm on lavfi/vf_gblur.o and also allows to inline ff_gblur_init() irrespectively of interposing. Signed-off-by: Andreas Rheinhardt --- libavfilter/gblur.h | 1 - libavfilter/vf_gblur.c | 89 +------------------------- libavfilter/vf_gblur_init.h | 122 ++++++++++++++++++++++++++++++++++++ tests/checkasm/vf_gblur.c | 2 +- 4 files changed, 124 insertions(+), 90 deletions(-) create mode 100644 libavfilter/vf_gblur_init.h diff --git a/libavfilter/gblur.h b/libavfilter/gblur.h index 3a66984b06..83f43c2c1e 100644 --- a/libavfilter/gblur.h +++ b/libavfilter/gblur.h @@ -57,6 +57,5 @@ typedef struct GBlurContext { void (*postscale_slice)(float *buffer, int length, float postscale, float min, float max); } GBlurContext; -void ff_gblur_init(GBlurContext *s); void ff_gblur_init_x86(GBlurContext *s); #endif diff --git a/libavfilter/vf_gblur.c b/libavfilter/vf_gblur.c index fd664db057..b88a9a6d26 100644 --- a/libavfilter/vf_gblur.c +++ b/libavfilter/vf_gblur.c @@ -34,6 +34,7 @@ #include "formats.h" #include "gblur.h" #include "internal.h" +#include "vf_gblur_init.h" #include "video.h" #define OFFSET(x) offsetof(GBlurContext, x) @@ -54,37 +55,6 @@ typedef struct ThreadData { int width; } ThreadData; -static void postscale_c(float *buffer, int length, - float postscale, float min, float max) -{ - for (int i = 0; i < length; i++) { - buffer[i] *= postscale; - buffer[i] = av_clipf(buffer[i], min, max); - } -} - -static void horiz_slice_c(float *buffer, int width, int height, int steps, - float nu, float bscale, float *localbuf) -{ - int step, x, y; - float *ptr; - for (y = 0; y < height; y++) { - for (step = 0; step < steps; step++) { - ptr = buffer + width * y; - ptr[0] *= bscale; - - /* Filter rightwards */ - for (x = 1; x < width; x++) - ptr[x] += nu * ptr[x - 1]; - ptr[x = width - 1] *= bscale; - - /* Filter leftwards */ - for (; x > 0; x--) - ptr[x - 1] += nu * ptr[x]; - } - } -} - static int filter_horizontally(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) { GBlurContext *s = ctx->priv; @@ -108,53 +78,6 @@ static int filter_horizontally(AVFilterContext *ctx, void *arg, int jobnr, int n return 0; } -static void do_vertical_columns(float *buffer, int width, int height, - int column_begin, int column_end, int steps, - float nu, float boundaryscale, int column_step) -{ - const int numpixels = width * height; - int i, x, k, step; - float *ptr; - for (x = column_begin; x < column_end;) { - for (step = 0; step < steps; step++) { - ptr = buffer + x; - for (k = 0; k < column_step; k++) { - ptr[k] *= boundaryscale; - } - /* Filter downwards */ - for (i = width; i < numpixels; i += width) { - for (k = 0; k < column_step; k++) { - ptr[i + k] += nu * ptr[i - width + k]; - } - } - i = numpixels - width; - - for (k = 0; k < column_step; k++) - ptr[i + k] *= boundaryscale; - - /* Filter upwards */ - for (; i > 0; i -= width) { - for (k = 0; k < column_step; k++) - ptr[i - width + k] += nu * ptr[i + k]; - } - } - x += column_step; - } -} - -static void verti_slice_c(float *buffer, int width, int height, - int slice_start, int slice_end, int steps, - float nu, float boundaryscale) -{ - int aligned_end = slice_start + (((slice_end - slice_start) >> 3) << 3); - /* Filter vertically along columns (process 8 columns in each step) */ - do_vertical_columns(buffer, width, height, slice_start, aligned_end, - steps, nu, boundaryscale, 8); - /* Filter un-aligned columns one by one */ - do_vertical_columns(buffer, width, height, aligned_end, slice_end, - steps, nu, boundaryscale, 1); -} - static int filter_vertically(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) { GBlurContext *s = ctx->priv; @@ -239,16 +162,6 @@ static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_NONE }; -void ff_gblur_init(GBlurContext *s) -{ - s->localbuf = NULL; - s->horiz_slice = horiz_slice_c; - s->verti_slice = verti_slice_c; - s->postscale_slice = postscale_c; - if (ARCH_X86) - ff_gblur_init_x86(s); -} - static av_cold void uninit(AVFilterContext *ctx) { GBlurContext *s = ctx->priv; diff --git a/libavfilter/vf_gblur_init.h b/libavfilter/vf_gblur_init.h new file mode 100644 index 0000000000..0fee64bc98 --- /dev/null +++ b/libavfilter/vf_gblur_init.h @@ -0,0 +1,122 @@ +/* + * Copyright (c) 2011 Pascal Getreuer + * Copyright (c) 2016 Paul B Mahol + * + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials provided + * with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * HOLDER BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef AVFILTER_GBLUR_INIT_H +#define AVFILTER_GBLUR_INIT_H + +#include "config.h" +#include "libavutil/attributes.h" +#include "libavutil/common.h" +#include "gblur.h" + +static void postscale_c(float *buffer, int length, + float postscale, float min, float max) +{ + for (int i = 0; i < length; i++) { + buffer[i] *= postscale; + buffer[i] = av_clipf(buffer[i], min, max); + } +} + +static void horiz_slice_c(float *buffer, int width, int height, int steps, + float nu, float bscale, float *localbuf) +{ + int x; + for (int y = 0; y < height; y++) { + for (int step = 0; step < steps; step++) { + float *ptr = buffer + width * y; + ptr[0] *= bscale; + + /* Filter rightwards */ + for (x = 1; x < width; x++) + ptr[x] += nu * ptr[x - 1]; + ptr[x = width - 1] *= bscale; + + /* Filter leftwards */ + for (; x > 0; x--) + ptr[x - 1] += nu * ptr[x]; + } + } +} + +static void do_vertical_columns(float *buffer, int width, int height, + int column_begin, int column_end, int steps, + float nu, float boundaryscale, int column_step) +{ + const int numpixels = width * height; + int i; + for (int x = column_begin; x < column_end;) { + for (int step = 0; step < steps; step++) { + float *ptr = buffer + x; + for (int k = 0; k < column_step; k++) { + ptr[k] *= boundaryscale; + } + /* Filter downwards */ + for (i = width; i < numpixels; i += width) { + for (int k = 0; k < column_step; k++) { + ptr[i + k] += nu * ptr[i - width + k]; + } + } + i = numpixels - width; + + for (int k = 0; k < column_step; k++) + ptr[i + k] *= boundaryscale; + + /* Filter upwards */ + for (; i > 0; i -= width) { + for (int k = 0; k < column_step; k++) + ptr[i - width + k] += nu * ptr[i + k]; + } + } + x += column_step; + } +} + +static void verti_slice_c(float *buffer, int width, int height, + int slice_start, int slice_end, int steps, + float nu, float boundaryscale) +{ + int aligned_end = slice_start + (((slice_end - slice_start) >> 3) << 3); + /* Filter vertically along columns (process 8 columns in each step) */ + do_vertical_columns(buffer, width, height, slice_start, aligned_end, + steps, nu, boundaryscale, 8); + /* Filter un-aligned columns one by one */ + do_vertical_columns(buffer, width, height, aligned_end, slice_end, + steps, nu, boundaryscale, 1); +} + +static av_unused void ff_gblur_init(GBlurContext *s) +{ + s->localbuf = NULL; + s->horiz_slice = horiz_slice_c; + s->verti_slice = verti_slice_c; + s->postscale_slice = postscale_c; + if (ARCH_X86) + ff_gblur_init_x86(s); +} + +#endif /* AVFILTER_GBLUR_INIT_H */ diff --git a/tests/checkasm/vf_gblur.c b/tests/checkasm/vf_gblur.c index a7a1c1a24e..3686a6c9f6 100644 --- a/tests/checkasm/vf_gblur.c +++ b/tests/checkasm/vf_gblur.c @@ -19,7 +19,7 @@ #include #include #include "checkasm.h" -#include "libavfilter/gblur.h" +#include "libavfilter/vf_gblur_init.h" #define WIDTH 256 #define HEIGHT 256