har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avfilter/vf_atadenoise: add sigma options

Browse Source
This commit is contained in:
Paul B Mahol 2021-01-21 18:48:27 +01:00
parent ee1d1c4b37
commit 95183d25e8
4 changed files with 162 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
doc/filters.texi
View File

@ -7096,6 +7096,15 @@ Alternatively can be set to @code{s} serial.
Parallel can be faster then serial, while other way around is never true. 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 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 below thresholds. will continue processing other side of frames if they are equal or below thresholds.
@item 0s
@item 1s
@item 2s
Set sigma for 1st plane, 2nd plane or 3rd plane. Default is 32767.
Valid range is from 0 to 32767.
This options controls weight for each pixel in radius defined by size.
Default value means every pixel have same weight.
Setting this option to 0 effectively disables filtering.
@end table @end table
@subsection Commands @subsection Commands

6
libavfilter/atadenoise.h
View File

@ -31,12 +31,12 @@ enum ATAAlgorithm {
}; };
typedef struct ATADenoiseDSPContext { typedef struct ATADenoiseDSPContext {
void (*filter_row)(const uint8_t *src, uint8_t *dst, void (*filter_row[4])(const uint8_t *src, uint8_t *dst,
const uint8_t **srcf, const uint8_t **srcf,
int w, int mid, int size, int w, int mid, int size,
int thra, int thrb); int thra, int thrb, const float *weight);
} ATADenoiseDSPContext; } ATADenoiseDSPContext;
void ff_atadenoise_init_x86(ATADenoiseDSPContext *dsp, int depth, int algorithm); void ff_atadenoise_init_x86(ATADenoiseDSPContext *dsp, int depth, int algorithm, const float *sigma);
#endif /* AVFILTER_ATADENOISE_H */ #endif /* AVFILTER_ATADENOISE_H */

148
libavfilter/vf_atadenoise.c
View File

@ -44,6 +44,7 @@ typedef struct ATADenoiseContext {
const AVClass *class; const AVClass *class;
float fthra[4], fthrb[4]; float fthra[4], fthrb[4];
float sigma[4];
int thra[4], thrb[4]; int thra[4], thrb[4];
int algorithm; int algorithm;
@ -55,7 +56,8 @@ typedef struct ATADenoiseContext {
struct FFBufQueue q; struct FFBufQueue q;
void *data[4][SIZE]; void *data[4][SIZE];
int linesize[4][SIZE]; int linesize[4][SIZE];
int size, mid; float weights[4][SIZE];
int size, mid, radius;
int available; int available;
int (*filter_slice)(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs); int (*filter_slice)(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs);
@ -79,6 +81,9 @@ static const AVOption atadenoise_options[] = {
{ "a", "set variant of algorithm", OFFSET(algorithm),AV_OPT_TYPE_INT, {.i64=PARALLEL}, 0, NB_ATAA-1, FLAGS, "a" }, { "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" }, { "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" }, { "s", "serial", 0, AV_OPT_TYPE_CONST, {.i64=SERIAL}, 0, 0, FLAGS, "a" },
{ "0s", "set sigma for 1st plane", OFFSET(sigma[0]), AV_OPT_TYPE_FLOAT, {.dbl=INT16_MAX}, 0, INT16_MAX, FLAGS },
{ "1s", "set sigma for 2nd plane", OFFSET(sigma[1]), AV_OPT_TYPE_FLOAT, {.dbl=INT16_MAX}, 0, INT16_MAX, FLAGS },
{ "2s", "set sigma for 3rd plane", OFFSET(sigma[2]), AV_OPT_TYPE_FLOAT, {.dbl=INT16_MAX}, 0, INT16_MAX, FLAGS },
{ NULL } { NULL }
}; };
@ -129,7 +134,8 @@ static av_cold int init(AVFilterContext *ctx)
av_log(ctx, AV_LOG_WARNING, "size %d is invalid. Must be an odd value, setting it to %d.\n", s->size, s->size|1); av_log(ctx, AV_LOG_WARNING, "size %d is invalid. Must be an odd value, setting it to %d.\n", s->size, s->size|1);
s->size |= 1; s->size |= 1;
} }
s->mid = s->size / 2 + 1; s->radius = s->size / 2;
s->mid = s->radius + 1;
return 0; return 0;
} }
@ -138,11 +144,114 @@ typedef struct ThreadData {
AVFrame *in, *out; AVFrame *in, *out;
} ThreadData; } ThreadData;
#define WFILTER_ROW(type, name) \
static void fweight_row##name(const uint8_t *ssrc, uint8_t *ddst, \
const uint8_t *ssrcf[SIZE], \
int w, int mid, int size, \
int thra, int thrb, const float *weights) \
{ \
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; \
float sum = srcx; \
float wsum = 1.f; \
int l = 0, r = 0; \
int srcjx, srcix; \
\
for (int j = mid - 1, i = mid + 1; j >= 0 && i < size; j--, i++) { \
srcjx = srcf[j][x]; \
\
ldiff = FFABS(srcx - srcjx); \
lsumdiff += ldiff; \
if (ldiff > thra || \
lsumdiff > thrb) \
break; \
l++; \
sum += srcjx * weights[j]; \
wsum += weights[j]; \
\
srcix = srcf[i][x]; \
\
rdiff = FFABS(srcx - srcix); \
rsumdiff += rdiff; \
if (rdiff > thra || \
rsumdiff > thrb) \
break; \
r++; \
sum += srcix * weights[i]; \
wsum += weights[i]; \
} \
\
dst[x] = lrintf(sum / wsum); \
} \
}
WFILTER_ROW(uint8_t, 8)
WFILTER_ROW(uint16_t, 16)
#define WFILTER_ROW_SERIAL(type, name) \
static void fweight_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 float *weights) \
{ \
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; \
float sum = srcx; \
float wsum = 1.f; \
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 * weights[j]; \
wsum += weights[j]; \
} \
\
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 * weights[i]; \
wsum += weights[i]; \
} \
\
dst[x] = lrintf(sum / wsum); \
} \
}
WFILTER_ROW_SERIAL(uint8_t, 8)
WFILTER_ROW_SERIAL(uint16_t, 16)
#define FILTER_ROW(type, name) \ #define FILTER_ROW(type, name) \
static void filter_row##name(const uint8_t *ssrc, uint8_t *ddst, \ static void filter_row##name(const uint8_t *ssrc, uint8_t *ddst, \
const uint8_t *ssrcf[SIZE], \ const uint8_t *ssrcf[SIZE], \
int w, int mid, int size, \ int w, int mid, int size, \
int thra, int thrb) \ int thra, int thrb, const float *weights) \
{ \ { \
const type *src = (const type *)ssrc; \ const type *src = (const type *)ssrc; \
const type **srcf = (const type **)ssrcf; \ const type **srcf = (const type **)ssrcf; \
@ -189,7 +298,8 @@ FILTER_ROW(uint16_t, 16)
static void filter_row##name##_serial(const uint8_t *ssrc, uint8_t *ddst, \ static void filter_row##name##_serial(const uint8_t *ssrc, uint8_t *ddst, \
const uint8_t *ssrcf[SIZE], \ const uint8_t *ssrcf[SIZE], \
int w, int mid, int size, \ int w, int mid, int size, \
int thra, int thrb) \ int thra, int thrb, \
const float *weights) \
{ \ { \
const type *src = (const type *)ssrc; \ const type *src = (const type *)ssrc; \
const type **srcf = (const type **)ssrcf; \ const type **srcf = (const type **)ssrcf; \
@ -245,6 +355,7 @@ static int filter_slice(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
int p, y, i; int p, y, i;
for (p = 0; p < s->nb_planes; p++) { for (p = 0; p < s->nb_planes; p++) {
const float *weights = s->weights[p];
const int h = s->planeheight[p]; const int h = s->planeheight[p];
const int w = s->planewidth[p]; const int w = s->planewidth[p];
const int slice_start = (h * jobnr) / nb_jobs; const int slice_start = (h * jobnr) / nb_jobs;
@ -267,7 +378,7 @@ static int filter_slice(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
srcf[i] = data[i] + slice_start * linesize[i]; srcf[i] = data[i] + slice_start * linesize[i];
for (y = slice_start; y < slice_end; y++) { for (y = slice_start; y < slice_end; y++) {
s->dsp.filter_row(src, dst, srcf, w, mid, size, thra, thrb); s->dsp.filter_row[p](src, dst, srcf, w, mid, size, thra, thrb, weights);
dst += out->linesize[p]; dst += out->linesize[p];
src += in->linesize[p]; src += in->linesize[p];
@ -296,10 +407,17 @@ 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)
s->dsp.filter_row = s->algorithm == PARALLEL ? filter_row8 : filter_row8_serial; for (int p = 0; p < s->nb_planes; p++) {
else if (depth == 8 && s->sigma[p] == INT16_MAX)
s->dsp.filter_row = s->algorithm == PARALLEL ? filter_row16 : filter_row16_serial; s->dsp.filter_row[p] = s->algorithm == PARALLEL ? filter_row8 : filter_row8_serial;
else if (s->sigma[p] == INT16_MAX)
s->dsp.filter_row[p] = s->algorithm == PARALLEL ? filter_row16 : filter_row16_serial;
else if (depth == 8 && s->sigma[p] < INT16_MAX)
s->dsp.filter_row[p] = s->algorithm == PARALLEL ? fweight_row8 : fweight_row8_serial;
else if (s->sigma[p] < INT16_MAX)
s->dsp.filter_row[p] = s->algorithm == PARALLEL ? fweight_row16 : fweight_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;
@ -308,8 +426,18 @@ static int config_input(AVFilterLink *inlink)
s->thrb[1] = s->fthrb[1] * (1 << depth) - 1; s->thrb[1] = s->fthrb[1] * (1 << depth) - 1;
s->thrb[2] = s->fthrb[2] * (1 << depth) - 1; s->thrb[2] = s->fthrb[2] * (1 << depth) - 1;
for (int p = 0; p < s->nb_planes; p++) {
float sigma = s->radius * s->sigma[p];
s->weights[p][s->mid] = 1.f;
for (int n = 1; n <= s->radius; n++) {
s->weights[p][s->radius + n] =
s->weights[p][s->radius - n] = expf(-0.5 * (n + 1) * (n + 1) / (sigma * sigma));
}
}
if (ARCH_X86) if (ARCH_X86)
ff_atadenoise_init_x86(&s->dsp, depth, s->algorithm); ff_atadenoise_init_x86(&s->dsp, depth, s->algorithm, s->sigma);
return 0; return 0;
} }

16
libavfilter/x86/vf_atadenoise_init.c
View File

@ -28,22 +28,24 @@
void ff_atadenoise_filter_row8_sse4(const uint8_t *src, uint8_t *dst, void ff_atadenoise_filter_row8_sse4(const uint8_t *src, uint8_t *dst,
const uint8_t **srcf, const uint8_t **srcf,
int w, int mid, int size, int w, int mid, int size,
int thra, int thrb); int thra, int thrb, const float *weights);
void ff_atadenoise_filter_row8_serial_sse4(const uint8_t *src, uint8_t *dst, void ff_atadenoise_filter_row8_serial_sse4(const uint8_t *src, uint8_t *dst,
const uint8_t **srcf, const uint8_t **srcf,
int w, int mid, int size, int w, int mid, int size,
int thra, int thrb); int thra, int thrb, const float *weights);
av_cold void ff_atadenoise_init_x86(ATADenoiseDSPContext *dsp, int depth, int algorithm) av_cold void ff_atadenoise_init_x86(ATADenoiseDSPContext *dsp, int depth, int algorithm, const float *sigma)
{ {
int cpu_flags = av_get_cpu_flags(); int cpu_flags = av_get_cpu_flags();
if (ARCH_X86_64 && EXTERNAL_SSE4(cpu_flags) && depth <= 8 && algorithm == PARALLEL) { for (int p = 0; p < 4; p++) {
dsp->filter_row = ff_atadenoise_filter_row8_sse4; if (ARCH_X86_64 && EXTERNAL_SSE4(cpu_flags) && depth <= 8 && algorithm == PARALLEL && sigma[p] == INT16_MAX) {
dsp->filter_row[p] = ff_atadenoise_filter_row8_sse4;
} }
if (ARCH_X86_64 && EXTERNAL_SSE4(cpu_flags) && depth <= 8 && algorithm == SERIAL) { if (ARCH_X86_64 && EXTERNAL_SSE4(cpu_flags) && depth <= 8 && algorithm == SERIAL && sigma[p] == INT16_MAX) {
dsp->filter_row = ff_atadenoise_filter_row8_serial_sse4; dsp->filter_row[p] = ff_atadenoise_filter_row8_serial_sse4;
}
} }
} }