RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avfilter/vf_gblur: factor out postscale function

This commit is contained in:
Paul B Mahol 2021-02-13 11:15:22 +01:00
parent d0b6b1f941
commit 058db59e16
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavfilter/gblur.h
View File

@ -50,7 +50,9 @@ typedef struct GBlurContext {
float nuV; float nuV;
int nb_planes; int nb_planes;
void (*horiz_slice)(float *buffer, int width, int height, int steps, float nu, float bscale); void (*horiz_slice)(float *buffer, int width, int height, int steps, float nu, float bscale);
void (*postscale_slice)(float *buffer, int length, float postscale, float min, float max);
} GBlurContext; } GBlurContext;
void ff_gblur_init(GBlurContext *s); void ff_gblur_init(GBlurContext *s);
void ff_gblur_init_x86(GBlurContext *s); void ff_gblur_init_x86(GBlurContext *s);
#endif #endif

23
libavfilter/vf_gblur.c
View File

@ -54,6 +54,15 @@ typedef struct ThreadData {
int width; int width;
} ThreadData; } 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, static void horiz_slice_c(float *buffer, int width, int height, int steps,
float nu, float bscale) float nu, float bscale)
{ {
@ -154,7 +163,6 @@ static int filter_vertically(AVFilterContext *ctx, void *arg, int jobnr, int nb_
return 0; return 0;
} }
static int filter_postscale(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) static int filter_postscale(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
{ {
GBlurContext *s = ctx->priv; GBlurContext *s = ctx->priv;
@ -164,16 +172,12 @@ static int filter_postscale(AVFilterContext *ctx, void *arg, int jobnr, int nb_j
const int height = td->height; const int height = td->height;
const int width = td->width; const int width = td->width;
const int64_t numpixels = width * (int64_t)height; const int64_t numpixels = width * (int64_t)height;
const unsigned slice_start = (numpixels * jobnr ) / nb_jobs; const int slice_start = (numpixels * jobnr ) / nb_jobs;
const unsigned slice_end = (numpixels * (jobnr+1)) / nb_jobs; const int slice_end = (numpixels * (jobnr+1)) / nb_jobs;
const float postscale = s->postscale * s->postscaleV; const float postscale = s->postscale * s->postscaleV;
float *buffer = s->buffer; float *buffer = s->buffer + slice_start;
unsigned i;
for (i = slice_start; i < slice_end; i++) { s->postscale_slice(buffer, slice_end - slice_start, postscale, min, max);
buffer[i] *= postscale;
buffer[i] = av_clipf(buffer[i], min, max);
}
return 0; return 0;
} }
@ -228,6 +232,7 @@ static int query_formats(AVFilterContext *ctx)
void ff_gblur_init(GBlurContext *s) void ff_gblur_init(GBlurContext *s)
{ {
s->horiz_slice = horiz_slice_c; s->horiz_slice = horiz_slice_c;
s->postscale_slice = postscale_c;
if (ARCH_X86_64) if (ARCH_X86_64)
ff_gblur_init_x86(s); ff_gblur_init_x86(s);
} }