@@ -108,6 +108,40 @@ 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 int filter_vertically(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
{
GBlurContext *s = ctx->priv;
@@ -117,31 +151,19 @@ static int filter_vertically(AVFilterContext *ctx, void *arg, int jobnr, int nb_
const int slice_start = (width * jobnr ) / nb_jobs;
const int slice_end = (width * (jobnr+1)) / nb_jobs;
const float boundaryscale = s->boundaryscaleV;
- const int numpixels = width * height;
const int steps = s->steps;
const float nu = s->nuV;
float *buffer = s->buffer;
- int i, x, step;
- float *ptr;
-
- /* Filter vertically along each column */
- for (x = slice_start; x < slice_end; x++) {
- for (step = 0; step < steps; step++) {
- ptr = buffer + x;
- ptr[0] *= boundaryscale;
-
- /* Filter downwards */
- for (i = width; i < numpixels; i += width)
- ptr[i] += nu * ptr[i - width];
-
- ptr[i = numpixels - width] *= boundaryscale;
+ int aligned_end;
- /* Filter upwards */
- for (; i > 0; i -= width)
- ptr[i - width] += nu * ptr[i];
- }
- }
+ 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);
return 0;
}
Instead of doing each column one by one, doing several columns together gives about 30% better performance. Signed-off-by: Ruiling Song <ruiling.song@intel.com> --- below is some of performance numbers(fps) on my i7-6770HQ (decode + gblur): resolution: 480p | 720p | 1080p | 4k without patch: 393 | 146 | 71 | 14 with patch: 502 | 184 | 95 | 18 libavfilter/vf_gblur.c | 62 ++++++++++++++++++++++++++++-------------- 1 file changed, 42 insertions(+), 20 deletions(-)