History

avfilter/vf_atadenoise: add sigma options

Paul B Mahol committed 5 years ago

Commit 95183d21 parent ee1d1c44 files · +162 −23Browse files

Showing the changes to libavfilter (3 of 4 files). Show all

Unified · Split

3 files
  1. libavfilter/atadenoise.h +5 −5
  2. libavfilter/vf_atadenoise.c +138 −10
  3. libavfilter/x86/vf_atadenoise_init.c +10 −8
libavfilter/atadenoise.h+5−5
@@ -31,12 +31,12 @@ enum ATAAlgorithm { · 30 unmodified lines
31};31};
32 32
33typedef struct ATADenoiseDSPContext {33typedef struct ATADenoiseDSPContext {
34 void (*filter_row)(const uint8_t *src, uint8_t *dst,34 void (*filter_row[4])(const uint8_t *src, uint8_t *dst,
35 const uint8_t **srcf,35 const uint8_t **srcf,
36 int w, int mid, int size,36 int w, int mid, int size,
37 int thra, int thrb);37 int thra, int thrb, const float *weight);
38} ATADenoiseDSPContext;38} ATADenoiseDSPContext;
39 39
40void ff_atadenoise_init_x86(ATADenoiseDSPContext *dsp, int depth, int algorithm);40void ff_atadenoise_init_x86(ATADenoiseDSPContext *dsp, int depth, int algorithm, const float *sigma);
41 41
42#endif /* AVFILTER_ATADENOISE_H */42#endif /* AVFILTER_ATADENOISE_H */
libavfilter/vf_atadenoise.c+138−10
@@ -44,6 +44,7 @@ typedef struct ATADenoiseContext { · 43 unmodified lines
44 const AVClass *class;44 const AVClass *class;
45 45
46 float fthra[4], fthrb[4];46 float fthra[4], fthrb[4];
47 float sigma[4];
47 int thra[4], thrb[4];48 int thra[4], thrb[4];
48 int algorithm;49 int algorithm;
49 50
@@ -55,7 +56,8 @@ typedef struct ATADenoiseContext { · 5 unmodified lines
55 struct FFBufQueue q;56 struct FFBufQueue q;
56 void *data[4][SIZE];57 void *data[4][SIZE];
57 int linesize[4][SIZE];58 int linesize[4][SIZE];
58 int size, mid;59 float weights[4][SIZE];
60 int size, mid, radius;
59 int available;61 int available;
60 62
61 int (*filter_slice)(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs);63 int (*filter_slice)(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs);
@@ -79,6 +81,9 @@ static const AVOption atadenoise_options[] = { · 17 unmodified lines
79 { "a", "set variant of algorithm", OFFSET(algorithm),AV_OPT_TYPE_INT, {.i64=PARALLEL}, 0, NB_ATAA-1, FLAGS, "a" },81 { "a", "set variant of algorithm", OFFSET(algorithm),AV_OPT_TYPE_INT, {.i64=PARALLEL}, 0, NB_ATAA-1, FLAGS, "a" },
80 { "p", "parallel", 0, AV_OPT_TYPE_CONST, {.i64=PARALLEL}, 0, 0, FLAGS, "a" },82 { "p", "parallel", 0, AV_OPT_TYPE_CONST, {.i64=PARALLEL}, 0, 0, FLAGS, "a" },
81 { "s", "serial", 0, AV_OPT_TYPE_CONST, {.i64=SERIAL}, 0, 0, FLAGS, "a" },83 { "s", "serial", 0, AV_OPT_TYPE_CONST, {.i64=SERIAL}, 0, 0, FLAGS, "a" },
84 { "0s", "set sigma for 1st plane", OFFSET(sigma[0]), AV_OPT_TYPE_FLOAT, {.dbl=INT16_MAX}, 0, INT16_MAX, FLAGS },
85 { "1s", "set sigma for 2nd plane", OFFSET(sigma[1]), AV_OPT_TYPE_FLOAT, {.dbl=INT16_MAX}, 0, INT16_MAX, FLAGS },
86 { "2s", "set sigma for 3rd plane", OFFSET(sigma[2]), AV_OPT_TYPE_FLOAT, {.dbl=INT16_MAX}, 0, INT16_MAX, FLAGS },
82 { NULL }87 { NULL }
83};88};
84 89
@@ -129,7 +134,8 @@ static av_cold int init(AVFilterContext *ctx) · 44 unmodified lines
129 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);134 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);
130 s->size |= 1;135 s->size |= 1;
131 }136 }
132 s->mid = s->size / 2 + 1;137 s->radius = s->size / 2;
138 s->mid = s->radius + 1;
133 139
134 return 0;140 return 0;
135}141}
@@ -138,11 +144,114 @@ typedef struct ThreadData { · 2 unmodified lines
138 AVFrame *in, *out;144 AVFrame *in, *out;
139} ThreadData;145} ThreadData;
140 146
147#define WFILTER_ROW(type, name) \
148static void fweight_row##name(const uint8_t *ssrc, uint8_t *ddst, \
149 const uint8_t *ssrcf[SIZE], \
150 int w, int mid, int size, \
151 int thra, int thrb, const float *weights) \
152{ \
153 const type *src = (const type *)ssrc; \
154 const type **srcf = (const type **)ssrcf; \
155 type *dst = (type *)ddst; \
156 \
157 for (int x = 0; x < w; x++) { \
158 const int srcx = src[x]; \
159 unsigned lsumdiff = 0, rsumdiff = 0; \
160 unsigned ldiff, rdiff; \
161 float sum = srcx; \
162 float wsum = 1.f; \
163 int l = 0, r = 0; \
164 int srcjx, srcix; \
165 \
166 for (int j = mid - 1, i = mid + 1; j >= 0 && i < size; j--, i++) { \
167 srcjx = srcf[j][x]; \
168 \
169 ldiff = FFABS(srcx - srcjx); \
170 lsumdiff += ldiff; \
171 if (ldiff > thra || \
172 lsumdiff > thrb) \
173 break; \
174 l++; \
175 sum += srcjx * weights[j]; \
176 wsum += weights[j]; \
177 \
178 srcix = srcf[i][x]; \
179 \
180 rdiff = FFABS(srcx - srcix); \
181 rsumdiff += rdiff; \
182 if (rdiff > thra || \
183 rsumdiff > thrb) \
184 break; \
185 r++; \
186 sum += srcix * weights[i]; \
187 wsum += weights[i]; \
188 } \
189 \
190 dst[x] = lrintf(sum / wsum); \
191 } \
192}
193
194WFILTER_ROW(uint8_t, 8)
195WFILTER_ROW(uint16_t, 16)
196
197#define WFILTER_ROW_SERIAL(type, name) \
198static void fweight_row##name##_serial(const uint8_t *ssrc, uint8_t *ddst, \
199 const uint8_t *ssrcf[SIZE], \
200 int w, int mid, int size, \
201 int thra, int thrb, \
202 const float *weights) \
203{ \
204 const type *src = (const type *)ssrc; \
205 const type **srcf = (const type **)ssrcf; \
206 type *dst = (type *)ddst; \
207 \
208 for (int x = 0; x < w; x++) { \
209 const int srcx = src[x]; \
210 unsigned lsumdiff = 0, rsumdiff = 0; \
211 unsigned ldiff, rdiff; \
212 float sum = srcx; \
213 float wsum = 1.f; \
214 int l = 0, r = 0; \
215 int srcjx, srcix; \
216 \
217 for (int j = mid - 1; j >= 0; j--) { \
218 srcjx = srcf[j][x]; \
219 \
220 ldiff = FFABS(srcx - srcjx); \
221 lsumdiff += ldiff; \
222 if (ldiff > thra || \
223 lsumdiff > thrb) \
224 break; \
225 l++; \
226 sum += srcjx * weights[j]; \
227 wsum += weights[j]; \
228 } \
229 \
230 for (int i = mid + 1; i < size; i++) { \
231 srcix = srcf[i][x]; \
232 \
233 rdiff = FFABS(srcx - srcix); \
234 rsumdiff += rdiff; \
235 if (rdiff > thra || \
236 rsumdiff > thrb) \
237 break; \
238 r++; \
239 sum += srcix * weights[i]; \
240 wsum += weights[i]; \
241 } \
242 \
243 dst[x] = lrintf(sum / wsum); \
244 } \
245}
246
247WFILTER_ROW_SERIAL(uint8_t, 8)
248WFILTER_ROW_SERIAL(uint16_t, 16)
249
141#define FILTER_ROW(type, name) \250#define FILTER_ROW(type, name) \
142static void filter_row##name(const uint8_t *ssrc, uint8_t *ddst, \251static void filter_row##name(const uint8_t *ssrc, uint8_t *ddst, \
143 const uint8_t *ssrcf[SIZE], \252 const uint8_t *ssrcf[SIZE], \
144 int w, int mid, int size, \253 int w, int mid, int size, \
145 int thra, int thrb) \254 int thra, int thrb, const float *weights) \
146{ \255{ \
147 const type *src = (const type *)ssrc; \256 const type *src = (const type *)ssrc; \
148 const type **srcf = (const type **)ssrcf; \257 const type **srcf = (const type **)ssrcf; \
@@ -189,7 +298,8 @@ FILTER_ROW(uint16_t, 16) · 40 unmodified lines
189static void filter_row##name##_serial(const uint8_t *ssrc, uint8_t *ddst, \298static void filter_row##name##_serial(const uint8_t *ssrc, uint8_t *ddst, \
190 const uint8_t *ssrcf[SIZE], \299 const uint8_t *ssrcf[SIZE], \
191 int w, int mid, int size, \300 int w, int mid, int size, \
192 int thra, int thrb) \301 int thra, int thrb, \
302 const float *weights) \
193{ \303{ \
194 const type *src = (const type *)ssrc; \304 const type *src = (const type *)ssrc; \
195 const type **srcf = (const type **)ssrcf; \305 const type **srcf = (const type **)ssrcf; \
@@ -245,6 +355,7 @@ static int filter_slice(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) · 49 unmodified lines
245 int p, y, i;355 int p, y, i;
246 356
247 for (p = 0; p < s->nb_planes; p++) {357 for (p = 0; p < s->nb_planes; p++) {
358 const float *weights = s->weights[p];
248 const int h = s->planeheight[p];359 const int h = s->planeheight[p];
249 const int w = s->planewidth[p];360 const int w = s->planewidth[p];
250 const int slice_start = (h * jobnr) / nb_jobs;361 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) · 16 unmodified lines
267 srcf[i] = data[i] + slice_start * linesize[i];378 srcf[i] = data[i] + slice_start * linesize[i];
268 379
269 for (y = slice_start; y < slice_end; y++) {380 for (y = slice_start; y < slice_end; y++) {
270 s->dsp.filter_row(src, dst, srcf, w, mid, size, thra, thrb);381 s->dsp.filter_row[p](src, dst, srcf, w, mid, size, thra, thrb, weights);
271 382
272 dst += out->linesize[p];383 dst += out->linesize[p];
273 src += in->linesize[p];384 src += in->linesize[p];
@@ -296,10 +407,17 @@ static int config_input(AVFilterLink *inlink) · 22 unmodified lines
296 407
297 depth = desc->comp[0].depth;408 depth = desc->comp[0].depth;
298 s->filter_slice = filter_slice;409 s->filter_slice = filter_slice;
299 if (depth == 8)410
300 s->dsp.filter_row = s->algorithm == PARALLEL ? filter_row8 : filter_row8_serial;411 for (int p = 0; p < s->nb_planes; p++) {
301 else412 if (depth == 8 && s->sigma[p] == INT16_MAX)
302 s->dsp.filter_row = s->algorithm == PARALLEL ? filter_row16 : filter_row16_serial;413 s->dsp.filter_row[p] = s->algorithm == PARALLEL ? filter_row8 : filter_row8_serial;
414 else if (s->sigma[p] == INT16_MAX)
415 s->dsp.filter_row[p] = s->algorithm == PARALLEL ? filter_row16 : filter_row16_serial;
416 else if (depth == 8 && s->sigma[p] < INT16_MAX)
417 s->dsp.filter_row[p] = s->algorithm == PARALLEL ? fweight_row8 : fweight_row8_serial;
418 else if (s->sigma[p] < INT16_MAX)
419 s->dsp.filter_row[p] = s->algorithm == PARALLEL ? fweight_row16 : fweight_row16_serial;
420 }
303 421
304 s->thra[0] = s->fthra[0] * (1 << depth) - 1;422 s->thra[0] = s->fthra[0] * (1 << depth) - 1;
305 s->thra[1] = s->fthra[1] * (1 << depth) - 1;423 s->thra[1] = s->fthra[1] * (1 << depth) - 1;
@@ -308,8 +426,18 @@ static int config_input(AVFilterLink *inlink) · 2 unmodified lines
308 s->thrb[1] = s->fthrb[1] * (1 << depth) - 1;426 s->thrb[1] = s->fthrb[1] * (1 << depth) - 1;
309 s->thrb[2] = s->fthrb[2] * (1 << depth) - 1;427 s->thrb[2] = s->fthrb[2] * (1 << depth) - 1;
310 428
429 for (int p = 0; p < s->nb_planes; p++) {
430 float sigma = s->radius * s->sigma[p];
431
432 s->weights[p][s->mid] = 1.f;
433 for (int n = 1; n <= s->radius; n++) {
434 s->weights[p][s->radius + n] =
435 s->weights[p][s->radius - n] = expf(-0.5 * (n + 1) * (n + 1) / (sigma * sigma));
436 }
437 }
438
311 if (ARCH_X86)439 if (ARCH_X86)
312 ff_atadenoise_init_x86(&s->dsp, depth, s->algorithm);440 ff_atadenoise_init_x86(&s->dsp, depth, s->algorithm, s->sigma);
313 441
314 return 0;442 return 0;
315}443}
libavfilter/x86/vf_atadenoise_init.c+10−8
@@ -28,22 +28,24 @@ · 27 unmodified lines
28void ff_atadenoise_filter_row8_sse4(const uint8_t *src, uint8_t *dst,28void ff_atadenoise_filter_row8_sse4(const uint8_t *src, uint8_t *dst,
29 const uint8_t **srcf,29 const uint8_t **srcf,
30 int w, int mid, int size,30 int w, int mid, int size,
31 int thra, int thrb);31 int thra, int thrb, const float *weights);
32 32
33void ff_atadenoise_filter_row8_serial_sse4(const uint8_t *src, uint8_t *dst,33void ff_atadenoise_filter_row8_serial_sse4(const uint8_t *src, uint8_t *dst,
34 const uint8_t **srcf,34 const uint8_t **srcf,
35 int w, int mid, int size,35 int w, int mid, int size,
36 int thra, int thrb);36 int thra, int thrb, const float *weights);
37 37
38av_cold void ff_atadenoise_init_x86(ATADenoiseDSPContext *dsp, int depth, int algorithm)38av_cold void ff_atadenoise_init_x86(ATADenoiseDSPContext *dsp, int depth, int algorithm, const float *sigma)
39{39{
40 int cpu_flags = av_get_cpu_flags();40 int cpu_flags = av_get_cpu_flags();
41 41
42 if (ARCH_X86_64 && EXTERNAL_SSE4(cpu_flags) && depth <= 8 && algorithm == PARALLEL) {42 for (int p = 0; p < 4; p++) {
43 dsp->filter_row = ff_atadenoise_filter_row8_sse4;43 if (ARCH_X86_64 && EXTERNAL_SSE4(cpu_flags) && depth <= 8 && algorithm == PARALLEL && sigma[p] == INT16_MAX) {
44 }44 dsp->filter_row[p] = ff_atadenoise_filter_row8_sse4;
45 }
45 46
46 if (ARCH_X86_64 && EXTERNAL_SSE4(cpu_flags) && depth <= 8 && algorithm == SERIAL) {47 if (ARCH_X86_64 && EXTERNAL_SSE4(cpu_flags) && depth <= 8 && algorithm == SERIAL && sigma[p] == INT16_MAX) {
47 dsp->filter_row = ff_atadenoise_filter_row8_serial_sse4;48 dsp->filter_row[p] = ff_atadenoise_filter_row8_serial_sse4;
49 }
48 }50 }
49}51}

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t