History

avfilter/vf_v360: simplify code which handles interpolation points

Paul B Mahol committed 6 years ago

Commit 31ecfa91 parent 9b222541 file · +74 −74Browse files

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

Unified · Split

libavfilter/vf_v360.c+74−74
@@ -1279,10 +1279,10 @@ static int xyz_to_cube3x2(const V360Context *s, · 1278 unmodified lines
12791279 *du = uf - ui;
12801280 *dv = vf - vi;
12811281
1282− for (int i = -1; i < 3; i++) {
1283− for (int j = -1; j < 3; j++) {
1284− int new_ui = ui + j;
1285− int new_vi = vi + i;
1282+ for (int i = 0; i < 4; i++) {
1283+ for (int j = 0; j < 4; j++) {
1284+ int new_ui = ui + j - 1;
1285+ int new_vi = vi + i - 1;
12861286 int u_shift, v_shift;
12871287 int new_ewi, new_ehi;
12881288
@@ -1316,8 +1316,8 @@ static int xyz_to_cube3x2(const V360Context *s, · 27 unmodified lines
13161316 new_vi = av_clip(lrintf(0.5f * new_ehi * (vf + 1.f)), 0, new_ehi - 1);
13171317 }
13181318
1319− us[i + 1][j + 1] = u_shift + new_ui;
1320− vs[i + 1][j + 1] = v_shift + new_vi;
1319+ us[i][j] = u_shift + new_ui;
1320+ vs[i][j] = v_shift + new_vi;
13211321 }
13221322 }
13231323
@@ -1432,10 +1432,10 @@ static int xyz_to_cube1x6(const V360Context *s, · 108 unmodified lines
14321432 *du = uf - ui;
14331433 *dv = vf - vi;
14341434
1435− for (int i = -1; i < 3; i++) {
1436− for (int j = -1; j < 3; j++) {
1437− int new_ui = ui + j;
1438− int new_vi = vi + i;
1435+ for (int i = 0; i < 4; i++) {
1436+ for (int j = 0; j < 4; j++) {
1437+ int new_ui = ui + j - 1;
1438+ int new_vi = vi + i - 1;
14391439 int v_shift;
14401440 int new_ehi;
14411441
@@ -1462,8 +1462,8 @@ static int xyz_to_cube1x6(const V360Context *s, · 20 unmodified lines
14621462 new_vi = av_clip(lrintf(0.5f * new_ehi * (vf + 1.f)), 0, new_ehi - 1);
14631463 }
14641464
1465− us[i + 1][j + 1] = new_ui;
1466− vs[i + 1][j + 1] = v_shift + new_vi;
1465+ us[i][j] = new_ui;
1466+ vs[i][j] = v_shift + new_vi;
14671467 }
14681468 }
14691469
@@ -1512,10 +1512,10 @@ static int xyz_to_cube6x1(const V360Context *s, · 42 unmodified lines
15121512 *du = uf - ui;
15131513 *dv = vf - vi;
15141514
1515− for (int i = -1; i < 3; i++) {
1516− for (int j = -1; j < 3; j++) {
1517− int new_ui = ui + j;
1518− int new_vi = vi + i;
1515+ for (int i = 0; i < 4; i++) {
1516+ for (int j = 0; j < 4; j++) {
1517+ int new_ui = ui + j - 1;
1518+ int new_vi = vi + i - 1;
15191519 int u_shift;
15201520 int new_ewi;
15211521
@@ -1542,8 +1542,8 @@ static int xyz_to_cube6x1(const V360Context *s, · 20 unmodified lines
15421542 new_vi = av_clip(lrintf(0.5f * ehi * (vf + 1.f)), 0, ehi - 1);
15431543 }
15441544
1545− us[i + 1][j + 1] = u_shift + new_ui;
1546− vs[i + 1][j + 1] = new_vi;
1545+ us[i][j] = u_shift + new_ui;
1546+ vs[i][j] = new_vi;
15471547 }
15481548 }
15491549
@@ -1671,10 +1671,10 @@ static int xyz_to_stereographic(const V360Context *s, · 121 unmodified lines
16711671 *du = visible ? uf - ui : 0.f;
16721672 *dv = visible ? vf - vi : 0.f;
16731673
1674− for (int i = -1; i < 3; i++) {
1675− for (int j = -1; j < 3; j++) {
1676− us[i + 1][j + 1] = visible ? av_clip(ui + j, 0, width - 1) : 0;
1677− vs[i + 1][j + 1] = visible ? av_clip(vi + i, 0, height - 1) : 0;
1674+ for (int i = 0; i < 4; i++) {
1675+ for (int j = 0; j < 4; j++) {
1676+ us[i][j] = visible ? av_clip(ui + j - 1, 0, width - 1) : 0;
1677+ vs[i][j] = visible ? av_clip(vi + i - 1, 0, height - 1) : 0;
16781678 }
16791679 }
16801680
@@ -1710,10 +1710,10 @@ static int xyz_to_equirect(const V360Context *s, · 29 unmodified lines
17101710 *du = uf - ui;
17111711 *dv = vf - vi;
17121712
1713− for (int i = -1; i < 3; i++) {
1714− for (int j = -1; j < 3; j++) {
1715− us[i + 1][j + 1] = mod(ui + j, width);
1716− vs[i + 1][j + 1] = av_clip(vi + i, 0, height - 1);
1713+ for (int i = 0; i < 4; i++) {
1714+ for (int j = 0; j < 4; j++) {
1715+ us[i][j] = mod(ui + j - 1, width);
1716+ vs[i][j] = av_clip(vi + i - 1, 0, height - 1);
17171717 }
17181718 }
17191719
@@ -1774,10 +1774,10 @@ static int xyz_to_flat(const V360Context *s, · 54 unmodified lines
17741774 *du = uf - ui;
17751775 *dv = vf - vi;
17761776
1777− for (int i = -1; i < 3; i++) {
1778− for (int j = -1; j < 3; j++) {
1779− us[i + 1][j + 1] = visible ? av_clip(ui + j, 0, width - 1) : 0;
1780− vs[i + 1][j + 1] = visible ? av_clip(vi + i, 0, height - 1) : 0;
1777+ for (int i = 0; i < 4; i++) {
1778+ for (int j = 0; j < 4; j++) {
1779+ us[i][j] = visible ? av_clip(ui + j - 1, 0, width - 1) : 0;
1780+ vs[i][j] = visible ? av_clip(vi + i - 1, 0, height - 1) : 0;
17811781 }
17821782 }
17831783
@@ -1813,10 +1813,10 @@ static int xyz_to_mercator(const V360Context *s, · 29 unmodified lines
18131813 *du = uf - ui;
18141814 *dv = vf - vi;
18151815
1816− for (int i = -1; i < 3; i++) {
1817− for (int j = -1; j < 3; j++) {
1818− us[i + 1][j + 1] = av_clip(ui + j, 0, width - 1);
1819− vs[i + 1][j + 1] = av_clip(vi + i, 0, height - 1);
1816+ for (int i = 0; i < 4; i++) {
1817+ for (int j = 0; j < 4; j++) {
1818+ us[i][j] = av_clip(ui + j - 1, 0, width - 1);
1819+ vs[i][j] = av_clip(vi + i - 1, 0, height - 1);
18201820 }
18211821 }
18221822
@@ -1883,10 +1883,10 @@ static int xyz_to_ball(const V360Context *s, · 60 unmodified lines
18831883 *du = uf - ui;
18841884 *dv = vf - vi;
18851885
1886− for (int i = -1; i < 3; i++) {
1887− for (int j = -1; j < 3; j++) {
1888− us[i + 1][j + 1] = av_clip(ui + j, 0, width - 1);
1889− vs[i + 1][j + 1] = av_clip(vi + i, 0, height - 1);
1886+ for (int i = 0; i < 4; i++) {
1887+ for (int j = 0; j < 4; j++) {
1888+ us[i][j] = av_clip(ui + j - 1, 0, width - 1);
1889+ vs[i][j] = av_clip(vi + i - 1, 0, height - 1);
18901890 }
18911891 }
18921892
@@ -1998,10 +1998,10 @@ static int xyz_to_hammer(const V360Context *s, · 105 unmodified lines
19981998 *du = uf - ui;
19991999 *dv = vf - vi;
20002000
2001− for (int i = -1; i < 3; i++) {
2002− for (int j = -1; j < 3; j++) {
2003− us[i + 1][j + 1] = av_clip(ui + j, 0, width - 1);
2004− vs[i + 1][j + 1] = av_clip(vi + i, 0, height - 1);
2001+ for (int i = 0; i < 4; i++) {
2002+ for (int j = 0; j < 4; j++) {
2003+ us[i][j] = av_clip(ui + j - 1, 0, width - 1);
2004+ vs[i][j] = av_clip(vi + i - 1, 0, height - 1);
20052005 }
20062006 }
20072007
@@ -2068,10 +2068,10 @@ static int xyz_to_sinusoidal(const V360Context *s, · 60 unmodified lines
20682068 *du = uf - ui;
20692069 *dv = vf - vi;
20702070
2071− for (int i = -1; i < 3; i++) {
2072− for (int j = -1; j < 3; j++) {
2073− us[i + 1][j + 1] = av_clip(ui + j, 0, width - 1);
2074− vs[i + 1][j + 1] = av_clip(vi + i, 0, height - 1);
2071+ for (int i = 0; i < 4; i++) {
2072+ for (int j = 0; j < 4; j++) {
2073+ us[i][j] = av_clip(ui + j - 1, 0, width - 1);
2074+ vs[i][j] = av_clip(vi + i - 1, 0, height - 1);
20752075 }
20762076 }
20772077
@@ -2319,10 +2319,10 @@ static int xyz_to_eac(const V360Context *s, · 241 unmodified lines
23192319 *du = uf - ui;
23202320 *dv = vf - vi;
23212321
2322− for (int i = -1; i < 3; i++) {
2323− for (int j = -1; j < 3; j++) {
2324− us[i + 1][j + 1] = av_clip(ui + j, 0, width - 1);
2325− vs[i + 1][j + 1] = av_clip(vi + i, 0, height - 1);
2322+ for (int i = 0; i < 4; i++) {
2323+ for (int j = 0; j < 4; j++) {
2324+ us[i][j] = av_clip(ui + j - 1, 0, width - 1);
2325+ vs[i][j] = av_clip(vi + i - 1, 0, height - 1);
23262326 }
23272327 }
23282328
@@ -2469,10 +2469,10 @@ static int xyz_to_fisheye(const V360Context *s, · 140 unmodified lines
24692469 *du = visible ? uf - ui : 0.f;
24702470 *dv = visible ? vf - vi : 0.f;
24712471
2472− for (int i = -1; i < 3; i++) {
2473− for (int j = -1; j < 3; j++) {
2474− us[i + 1][j + 1] = visible ? av_clip(ui + j, 0, width - 1) : 0;
2475− vs[i + 1][j + 1] = visible ? av_clip(vi + i, 0, height - 1) : 0;
2472+ for (int i = 0; i < 4; i++) {
2473+ for (int j = 0; j < 4; j++) {
2474+ us[i][j] = visible ? av_clip(ui + j - 1, 0, width - 1) : 0;
2475+ vs[i][j] = visible ? av_clip(vi + i - 1, 0, height - 1) : 0;
24762476 }
24772477 }
24782478
@@ -2614,10 +2614,10 @@ static int xyz_to_cylindrical(const V360Context *s, · 135 unmodified lines
26142614 *du = uf - ui;
26152615 *dv = vf - vi;
26162616
2617− for (int i = -1; i < 3; i++) {
2618− for (int j = -1; j < 3; j++) {
2619− us[i + 1][j + 1] = visible ? av_clip(ui + j, 0, width - 1) : 0;
2620− vs[i + 1][j + 1] = visible ? av_clip(vi + i, 0, height - 1) : 0;
2617+ for (int i = 0; i < 4; i++) {
2618+ for (int j = 0; j < 4; j++) {
2619+ us[i][j] = visible ? av_clip(ui + j - 1, 0, width - 1) : 0;
2620+ vs[i][j] = visible ? av_clip(vi + i - 1, 0, height - 1) : 0;
26212621 }
26222622 }
26232623
@@ -2747,10 +2747,10 @@ static int xyz_to_tetrahedron(const V360Context *s, · 123 unmodified lines
27472747 *du = uf - ui;
27482748 *dv = vf - vi;
27492749
2750− for (int i = -1; i < 3; i++) {
2751− for (int j = -1; j < 3; j++) {
2752− us[i + 1][j + 1] = mod(ui + j, width);
2753− vs[i + 1][j + 1] = av_clip(vi + i, 0, height - 1);
2750+ for (int i = 0; i < 4; i++) {
2751+ for (int j = 0; j < 4; j++) {
2752+ us[i][j] = mod(ui + j - 1, width);
2753+ vs[i][j] = av_clip(vi + i - 1, 0, height - 1);
27542754 }
27552755 }
27562756
@@ -2842,10 +2842,10 @@ static int xyz_to_dfisheye(const V360Context *s, · 85 unmodified lines
28422842 *du = uf - ui;
28432843 *dv = vf - vi;
28442844
2845− for (int i = -1; i < 3; i++) {
2846− for (int j = -1; j < 3; j++) {
2847− us[i + 1][j + 1] = av_clip(u_shift + ui + j, 0, width - 1);
2848− vs[i + 1][j + 1] = av_clip( vi + i, 0, height - 1);
2845+ for (int i = 0; i < 4; i++) {
2846+ for (int j = 0; j < 4; j++) {
2847+ us[i][j] = av_clip(u_shift + ui + j - 1, 0, width - 1);
2848+ vs[i][j] = av_clip( vi + i - 1, 0, height - 1);
28492849 }
28502850 }
28512851
@@ -2989,10 +2989,10 @@ static int xyz_to_barrel(const V360Context *s, · 137 unmodified lines
29892989 *du = uf - ui;
29902990 *dv = vf - vi;
29912991
2992− for (int i = -1; i < 3; i++) {
2993− for (int j = -1; j < 3; j++) {
2994− us[i + 1][j + 1] = u_shift + av_clip(ui + j, 0, ew - 1);
2995− vs[i + 1][j + 1] = v_shift + av_clip(vi + i, 0, eh - 1);
2992+ for (int i = 0; i < 4; i++) {
2993+ for (int j = 0; j < 4; j++) {
2994+ us[i][j] = u_shift + av_clip(ui + j - 1, 0, ew - 1);
2995+ vs[i][j] = v_shift + av_clip(vi + i - 1, 0, eh - 1);
29962996 }
29972997 }
29982998
@@ -3088,10 +3088,10 @@ static int xyz_to_barrelsplit(const V360Context *s, · 89 unmodified lines
30883088 *du = uf - ui;
30893089 *dv = vf - vi;
30903090
3091− for (int i = -1; i < 3; i++) {
3092− for (int j = -1; j < 3; j++) {
3093− us[i + 1][j + 1] = u_shift + av_clip(ui + j, 0, ew - 1);
3094− vs[i + 1][j + 1] = v_shift + av_clip(vi + i, 0, eh - 1);
3091+ for (int i = 0; i < 4; i++) {
3092+ for (int j = 0; j < 4; j++) {
3093+ us[i][j] = u_shift + av_clip(ui + j - 1, 0, ew - 1);
3094+ vs[i][j] = v_shift + av_clip(vi + i - 1, 0, eh - 1);
30953095 }
30963096 }
30973097

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