History

avfilter/vf_v360: define variables in for loops consistently

Paul B Mahol committed 7 years ago

Commit 2a672a91 parent f78abca1 file · +29 −44Browse files

Unified · Split

libavfilter/vf_v360.c+29−44
@@ -337,10 +337,8 @@ static void nearest_kernel(float du, float dv, const XYRemap *r_tmp, · 336 unmodified lines
337337 static void bilinear_kernel(float du, float dv, const XYRemap *r_tmp,
338338 uint16_t *u, uint16_t *v, int16_t *ker)
339339 {
340− int i, j;
341−
342− for (i = 0; i < 2; i++) {
343− for (j = 0; j < 2; j++) {
340+ for (int i = 0; i < 2; i++) {
341+ for (int j = 0; j < 2; j++) {
344342 u[i * 2 + j] = r_tmp->u[i + 1][j + 1];
345343 v[i * 2 + j] = r_tmp->v[i + 1][j + 1];
346344 }
@@ -382,15 +380,14 @@ static inline void calculate_bicubic_coeffs(float t, float *coeffs) · 35 unmodified lines
382380 static void bicubic_kernel(float du, float dv, const XYRemap *r_tmp,
383381 uint16_t *u, uint16_t *v, int16_t *ker)
384382 {
385− int i, j;
386383 float du_coeffs[4];
387384 float dv_coeffs[4];
388385
389386 calculate_bicubic_coeffs(du, du_coeffs);
390387 calculate_bicubic_coeffs(dv, dv_coeffs);
391388
392− for (i = 0; i < 4; i++) {
393− for (j = 0; j < 4; j++) {
389+ for (int i = 0; i < 4; i++) {
390+ for (int j = 0; j < 4; j++) {
394391 u[i * 4 + j] = r_tmp->u[i][j];
395392 v[i * 4 + j] = r_tmp->v[i][j];
396393 ker[i * 4 + j] = du_coeffs[j] * dv_coeffs[i] * 16384;
@@ -406,10 +403,9 @@ static void bicubic_kernel(float du, float dv, const XYRemap *r_tmp, · 9 unmodified lines
406403 */
407404 static inline void calculate_lanczos_coeffs(float t, float *coeffs)
408405 {
409− int i;
410406 float sum = 0.f;
411407
412− for (i = 0; i < 4; i++) {
408+ for (int i = 0; i < 4; i++) {
413409 const float x = M_PI * (t - i + 1);
414410 if (x == 0.f) {
415411 coeffs[i] = 1.f;
@@ -419,7 +415,7 @@ static inline void calculate_lanczos_coeffs(float t, float *coeffs) · 3 unmodified lines
419415 sum += coeffs[i];
420416 }
421417
422− for (i = 0; i < 4; i++) {
418+ for (int i = 0; i < 4; i++) {
423419 coeffs[i] /= sum;
424420 }
425421 }
@@ -437,15 +433,14 @@ static inline void calculate_lanczos_coeffs(float t, float *coeffs) · 11 unmodified lines
437433 static void lanczos_kernel(float du, float dv, const XYRemap *r_tmp,
438434 uint16_t *u, uint16_t *v, int16_t *ker)
439435 {
440− int i, j;
441436 float du_coeffs[4];
442437 float dv_coeffs[4];
443438
444439 calculate_lanczos_coeffs(du, du_coeffs);
445440 calculate_lanczos_coeffs(dv, dv_coeffs);
446441
447− for (i = 0; i < 4; i++) {
448− for (j = 0; j < 4; j++) {
442+ for (int i = 0; i < 4; i++) {
443+ for (int j = 0; j < 4; j++) {
449444 u[i * 4 + j] = r_tmp->u[i][j];
450445 v[i * 4 + j] = r_tmp->v[i][j];
451446 ker[i * 4 + j] = du_coeffs[j] * dv_coeffs[i] * 16384;
@@ -1094,7 +1089,6 @@ static void xyz_to_cube3x2(const V360Context *s, · 642 unmodified lines
10941089 float uf, vf;
10951090 int ui, vi;
10961091 int ewi, ehi;
1097− int i, j;
10981092 int direction, face;
10991093 int u_face, v_face;
11001094
@@ -1118,8 +1112,8 @@ static void xyz_to_cube3x2(const V360Context *s, · 17 unmodified lines
11181112 *du = uf - ui;
11191113 *dv = vf - vi;
11201114
1121− for (i = -1; i < 3; i++) {
1122− for (j = -1; j < 3; j++) {
1115+ for (int i = -1; i < 3; i++) {
1116+ for (int j = -1; j < 3; j++) {
11231117 int new_ui = ui + j;
11241118 int new_vi = vi + i;
11251119 int u_shift, v_shift;
@@ -1238,7 +1232,6 @@ static void xyz_to_cube1x6(const V360Context *s, · 112 unmodified lines
12381232 float uf, vf;
12391233 int ui, vi;
12401234 int ehi;
1241− int i, j;
12421235 int direction, face;
12431236
12441237 xyz_to_cube(s, vec, &uf, &vf, &direction);
@@ -1258,8 +1251,8 @@ static void xyz_to_cube1x6(const V360Context *s, · 13 unmodified lines
12581251 *du = uf - ui;
12591252 *dv = vf - vi;
12601253
1261− for (i = -1; i < 3; i++) {
1262− for (j = -1; j < 3; j++) {
1254+ for (int i = -1; i < 3; i++) {
1255+ for (int j = -1; j < 3; j++) {
12631256 int new_ui = ui + j;
12641257 int new_vi = vi + i;
12651258 int v_shift;
@@ -1315,7 +1308,6 @@ static void xyz_to_cube6x1(const V360Context *s, · 49 unmodified lines
13151308 float uf, vf;
13161309 int ui, vi;
13171310 int ewi;
1318− int i, j;
13191311 int direction, face;
13201312
13211313 xyz_to_cube(s, vec, &uf, &vf, &direction);
@@ -1335,8 +1327,8 @@ static void xyz_to_cube6x1(const V360Context *s, · 13 unmodified lines
13351327 *du = uf - ui;
13361328 *dv = vf - vi;
13371329
1338− for (i = -1; i < 3; i++) {
1339− for (j = -1; j < 3; j++) {
1330+ for (int i = -1; i < 3; i++) {
1331+ for (int j = -1; j < 3; j++) {
13401332 int new_ui = ui + j;
13411333 int new_vi = vi + i;
13421334 int u_shift;
@@ -1463,7 +1455,6 @@ static void xyz_to_stereographic(const V360Context *s, · 120 unmodified lines
14631455 const float y = av_clipf(vec[2] / (1.f - vec[1]), -1.f, 1.f) * s->input_mirror_modifier[1];
14641456 float uf, vf;
14651457 int ui, vi;
1466− int i, j;
14671458
14681459 uf = (x + 1.f) * width / 2.f;
14691460 vf = (y + 1.f) * height / 2.f;
@@ -1473,8 +1464,8 @@ static void xyz_to_stereographic(const V360Context *s, · 3 unmodified lines
14731464 *du = uf - ui;
14741465 *dv = vf - vi;
14751466
1476− for (i = -1; i < 3; i++) {
1477− for (j = -1; j < 3; j++) {
1467+ for (int i = -1; i < 3; i++) {
1468+ for (int j = -1; j < 3; j++) {
14781469 us[i + 1][j + 1] = av_clip(ui + j, 0, width - 1);
14791470 vs[i + 1][j + 1] = av_clip(vi + i, 0, height - 1);
14801471 }
@@ -1501,7 +1492,6 @@ static void xyz_to_equirect(const V360Context *s, · 20 unmodified lines
15011492 const float theta = asinf(-vec[1]) * s->input_mirror_modifier[1];
15021493 float uf, vf;
15031494 int ui, vi;
1504− int i, j;
15051495
15061496 uf = (phi / M_PI + 1.f) * width / 2.f;
15071497 vf = (theta / M_PI_2 + 1.f) * height / 2.f;
@@ -1511,8 +1501,8 @@ static void xyz_to_equirect(const V360Context *s, · 3 unmodified lines
15111501 *du = uf - ui;
15121502 *dv = vf - vi;
15131503
1514− for (i = -1; i < 3; i++) {
1515− for (j = -1; j < 3; j++) {
1504+ for (int i = -1; i < 3; i++) {
1505+ for (int j = -1; j < 3; j++) {
15161506 us[i + 1][j + 1] = mod(ui + j, width);
15171507 vs[i + 1][j + 1] = av_clip(vi + i, 0, height - 1);
15181508 }
@@ -1730,7 +1720,6 @@ static void xyz_to_eac(const V360Context *s, · 211 unmodified lines
17301720
17311721 float uf, vf;
17321722 int ui, vi;
1733− int i, j;
17341723 int direction, face;
17351724 int u_face, v_face;
17361725
@@ -1756,8 +1745,8 @@ static void xyz_to_eac(const V360Context *s, · 19 unmodified lines
17561745 *du = uf - ui;
17571746 *dv = vf - vi;
17581747
1759− for (i = -1; i < 3; i++) {
1760− for (j = -1; j < 3; j++) {
1748+ for (int i = -1; i < 3; i++) {
1749+ for (int j = -1; j < 3; j++) {
17611750 us[i + 1][j + 1] = av_clip(ui + j, 0, width - 1);
17621751 vs[i + 1][j + 1] = av_clip(vi + i, 0, height - 1);
17631752 }
@@ -1874,7 +1863,6 @@ static void xyz_to_dfisheye(const V360Context *s, · 110 unmodified lines
18741863
18751864 int ui, vi;
18761865 int u_shift;
1877− int i, j;
18781866
18791867 if (vec[2] >= 0) {
18801868 u_shift = 0;
@@ -1889,8 +1877,8 @@ static void xyz_to_dfisheye(const V360Context *s, · 8 unmodified lines
18891877 *du = uf - ui;
18901878 *dv = vf - vi;
18911879
1892− for (i = -1; i < 3; i++) {
1893− for (j = -1; j < 3; j++) {
1880+ for (int i = -1; i < 3; i++) {
1881+ for (int j = -1; j < 3; j++) {
18941882 us[i + 1][j + 1] = av_clip(u_shift + ui + j, 0, width - 1);
18951883 vs[i + 1][j + 1] = av_clip( vi + i, 0, height - 1);
18961884 }
@@ -1993,7 +1981,6 @@ static void xyz_to_barrel(const V360Context *s, · 96 unmodified lines
19931981 int u_shift, v_shift;
19941982 float uf, vf;
19951983 int ui, vi;
1996− int i, j;
19971984
19981985 if (theta > -theta_range && theta < theta_range) {
19991986 ew = 4 * width / 5;
@@ -2033,8 +2020,8 @@ static void xyz_to_barrel(const V360Context *s, · 33 unmodified lines
20332020 *du = uf - ui;
20342021 *dv = vf - vi;
20352022
2036− for (i = -1; i < 3; i++) {
2037− for (j = -1; j < 3; j++) {
2023+ for (int i = -1; i < 3; i++) {
2024+ for (int j = -1; j < 3; j++) {
20382025 us[i + 1][j + 1] = u_shift + av_clip(ui + j, 0, ew - 1);
20392026 vs[i + 1][j + 1] = v_shift + av_clip(vi + i, 0, eh - 1);
20402027 }
@@ -2165,7 +2152,7 @@ static int config_output(AVFilterLink *outlink) · 124 unmodified lines
21652152 int sizeof_ker;
21662153 int elements;
21672154 int err;
2168− int p, h, w;
2155+ int h, w;
21692156 float hf, wf;
21702157 float output_mirror_modifier[3];
21712158 void (*in_transform)(const V360Context *s,
@@ -2416,7 +2403,7 @@ static int config_output(AVFilterLink *outlink) · 244 unmodified lines
24162403 set_mirror_modifier(s->h_flip, s->v_flip, s->d_flip, output_mirror_modifier);
24172404
24182405 // Calculate remap data
2419− for (p = 0; p < s->nb_allocated; p++) {
2406+ for (int p = 0; p < s->nb_allocated; p++) {
24202407 const int width = s->planewidth[p];
24212408 const int uv_linesize = s->uv_linesize[p];
24222409 const int height = s->planeheight[p];
@@ -2425,10 +2412,9 @@ static int config_output(AVFilterLink *outlink) · 2 unmodified lines
24252412 float du, dv;
24262413 float vec[3];
24272414 XYRemap r_tmp;
2428− int i, j;
24292415
2430− for (i = 0; i < width; i++) {
2431− for (j = 0; j < height; j++) {
2416+ for (int i = 0; i < width; i++) {
2417+ for (int j = 0; j < height; j++) {
24322418 uint16_t *u = s->u[p] + (j * uv_linesize + i) * elements;
24332419 uint16_t *v = s->v[p] + (j * uv_linesize + i) * elements;
24342420 int16_t *ker = s->ker[p] + (j * uv_linesize + i) * elements;
@@ -2482,9 +2468,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) · 47 unmodified lines
24822468 static av_cold void uninit(AVFilterContext *ctx)
24832469 {
24842470 V360Context *s = ctx->priv;
2485− int p;
24862471
2487− for (p = 0; p < s->nb_allocated; p++) {
2472+ for (int p = 0; p < s->nb_allocated; p++) {
24882473 av_freep(&s->u[p]);
24892474 av_freep(&s->v[p]);
24902475 av_freep(&s->ker[p]);

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