History

avfilter/vf_v360: stop using floats in interpolation

Paul B Mahol committed 7 years ago

Commit 32dd4291 parent 28dfa1e1 file · +20 −20Browse files

Unified · Split

libavfilter/vf_v360.c+20−20
@@ -118,7 +118,7 @@ typedef struct V360Context { · 117 unmodified lines
118118 int nb_planes;
119119
120120 uint16_t *u[4], *v[4];
121− float *ker[4];
121+ int16_t *ker[4];
122122
123123 int (*remap_slice)(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs);
124124 } V360Context;
@@ -330,12 +330,12 @@ static int remap##ws##_##bits##bit_slice(AVFilterContext *ctx, void *arg, int jo · 205 unmodified lines
330330 uint##bits##_t *d = dst + y * out_linesize; \
331331 const uint16_t *u = s->u[plane] + y * width * ws * ws; \
332332 const uint16_t *v = s->v[plane] + y * width * ws * ws; \
333− const float *ker = s->ker[plane] + y * width * ws * ws; \
333+ const int16_t *ker = s->ker[plane] + y * width * ws * ws; \
334334 for (x = 0; x < width; x++) { \
335335 const uint16_t *uu = u + x * ws * ws; \
336336 const uint16_t *vv = v + x * ws * ws; \
337− const float *kker = ker + x * ws * ws; \
338− float tmp = 0.f; \
337+ const int16_t *kker = ker + x * ws * ws; \
338+ int tmp = 0; \
339339 \
340340 for (i = 0; i < ws; i++) { \
341341 for (j = 0; j < ws; j++) { \
@@ -343,7 +343,7 @@ static int remap##ws##_##bits##bit_slice(AVFilterContext *ctx, void *arg, int jo · 1 unmodified line
343343 } \
344344 } \
345345 \
346− *d++ = av_clip_uint##bits(roundf(tmp)); \
346+ *d++ = av_clip_uint##bits(tmp >> (15 - ws)); \
347347 } \
348348 } \
349349 } \
@@ -367,7 +367,7 @@ DEFINE_REMAP(4, 16, 2) · 17 unmodified lines
367367 * @param ker ker remap data
368368 */
369369 static void nearest_kernel(float du, float dv, const XYRemap *r_tmp,
370− uint16_t *u, uint16_t *v, float *ker)
370+ uint16_t *u, uint16_t *v, int16_t *ker)
371371 {
372372 const int i = roundf(dv) + 1;
373373 const int j = roundf(du) + 1;
@@ -387,7 +387,7 @@ static void nearest_kernel(float du, float dv, const XYRemap *r_tmp, · 13 unmodified lines
387387 * @param ker ker remap data
388388 */
389389 static void bilinear_kernel(float du, float dv, const XYRemap *r_tmp,
390− uint16_t *u, uint16_t *v, float *ker)
390+ uint16_t *u, uint16_t *v, int16_t *ker)
391391 {
392392 int i, j;
393393
@@ -398,10 +398,10 @@ static void bilinear_kernel(float du, float dv, const XYRemap *r_tmp, · 4 unmodified lines
398398 }
399399 }
400400
401− ker[0] = (1.f - du) * (1.f - dv);
402− ker[1] = du * (1.f - dv);
403− ker[2] = (1.f - du) * dv;
404− ker[3] = du * dv;
401+ ker[0] = (1.f - du) * (1.f - dv) * 8192;
402+ ker[1] = du * (1.f - dv) * 8192;
403+ ker[2] = (1.f - du) * dv * 8192;
404+ ker[3] = du * dv * 8192;
405405 }
406406
407407 /**
@@ -432,7 +432,7 @@ static inline void calculate_bicubic_coeffs(float t, float *coeffs) · 24 unmodified lines
432432 * @param ker ker remap data
433433 */
434434 static void bicubic_kernel(float du, float dv, const XYRemap *r_tmp,
435− uint16_t *u, uint16_t *v, float *ker)
435+ uint16_t *u, uint16_t *v, int16_t *ker)
436436 {
437437 int i, j;
438438 float du_coeffs[4];
@@ -445,7 +445,7 @@ static void bicubic_kernel(float du, float dv, const XYRemap *r_tmp, · 6 unmodified lines
445445 for (j = 0; j < 4; j++) {
446446 u[i * 4 + j] = r_tmp->u[i][j];
447447 v[i * 4 + j] = r_tmp->v[i][j];
448− ker[i * 4 + j] = du_coeffs[j] * dv_coeffs[i];
448+ ker[i * 4 + j] = du_coeffs[j] * dv_coeffs[i] * 2048;
449449 }
450450 }
451451 }
@@ -487,7 +487,7 @@ static inline void calculate_lanczos_coeffs(float t, float *coeffs) · 35 unmodified lines
487487 * @param ker ker remap data
488488 */
489489 static void lanczos_kernel(float du, float dv, const XYRemap *r_tmp,
490− uint16_t *u, uint16_t *v, float *ker)
490+ uint16_t *u, uint16_t *v, int16_t *ker)
491491 {
492492 int i, j;
493493 float du_coeffs[4];
@@ -500,7 +500,7 @@ static void lanczos_kernel(float du, float dv, const XYRemap *r_tmp, · 6 unmodified lines
500500 for (j = 0; j < 4; j++) {
501501 u[i * 4 + j] = r_tmp->u[i][j];
502502 v[i * 4 + j] = r_tmp->v[i][j];
503− ker[i * 4 + j] = du_coeffs[j] * dv_coeffs[i];
503+ ker[i * 4 + j] = du_coeffs[j] * dv_coeffs[i] * 2048;
504504 }
505505 }
506506 }
@@ -1985,7 +1985,7 @@ static int config_output(AVFilterLink *outlink) · 1478 unmodified lines
19851985 int i, int j, int width, int height,
19861986 float *vec);
19871987 void (*calculate_kernel)(float du, float dv, const XYRemap *r_tmp,
1988− uint16_t *u, uint16_t *v, float *ker);
1988+ uint16_t *u, uint16_t *v, int16_t *ker);
19891989 float rot_mat[3][3];
19901990
19911991 switch (s->interp) {
@@ -2001,21 +2001,21 @@ static int config_output(AVFilterLink *outlink) · 9 unmodified lines
20012001 s->remap_slice = depth <= 8 ? remap2_8bit_slice : remap2_16bit_slice;
20022002 elements = 2 * 2;
20032003 sizeof_uv = sizeof(uint16_t) * elements;
2004− sizeof_ker = sizeof(float) * elements;
2004+ sizeof_ker = sizeof(uint16_t) * elements;
20052005 break;
20062006 case BICUBIC:
20072007 calculate_kernel = bicubic_kernel;
20082008 s->remap_slice = depth <= 8 ? remap4_8bit_slice : remap4_16bit_slice;
20092009 elements = 4 * 4;
20102010 sizeof_uv = sizeof(uint16_t) * elements;
2011− sizeof_ker = sizeof(float) * elements;
2011+ sizeof_ker = sizeof(uint16_t) * elements;
20122012 break;
20132013 case LANCZOS:
20142014 calculate_kernel = lanczos_kernel;
20152015 s->remap_slice = depth <= 8 ? remap4_8bit_slice : remap4_16bit_slice;
20162016 elements = 4 * 4;
20172017 sizeof_uv = sizeof(uint16_t) * elements;
2018− sizeof_ker = sizeof(float) * elements;
2018+ sizeof_ker = sizeof(uint16_t) * elements;
20192019 break;
20202020 }
20212021
@@ -2182,7 +2182,7 @@ static int config_output(AVFilterLink *outlink) · 160 unmodified lines
21822182 for (j = 0; j < height; j++) {
21832183 uint16_t *u = s->u[p] + (j * width + i) * elements;
21842184 uint16_t *v = s->v[p] + (j * width + i) * elements;
2185− float *ker = s->ker[p] + (j * width + i) * elements;
2185+ int16_t *ker = s->ker[p] + (j * width + i) * elements;
21862186
21872187 out_transform(s, i, j, width, height, vec);
21882188 rotate(rot_mat, vec);

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