virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avfilter/vf_atadenoise: add option to use additional algorithm

Browse Source
This commit is contained in:
Paul B Mahol 2019-10-17 20:28:31 +02:00
parent 295d99b439
commit 71e33c6e01
4 changed files with 73 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/filters.texi
View File

@ -6271,6 +6271,14 @@ number in range [5, 129].
@item p @item p
Set what planes of frame filter will use for averaging. Default is all. Set what planes of frame filter will use for averaging. Default is all.
@item a
Set what variant of algorithm filter will use for averaging. Default is @code{p} parallel.
Alternatively can be set to @code{s} serial.
Parallel can be faster then serial, while other way around is never true.
Parallel will abort early on first change being greater then thresholds, while serial
will continue processing other side of frames if they are equal or bellow thresholds.
@end table @end table
@section avgblur @section avgblur

8
libavfilter/atadenoise.h
View File

@ -24,6 +24,12 @@
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>
enum ATAAlgorithm {
PARALLEL,
SERIAL,
NB_ATAA
};
typedef struct ATADenoiseDSPContext { typedef struct ATADenoiseDSPContext {
void (*filter_row)(const uint8_t *src, uint8_t *dst, void (*filter_row)(const uint8_t *src, uint8_t *dst,
const uint8_t **srcf, const uint8_t **srcf,
@ -31,6 +37,6 @@ typedef struct ATADenoiseDSPContext {
int thra, int thrb); int thra, int thrb);
} ATADenoiseDSPContext; } ATADenoiseDSPContext;
void ff_atadenoise_init_x86(ATADenoiseDSPContext *dsp, int depth); void ff_atadenoise_init_x86(ATADenoiseDSPContext *dsp, int depth, int algorithm);
#endif /* AVFILTER_ATADENOISE_H */ #endif /* AVFILTER_ATADENOISE_H */

59
libavfilter/vf_atadenoise.c
View File

@ -45,6 +45,7 @@ typedef struct ATADenoiseContext {
float fthra[4], fthrb[4]; float fthra[4], fthrb[4];
int thra[4], thrb[4]; int thra[4], thrb[4];
int algorithm;
int planes; int planes;
int nb_planes; int nb_planes;
@ -74,6 +75,9 @@ static const AVOption atadenoise_options[] = {
{ "2b", "set threshold B for 3rd plane", OFFSET(fthrb[2]), AV_OPT_TYPE_FLOAT, {.dbl=0.04}, 0, 5.0, FLAGS }, { "2b", "set threshold B for 3rd plane", OFFSET(fthrb[2]), AV_OPT_TYPE_FLOAT, {.dbl=0.04}, 0, 5.0, FLAGS },
{ "s", "set how many frames to use", OFFSET(size), AV_OPT_TYPE_INT, {.i64=9}, 5, SIZE, FLAGS }, { "s", "set how many frames to use", OFFSET(size), AV_OPT_TYPE_INT, {.i64=9}, 5, SIZE, FLAGS },
{ "p", "set what planes to filter", OFFSET(planes), AV_OPT_TYPE_FLAGS, {.i64=7}, 0, 15, FLAGS }, { "p", "set what planes to filter", OFFSET(planes), AV_OPT_TYPE_FLAGS, {.i64=7}, 0, 15, FLAGS },
{ "a", "set variant of algorithm", OFFSET(algorithm),AV_OPT_TYPE_INT, {.i64=PARALLEL}, 0, NB_ATAA-1, FLAGS, "a" },
{ "p", "parallel", 0, AV_OPT_TYPE_CONST, {.i64=PARALLEL}, 0, 0, FLAGS, "a" },
{ "s", "serial", 0, AV_OPT_TYPE_CONST, {.i64=SERIAL}, 0, 0, FLAGS, "a" },
{ NULL } { NULL }
}; };
@ -175,6 +179,55 @@ static void filter_row##name(const uint8_t *ssrc, uint8_t *ddst, \
FILTER_ROW(uint8_t, 8) FILTER_ROW(uint8_t, 8)
FILTER_ROW(uint16_t, 16) FILTER_ROW(uint16_t, 16)
#define FILTER_ROW_SERIAL(type, name) \
static void filter_row##name##_serial(const uint8_t *ssrc, uint8_t *ddst, \
const uint8_t *ssrcf[SIZE], \
int w, int mid, int size, \
int thra, int thrb) \
{ \
const type *src = (const type *)ssrc; \
const type **srcf = (const type **)ssrcf; \
type *dst = (type *)ddst; \
\
for (int x = 0; x < w; x++) { \
const int srcx = src[x]; \
unsigned lsumdiff = 0, rsumdiff = 0; \
unsigned ldiff, rdiff; \
unsigned sum = srcx; \
int l = 0, r = 0; \
int srcjx, srcix; \
\
for (int j = mid - 1; j >= 0; j--) { \
srcjx = srcf[j][x]; \
\
ldiff = FFABS(srcx - srcjx); \
lsumdiff += ldiff; \
if (ldiff > thra || \
lsumdiff > thrb) \
break; \
l++; \
sum += srcjx; \
} \
\
for (int i = mid + 1; i < size; i++) { \
srcix = srcf[i][x]; \
\
rdiff = FFABS(srcx - srcix); \
rsumdiff += rdiff; \
if (rdiff > thra || \
rsumdiff > thrb) \
break; \
r++; \
sum += srcix; \
} \
\
dst[x] = (sum + ((r + l + 1) >> 1)) / (r + l + 1); \
} \
}
FILTER_ROW_SERIAL(uint8_t, 8)
FILTER_ROW_SERIAL(uint16_t, 16)
static int filter_slice(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) static int filter_slice(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
{ {
ATADenoiseContext *s = ctx->priv; ATADenoiseContext *s = ctx->priv;
@ -238,9 +291,9 @@ static int config_input(AVFilterLink *inlink)
depth = desc->comp[0].depth; depth = desc->comp[0].depth;
s->filter_slice = filter_slice; s->filter_slice = filter_slice;
if (depth == 8) if (depth == 8)
s->dsp.filter_row = filter_row8; s->dsp.filter_row = s->algorithm == PARALLEL ? filter_row8 : filter_row8_serial;
else else
s->dsp.filter_row = filter_row16; s->dsp.filter_row = s->algorithm == PARALLEL ? filter_row16 : filter_row16_serial;
s->thra[0] = s->fthra[0] * (1 << depth) - 1; s->thra[0] = s->fthra[0] * (1 << depth) - 1;
s->thra[1] = s->fthra[1] * (1 << depth) - 1; s->thra[1] = s->fthra[1] * (1 << depth) - 1;
@ -250,7 +303,7 @@ static int config_input(AVFilterLink *inlink)
s->thrb[2] = s->fthrb[2] * (1 << depth) - 1; s->thrb[2] = s->fthrb[2] * (1 << depth) - 1;
if (ARCH_X86) if (ARCH_X86)
ff_atadenoise_init_x86(&s->dsp, depth); ff_atadenoise_init_x86(&s->dsp, depth, s->algorithm);
return 0; return 0;
} }

4
libavfilter/x86/vf_atadenoise_init.c
View File

@ -30,11 +30,11 @@ void ff_atadenoise_filter_row8_sse4(const uint8_t *src, uint8_t *dst,
int w, int mid, int size, int w, int mid, int size,
int thra, int thrb); int thra, int thrb);
av_cold void ff_atadenoise_init_x86(ATADenoiseDSPContext *dsp, int depth) av_cold void ff_atadenoise_init_x86(ATADenoiseDSPContext *dsp, int depth, int algorithm)
{ {
int cpu_flags = av_get_cpu_flags(); int cpu_flags = av_get_cpu_flags();
if (ARCH_X86_64 && EXTERNAL_SSE4(cpu_flags) && depth <= 8) { if (ARCH_X86_64 && EXTERNAL_SSE4(cpu_flags) && depth <= 8 && algorithm == PARALLEL) {
dsp->filter_row = ff_atadenoise_filter_row8_sse4; dsp->filter_row = ff_atadenoise_filter_row8_sse4;
} }
} }