History

avfilter/vf_v360: change remaps to int16_t type

Paul B Mahol committed 6 years ago

Commit 3bf28d41 parent ff5e2413 files · +48 −48Browse files

Unified · Split

3 files
  1. libavfilter/v360.h +6 −6
  2. libavfilter/vf_v360.c +37 −37
  3. libavfilter/x86/vf_v360_init.c +5 −5
libavfilter/v360.h+6−6
@@ -96,8 +96,8 @@ enum RotationOrder { · 95 unmodified lines
9696 };
9797
9898 typedef struct XYRemap {
99− uint16_t u[4][4];
100− uint16_t v[4][4];
99+ int16_t u[4][4];
100+ int16_t v[4][4];
101101 float ker[4][4];
102102 } XYRemap;
103103
@@ -152,25 +152,25 @@ typedef struct V360Context { · 48 unmodified lines
152152 int nb_allocated;
153153 int elements;
154154
155− uint16_t *u[2], *v[2];
155+ int16_t *u[2], *v[2];
156156 int16_t *ker[2];
157157 unsigned map[4];
158158
159159 void (*in_transform)(const struct V360Context *s,
160160 const float *vec, int width, int height,
161− uint16_t us[4][4], uint16_t vs[4][4], float *du, float *dv);
161+ int16_t us[4][4], int16_t vs[4][4], float *du, float *dv);
162162
163163 void (*out_transform)(const struct V360Context *s,
164164 int i, int j, int width, int height,
165165 float *vec);
166166
167167 void (*calculate_kernel)(float du, float dv, const XYRemap *rmap,
168− uint16_t *u, uint16_t *v, int16_t *ker);
168+ int16_t *u, int16_t *v, int16_t *ker);
169169
170170 int (*remap_slice)(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs);
171171
172172 void (*remap_line)(uint8_t *dst, int width, const uint8_t *const src, ptrdiff_t in_linesize,
173− const uint16_t *const u, const uint16_t *const v, const int16_t *const ker);
173+ const int16_t *const u, const int16_t *const v, const int16_t *const ker);
174174 } V360Context;
175175
176176 void ff_v360_init(V360Context *s, int depth);
libavfilter/vf_v360.c+37−37
@@ -211,7 +211,7 @@ static int query_formats(AVFilterContext *ctx) · 210 unmodified lines
211211 #define DEFINE_REMAP1_LINE(bits, div) \
212212 static void remap1_##bits##bit_line_c(uint8_t *dst, int width, const uint8_t *const src, \
213213 ptrdiff_t in_linesize, \
214− const uint16_t *const u, const uint16_t *const v, \
214+ const int16_t *const u, const int16_t *const v, \
215215 const int16_t *const ker) \
216216 { \
217217 const uint##bits##_t *const s = (const uint##bits##_t *const)src; \
@@ -260,8 +260,8 @@ static int remap##ws##_##bits##bit_slice(AVFilterContext *ctx, void *arg, int jo · 42 unmodified lines
260260 const int slice_end = (height * (jobnr + 1)) / nb_jobs; \
261261 \
262262 for (int y = slice_start; y < slice_end; y++) { \
263− const uint16_t *const u = s->u[map] + y * uv_linesize * ws * ws; \
264− const uint16_t *const v = s->v[map] + y * uv_linesize * ws * ws; \
263+ const int16_t *const u = s->u[map] + y * uv_linesize * ws * ws; \
264+ const int16_t *const v = s->v[map] + y * uv_linesize * ws * ws; \
265265 const int16_t *const ker = s->ker[map] + y * uv_linesize * ws * ws; \
266266 \
267267 s->remap_line(dst + y * out_linesize, width, src, in_linesize, u, v, ker); \
@@ -282,7 +282,7 @@ DEFINE_REMAP(4, 16) · 14 unmodified lines
282282 #define DEFINE_REMAP_LINE(ws, bits, div) \
283283 static void remap##ws##_##bits##bit_line_c(uint8_t *dst, int width, const uint8_t *const src, \
284284 ptrdiff_t in_linesize, \
285− const uint16_t *const u, const uint16_t *const v, \
285+ const int16_t *const u, const int16_t *const v, \
286286 const int16_t *const ker) \
287287 { \
288288 const uint##bits##_t *const s = (const uint##bits##_t *const)src; \
@@ -291,8 +291,8 @@ static void remap##ws##_##bits##bit_line_c(uint8_t *dst, int width, const uint8_ · 2 unmodified lines
291291 in_linesize /= div; \
292292 \
293293 for (int x = 0; x < width; x++) { \
294− const uint16_t *const uu = u + x * ws * ws; \
295− const uint16_t *const vv = v + x * ws * ws; \
294+ const int16_t *const uu = u + x * ws * ws; \
295+ const int16_t *const vv = v + x * ws * ws; \
296296 const int16_t *const kker = ker + x * ws * ws; \
297297 int tmp = 0; \
298298 \
@@ -343,7 +343,7 @@ void ff_v360_init(V360Context *s, int depth) · 44 unmodified lines
343343 * @param ker ker remap data
344344 */
345345 static void nearest_kernel(float du, float dv, const XYRemap *rmap,
346− uint16_t *u, uint16_t *v, int16_t *ker)
346+ int16_t *u, int16_t *v, int16_t *ker)
347347 {
348348 const int i = roundf(dv) + 1;
349349 const int j = roundf(du) + 1;
@@ -363,7 +363,7 @@ static void nearest_kernel(float du, float dv, const XYRemap *rmap, · 13 unmodified lines
363363 * @param ker ker remap data
364364 */
365365 static void bilinear_kernel(float du, float dv, const XYRemap *rmap,
366− uint16_t *u, uint16_t *v, int16_t *ker)
366+ int16_t *u, int16_t *v, int16_t *ker)
367367 {
368368 for (int i = 0; i < 2; i++) {
369369 for (int j = 0; j < 2; j++) {
@@ -406,7 +406,7 @@ static inline void calculate_bicubic_coeffs(float t, float *coeffs) · 36 unmodified lines
406406 * @param ker ker remap data
407407 */
408408 static void bicubic_kernel(float du, float dv, const XYRemap *rmap,
409− uint16_t *u, uint16_t *v, int16_t *ker)
409+ int16_t *u, int16_t *v, int16_t *ker)
410410 {
411411 float du_coeffs[4];
412412 float dv_coeffs[4];
@@ -459,7 +459,7 @@ static inline void calculate_lanczos_coeffs(float t, float *coeffs) · 46 unmodified lines
459459 * @param ker ker remap data
460460 */
461461 static void lanczos_kernel(float du, float dv, const XYRemap *rmap,
462− uint16_t *u, uint16_t *v, int16_t *ker)
462+ int16_t *u, int16_t *v, int16_t *ker)
463463 {
464464 float du_coeffs[4];
465465 float dv_coeffs[4];
@@ -501,7 +501,7 @@ static void calculate_spline16_coeffs(float t, float *coeffs) · 35 unmodified lines
501501 * @param ker ker remap data
502502 */
503503 static void spline16_kernel(float du, float dv, const XYRemap *rmap,
504− uint16_t *u, uint16_t *v, int16_t *ker)
504+ int16_t *u, int16_t *v, int16_t *ker)
505505 {
506506 float du_coeffs[4];
507507 float dv_coeffs[4];
@@ -554,7 +554,7 @@ static void calculate_gaussian_coeffs(float t, float *coeffs) · 46 unmodified lines
554554 * @param ker ker remap data
555555 */
556556 static void gaussian_kernel(float du, float dv, const XYRemap *rmap,
557− uint16_t *u, uint16_t *v, int16_t *ker)
557+ int16_t *u, int16_t *v, int16_t *ker)
558558 {
559559 float du_coeffs[4];
560560 float dv_coeffs[4];
@@ -1212,7 +1212,7 @@ static void cube3x2_to_xyz(const V360Context *s, · 651 unmodified lines
12121212 */
12131213 static void xyz_to_cube3x2(const V360Context *s,
12141214 const float *vec, int width, int height,
1215− uint16_t us[4][4], uint16_t vs[4][4], float *du, float *dv)
1215+ int16_t us[4][4], int16_t vs[4][4], float *du, float *dv)
12161216 {
12171217 const float scalew = s->fin_pad > 0 ? 1.f - s->fin_pad / (s->in_width / 3.f) : 1.f - s->in_pad;
12181218 const float scaleh = s->fin_pad > 0 ? 1.f - s->fin_pad / (s->in_height / 2.f) : 1.f - s->in_pad;
@@ -1363,7 +1363,7 @@ static void cube6x1_to_xyz(const V360Context *s, · 144 unmodified lines
13631363 */
13641364 static void xyz_to_cube1x6(const V360Context *s,
13651365 const float *vec, int width, int height,
1366− uint16_t us[4][4], uint16_t vs[4][4], float *du, float *dv)
1366+ int16_t us[4][4], int16_t vs[4][4], float *du, float *dv)
13671367 {
13681368 const float scalew = s->fin_pad > 0 ? 1.f - (float)(s->fin_pad) / s->in_width : 1.f - s->in_pad;
13691369 const float scaleh = s->fin_pad > 0 ? 1.f - s->fin_pad / (s->in_height / 6.f) : 1.f - s->in_pad;
@@ -1441,7 +1441,7 @@ static void xyz_to_cube1x6(const V360Context *s, · 71 unmodified lines
14411441 */
14421442 static void xyz_to_cube6x1(const V360Context *s,
14431443 const float *vec, int width, int height,
1444− uint16_t us[4][4], uint16_t vs[4][4], float *du, float *dv)
1444+ int16_t us[4][4], int16_t vs[4][4], float *du, float *dv)
14451445 {
14461446 const float scalew = s->fin_pad > 0 ? 1.f - s->fin_pad / (s->in_width / 6.f) : 1.f - s->in_pad;
14471447 const float scaleh = s->fin_pad > 0 ? 1.f - (float)(s->fin_pad) / s->in_height : 1.f - s->in_pad;
@@ -1588,7 +1588,7 @@ static void stereographic_to_xyz(const V360Context *s, · 140 unmodified lines
15881588 */
15891589 static void xyz_to_stereographic(const V360Context *s,
15901590 const float *vec, int width, int height,
1591− uint16_t us[4][4], uint16_t vs[4][4], float *du, float *dv)
1591+ int16_t us[4][4], int16_t vs[4][4], float *du, float *dv)
15921592 {
15931593 const float x = av_clipf(vec[0] / (1.f - vec[1]), -1.f, 1.f) * s->input_mirror_modifier[0];
15941594 const float y = av_clipf(vec[2] / (1.f - vec[1]), -1.f, 1.f) * s->input_mirror_modifier[1];
@@ -1625,7 +1625,7 @@ static void xyz_to_stereographic(const V360Context *s, · 30 unmodified lines
16251625 */
16261626 static void xyz_to_equirect(const V360Context *s,
16271627 const float *vec, int width, int height,
1628− uint16_t us[4][4], uint16_t vs[4][4], float *du, float *dv)
1628+ int16_t us[4][4], int16_t vs[4][4], float *du, float *dv)
16291629 {
16301630 const float phi = atan2f(vec[0], -vec[2]) * s->input_mirror_modifier[0];
16311631 const float theta = asinf(-vec[1]) * s->input_mirror_modifier[1];
@@ -1662,7 +1662,7 @@ static void xyz_to_equirect(const V360Context *s, · 30 unmodified lines
16621662 */
16631663 static void xyz_to_mercator(const V360Context *s,
16641664 const float *vec, int width, int height,
1665− uint16_t us[4][4], uint16_t vs[4][4], float *du, float *dv)
1665+ int16_t us[4][4], int16_t vs[4][4], float *du, float *dv)
16661666 {
16671667 const float phi = atan2f(vec[0], -vec[2]) * s->input_mirror_modifier[0];
16681668 const float theta = -vec[1] * s->input_mirror_modifier[1];
@@ -1727,7 +1727,7 @@ static void mercator_to_xyz(const V360Context *s, · 58 unmodified lines
17271727 */
17281728 static void xyz_to_ball(const V360Context *s,
17291729 const float *vec, int width, int height,
1730− uint16_t us[4][4], uint16_t vs[4][4], float *du, float *dv)
1730+ int16_t us[4][4], int16_t vs[4][4], float *du, float *dv)
17311731 {
17321732 const float l = hypotf(vec[0], vec[1]);
17331733 const float r = sqrtf(1.f + vec[2]) / M_SQRT2;
@@ -1833,7 +1833,7 @@ static void hammer_to_xyz(const V360Context *s, · 99 unmodified lines
18331833 */
18341834 static void xyz_to_hammer(const V360Context *s,
18351835 const float *vec, int width, int height,
1836− uint16_t us[4][4], uint16_t vs[4][4], float *du, float *dv)
1836+ int16_t us[4][4], int16_t vs[4][4], float *du, float *dv)
18371837 {
18381838 const float theta = atan2f(vec[0], -vec[2]) * s->input_mirror_modifier[0];
18391839
@@ -1902,7 +1902,7 @@ static void sinusoidal_to_xyz(const V360Context *s, · 62 unmodified lines
19021902 */
19031903 static void xyz_to_sinusoidal(const V360Context *s,
19041904 const float *vec, int width, int height,
1905− uint16_t us[4][4], uint16_t vs[4][4], float *du, float *dv)
1905+ int16_t us[4][4], int16_t vs[4][4], float *du, float *dv)
19061906 {
19071907 const float theta = asinf(-vec[1]) * s->input_mirror_modifier[1];
19081908 const float phi = atan2f(vec[0], -vec[2]) * s->input_mirror_modifier[0] * cosf(theta);
@@ -2128,7 +2128,7 @@ static void eac_to_xyz(const V360Context *s, · 219 unmodified lines
21282128 */
21292129 static void xyz_to_eac(const V360Context *s,
21302130 const float *vec, int width, int height,
2131− uint16_t us[4][4], uint16_t vs[4][4], float *du, float *dv)
2131+ int16_t us[4][4], int16_t vs[4][4], float *du, float *dv)
21322132 {
21332133 const float pixel_pad = 2;
21342134 const float u_pad = pixel_pad / width;
@@ -2436,7 +2436,7 @@ static void dfisheye_to_xyz(const V360Context *s, · 301 unmodified lines
24362436 */
24372437 static void xyz_to_dfisheye(const V360Context *s,
24382438 const float *vec, int width, int height,
2439− uint16_t us[4][4], uint16_t vs[4][4], float *du, float *dv)
2439+ int16_t us[4][4], int16_t vs[4][4], float *du, float *dv)
24402440 {
24412441 const float scale = 1.f - s->in_pad;
24422442
@@ -2558,7 +2558,7 @@ static void barrel_to_xyz(const V360Context *s, · 115 unmodified lines
25582558 */
25592559 static void xyz_to_barrel(const V360Context *s,
25602560 const float *vec, int width, int height,
2561− uint16_t us[4][4], uint16_t vs[4][4], float *du, float *dv)
2561+ int16_t us[4][4], int16_t vs[4][4], float *du, float *dv)
25622562 {
25632563 const float scale = 0.99f;
25642564
@@ -2757,8 +2757,8 @@ static av_always_inline int v360_slice(AVFilterContext *ctx, void *arg, int jobn · 192 unmodified lines
27572757
27582758 for (int j = slice_start; j < slice_end; j++) {
27592759 for (int i = 0; i < width; i++) {
2760− uint16_t *u = s->u[p] + (j * uv_linesize + i) * s->elements;
2761− uint16_t *v = s->v[p] + (j * uv_linesize + i) * s->elements;
2760+ int16_t *u = s->u[p] + (j * uv_linesize + i) * s->elements;
2761+ int16_t *v = s->v[p] + (j * uv_linesize + i) * s->elements;
27622762 int16_t *ker = s->ker[p] + (j * uv_linesize + i) * s->elements;
27632763
27642764 if (s->out_transpose)
@@ -2807,43 +2807,43 @@ static int config_output(AVFilterLink *outlink) · 42 unmodified lines
28072807 s->calculate_kernel = nearest_kernel;
28082808 s->remap_slice = depth <= 8 ? remap1_8bit_slice : remap1_16bit_slice;
28092809 s->elements = 1;
2810− sizeof_uv = sizeof(uint16_t) * s->elements;
2810+ sizeof_uv = sizeof(int16_t) * s->elements;
28112811 sizeof_ker = 0;
28122812 break;
28132813 case BILINEAR:
28142814 s->calculate_kernel = bilinear_kernel;
28152815 s->remap_slice = depth <= 8 ? remap2_8bit_slice : remap2_16bit_slice;
28162816 s->elements = 2 * 2;
2817− sizeof_uv = sizeof(uint16_t) * s->elements;
2818− sizeof_ker = sizeof(uint16_t) * s->elements;
2817+ sizeof_uv = sizeof(int16_t) * s->elements;
2818+ sizeof_ker = sizeof(int16_t) * s->elements;
28192819 break;
28202820 case BICUBIC:
28212821 s->calculate_kernel = bicubic_kernel;
28222822 s->remap_slice = depth <= 8 ? remap4_8bit_slice : remap4_16bit_slice;
28232823 s->elements = 4 * 4;
2824− sizeof_uv = sizeof(uint16_t) * s->elements;
2825− sizeof_ker = sizeof(uint16_t) * s->elements;
2824+ sizeof_uv = sizeof(int16_t) * s->elements;
2825+ sizeof_ker = sizeof(int16_t) * s->elements;
28262826 break;
28272827 case LANCZOS:
28282828 s->calculate_kernel = lanczos_kernel;
28292829 s->remap_slice = depth <= 8 ? remap4_8bit_slice : remap4_16bit_slice;
28302830 s->elements = 4 * 4;
2831− sizeof_uv = sizeof(uint16_t) * s->elements;
2832− sizeof_ker = sizeof(uint16_t) * s->elements;
2831+ sizeof_uv = sizeof(int16_t) * s->elements;
2832+ sizeof_ker = sizeof(int16_t) * s->elements;
28332833 break;
28342834 case SPLINE16:
28352835 s->calculate_kernel = spline16_kernel;
28362836 s->remap_slice = depth <= 8 ? remap4_8bit_slice : remap4_16bit_slice;
28372837 s->elements = 4 * 4;
2838− sizeof_uv = sizeof(uint16_t) * s->elements;
2839− sizeof_ker = sizeof(uint16_t) * s->elements;
2838+ sizeof_uv = sizeof(int16_t) * s->elements;
2839+ sizeof_ker = sizeof(int16_t) * s->elements;
28402840 break;
28412841 case GAUSSIAN:
28422842 s->calculate_kernel = gaussian_kernel;
28432843 s->remap_slice = depth <= 8 ? remap4_8bit_slice : remap4_16bit_slice;
28442844 s->elements = 4 * 4;
2845− sizeof_uv = sizeof(uint16_t) * s->elements;
2846− sizeof_ker = sizeof(uint16_t) * s->elements;
2845+ sizeof_uv = sizeof(int16_t) * s->elements;
2846+ sizeof_ker = sizeof(int16_t) * s->elements;
28472847 break;
28482848 default:
28492849 av_assert0(0);
libavfilter/x86/vf_v360_init.c+5−5
@@ -24,19 +24,19 @@ · 23 unmodified lines
2424 #include "libavfilter/v360.h"
2525
2626 void ff_remap1_8bit_line_avx2(uint8_t *dst, int width, const uint8_t *src, ptrdiff_t in_linesize,
27− const uint16_t *u, const uint16_t *v, const int16_t *ker);
27+ const int16_t *const u, const int16_t *const v, const int16_t *const ker);
2828
2929 void ff_remap2_8bit_line_avx2(uint8_t *dst, int width, const uint8_t *src, ptrdiff_t in_linesize,
30− const uint16_t *u, const uint16_t *v, const int16_t *ker);
30+ const int16_t *const u, const int16_t *const v, const int16_t *const ker);
3131
3232 void ff_remap4_8bit_line_avx2(uint8_t *dst, int width, const uint8_t *src, ptrdiff_t in_linesize,
33− const uint16_t *u, const uint16_t *v, const int16_t *ker);
33+ const int16_t *const u, const int16_t *const v, const int16_t *const ker);
3434
3535 void ff_remap1_16bit_line_avx2(uint8_t *dst, int width, const uint8_t *src, ptrdiff_t in_linesize,
36− const uint16_t *u, const uint16_t *v, const int16_t *ker);
36+ const int16_t *const u, const int16_t *const v, const int16_t *const ker);
3737
3838 void ff_remap2_16bit_line_avx2(uint8_t *dst, int width, const uint8_t *src, ptrdiff_t in_linesize,
39− const uint16_t *u, const uint16_t *v, const int16_t *ker);
39+ const int16_t *const u, const int16_t *const v, const int16_t *const ker);
4040
4141 av_cold void ff_v360_init_x86(V360Context *s, int depth)
4242 {

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