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
118 int nb_planes;118 int nb_planes;
119 119
120 uint16_t *u[4], *v[4];120 uint16_t *u[4], *v[4];
121 float *ker[4];121 int16_t *ker[4];
122 122
123 int (*remap_slice)(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs);123 int (*remap_slice)(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs);
124} V360Context;124} V360Context;
@@ -330,12 +330,12 @@ static int remap##ws##_##bits##bit_slice(AVFilterContext *ctx, void *arg, int jo · 205 unmodified lines
330 uint##bits##_t *d = dst + y * out_linesize; \330 uint##bits##_t *d = dst + y * out_linesize; \
331 const uint16_t *u = s->u[plane] + y * width * ws * ws; \331 const uint16_t *u = s->u[plane] + y * width * ws * ws; \
332 const uint16_t *v = s->v[plane] + y * width * ws * ws; \332 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; \
334 for (x = 0; x < width; x++) { \334 for (x = 0; x < width; x++) { \
335 const uint16_t *uu = u + x * ws * ws; \335 const uint16_t *uu = u + x * ws * ws; \
336 const uint16_t *vv = v + x * ws * ws; \336 const uint16_t *vv = v + x * ws * ws; \
337 const float *kker = ker + x * ws * ws; \337 const int16_t *kker = ker + x * ws * ws; \
338 float tmp = 0.f; \338 int tmp = 0; \
339 \339 \
340 for (i = 0; i < ws; i++) { \340 for (i = 0; i < ws; i++) { \
341 for (j = 0; j < ws; j++) { \341 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
343 } \343 } \
344 } \344 } \
345 \345 \
346 *d++ = av_clip_uint##bits(roundf(tmp)); \346 *d++ = av_clip_uint##bits(tmp >> (15 - ws)); \
347 } \347 } \
348 } \348 } \
349 } \349 } \
@@ -367,7 +367,7 @@ DEFINE_REMAP(4, 16, 2) · 17 unmodified lines
367 * @param ker ker remap data367 * @param ker ker remap data
368 */368 */
369static void nearest_kernel(float du, float dv, const XYRemap *r_tmp,369static 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)
371{371{
372 const int i = roundf(dv) + 1;372 const int i = roundf(dv) + 1;
373 const int j = roundf(du) + 1;373 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
387 * @param ker ker remap data387 * @param ker ker remap data
388 */388 */
389static void bilinear_kernel(float du, float dv, const XYRemap *r_tmp,389static 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)
391{391{
392 int i, j;392 int i, j;
393 393
@@ -398,10 +398,10 @@ static void bilinear_kernel(float du, float dv, const XYRemap *r_tmp, · 4 unmodified lines
398 }398 }
399 }399 }
400 400
401 ker[0] = (1.f - du) * (1.f - dv);401 ker[0] = (1.f - du) * (1.f - dv) * 8192;
402 ker[1] = du * (1.f - dv);402 ker[1] = du * (1.f - dv) * 8192;
403 ker[2] = (1.f - du) * dv;403 ker[2] = (1.f - du) * dv * 8192;
404 ker[3] = du * dv;404 ker[3] = du * dv * 8192;
405}405}
406 406
407/**407/**
@@ -432,7 +432,7 @@ static inline void calculate_bicubic_coeffs(float t, float *coeffs) · 24 unmodified lines
432 * @param ker ker remap data432 * @param ker ker remap data
433 */433 */
434static void bicubic_kernel(float du, float dv, const XYRemap *r_tmp,434static 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)
436{436{
437 int i, j;437 int i, j;
438 float du_coeffs[4];438 float du_coeffs[4];
@@ -445,7 +445,7 @@ static void bicubic_kernel(float du, float dv, const XYRemap *r_tmp, · 6 unmodified lines
445 for (j = 0; j < 4; j++) {445 for (j = 0; j < 4; j++) {
446 u[i * 4 + j] = r_tmp->u[i][j];446 u[i * 4 + j] = r_tmp->u[i][j];
447 v[i * 4 + j] = r_tmp->v[i][j];447 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;
449 }449 }
450 }450 }
451}451}
@@ -487,7 +487,7 @@ static inline void calculate_lanczos_coeffs(float t, float *coeffs) · 35 unmodified lines
487 * @param ker ker remap data487 * @param ker ker remap data
488 */488 */
489static void lanczos_kernel(float du, float dv, const XYRemap *r_tmp,489static 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)
491{491{
492 int i, j;492 int i, j;
493 float du_coeffs[4];493 float du_coeffs[4];
@@ -500,7 +500,7 @@ static void lanczos_kernel(float du, float dv, const XYRemap *r_tmp, · 6 unmodified lines
500 for (j = 0; j < 4; j++) {500 for (j = 0; j < 4; j++) {
501 u[i * 4 + j] = r_tmp->u[i][j];501 u[i * 4 + j] = r_tmp->u[i][j];
502 v[i * 4 + j] = r_tmp->v[i][j];502 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;
504 }504 }
505 }505 }
506}506}
@@ -1985,7 +1985,7 @@ static int config_output(AVFilterLink *outlink) · 1478 unmodified lines
1985 int i, int j, int width, int height,1985 int i, int j, int width, int height,
1986 float *vec);1986 float *vec);
1987 void (*calculate_kernel)(float du, float dv, const XYRemap *r_tmp,1987 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);
1989 float rot_mat[3][3];1989 float rot_mat[3][3];
1990 1990
1991 switch (s->interp) {1991 switch (s->interp) {
@@ -2001,21 +2001,21 @@ static int config_output(AVFilterLink *outlink) · 9 unmodified lines
2001 s->remap_slice = depth <= 8 ? remap2_8bit_slice : remap2_16bit_slice;2001 s->remap_slice = depth <= 8 ? remap2_8bit_slice : remap2_16bit_slice;
2002 elements = 2 * 2;2002 elements = 2 * 2;
2003 sizeof_uv = sizeof(uint16_t) * elements;2003 sizeof_uv = sizeof(uint16_t) * elements;
2004 sizeof_ker = sizeof(float) * elements;2004 sizeof_ker = sizeof(uint16_t) * elements;
2005 break;2005 break;
2006 case BICUBIC:2006 case BICUBIC:
2007 calculate_kernel = bicubic_kernel;2007 calculate_kernel = bicubic_kernel;
2008 s->remap_slice = depth <= 8 ? remap4_8bit_slice : remap4_16bit_slice;2008 s->remap_slice = depth <= 8 ? remap4_8bit_slice : remap4_16bit_slice;
2009 elements = 4 * 4;2009 elements = 4 * 4;
2010 sizeof_uv = sizeof(uint16_t) * elements;2010 sizeof_uv = sizeof(uint16_t) * elements;
2011 sizeof_ker = sizeof(float) * elements;2011 sizeof_ker = sizeof(uint16_t) * elements;
2012 break;2012 break;
2013 case LANCZOS:2013 case LANCZOS:
2014 calculate_kernel = lanczos_kernel;2014 calculate_kernel = lanczos_kernel;
2015 s->remap_slice = depth <= 8 ? remap4_8bit_slice : remap4_16bit_slice;2015 s->remap_slice = depth <= 8 ? remap4_8bit_slice : remap4_16bit_slice;
2016 elements = 4 * 4;2016 elements = 4 * 4;
2017 sizeof_uv = sizeof(uint16_t) * elements;2017 sizeof_uv = sizeof(uint16_t) * elements;
2018 sizeof_ker = sizeof(float) * elements;2018 sizeof_ker = sizeof(uint16_t) * elements;
2019 break;2019 break;
2020 }2020 }
2021 2021
@@ -2182,7 +2182,7 @@ static int config_output(AVFilterLink *outlink) · 160 unmodified lines
2182 for (j = 0; j < height; j++) {2182 for (j = 0; j < height; j++) {
2183 uint16_t *u = s->u[p] + (j * width + i) * elements;2183 uint16_t *u = s->u[p] + (j * width + i) * elements;
2184 uint16_t *v = s->v[p] + (j * width + i) * elements;2184 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;
2186 2186
2187 out_transform(s, i, j, width, height, vec);2187 out_transform(s, i, j, width, height, vec);
2188 rotate(rot_mat, vec);2188 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