[FFmpeg-cvslog] avfilter/vf_gblur: Move ff_gblur_init into a header
Andreas Rheinhardt
git at videolan.org
Fri May 6 06:36:49 EEST 2022
ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Tue May 3 07:19:35 2022 +0200| [24936a9fbb220a7ba4b1f3a80ceeca68f4f5f7d4] | committer: Andreas Rheinhardt
avfilter/vf_gblur: Move ff_gblur_init into a header
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 <andreas.rheinhardt at outlook.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=24936a9fbb220a7ba4b1f3a80ceeca68f4f5f7d4
---
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(-)
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 <float.h>
#include <string.h>
#include "checkasm.h"
-#include "libavfilter/gblur.h"
+#include "libavfilter/vf_gblur_init.h"
#define WIDTH 256
#define HEIGHT 256
More information about the ffmpeg-cvslog
mailing list