History

avfilter/vf_nnedi: small improvements

Paul B Mahol committed 5 years ago

Commit 1dc71cf1 parent 2021dbe1 file · +13 −8Browse files

Showing the changes to libavfilter (1 of 1 file). Show all

Unified · Split

libavfilter/vf_nnedi.c+13−8
@@ -21,6 +21,7 @@ · 20 unmodified lines
2121
2222 #include <float.h>
2323
24+#include "libavutil/avassert.h"
2425 #include "libavutil/common.h"
2526 #include "libavutil/float_dsp.h"
2627 #include "libavutil/imgutils.h"
@@ -217,11 +218,13 @@ static int query_formats(AVFilterContext *ctx) · 190 unmodified lines
217218 static float dot_dsp(const NNEDIContext *const s, const float *kernel, const float *input,
218219 int n, float scale, float bias)
219220 {
220− float sum;
221+ float sum, y;
221222
222223 sum = s->fdsp->scalarproduct_float(kernel, input, n);
223224
224− return sum * scale + bias;
225+ y = sum * scale + bias + 1e-20f;
226+
227+ return y;
225228 }
226229
227230 static float elliott(float x)
@@ -334,6 +337,7 @@ static void gather_input(const float *src, ptrdiff_t src_stride, · 106 unmodified lines
334337 float *buf, float mstd[4],
335338 const PredictorCoefficients *const model)
336339 {
340+ const float scale = 1.f / model->nsize;
337341 float sum = 0.f;
338342 float sum_sq = 0.f;
339343 float tmp;
@@ -352,10 +356,10 @@ static void gather_input(const float *src, ptrdiff_t src_stride, · 12 unmodified lines
352356 buf += model->xdim;
353357 }
354358
355− mstd[0] = sum / model->nsize;
359+ mstd[0] = sum * scale;
356360 mstd[3] = 0.f;
357361
358− tmp = sum_sq / model->nsize - mstd[0] * mstd[0];
362+ tmp = sum_sq * scale - mstd[0] * mstd[0];
359363 if (tmp < FLT_EPSILON) {
360364 mstd[1] = 0.0f;
361365 mstd[2] = 0.0f;
@@ -945,8 +949,9 @@ static void subtract_mean_new(PrescreenerCoefficients *coeffs, float half) · 583 unmodified lines
945949
946950 static void subtract_mean_predictor(PredictorCoefficients *model)
947951 {
948− int filter_size = model->nsize;
949− int nns = model->nns;
952+ const int filter_size = model->nsize;
953+ const int nns = model->nns;
954+ const float scale = 1.f / nns;
950955
951956 double softmax_means[256]; // Average of individual softmax filters.
952957 double elliott_means[256]; // Average of individual elliott filters.
@@ -963,7 +968,7 @@ static void subtract_mean_predictor(PredictorCoefficients *model) · 10 unmodified lines
963968 }
964969
965970 for (int k = 0; k < filter_size; k++)
966− mean_filter[k] /= nns;
971+ mean_filter[k] *= scale;
967972
968973 mean_bias = mean(model->softmax_bias_q1, nns);
969974
@@ -988,7 +993,7 @@ static void subtract_mean_predictor(PredictorCoefficients *model) · 18 unmodified lines
988993 }
989994
990995 for (int k = 0; k < filter_size; k++)
991− mean_filter[k] /= nns;
996+ mean_filter[k] *= scale;
992997
993998 mean_bias = mean(model->softmax_bias_q2, nns);
994999

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