Unified · Split
| @@ -1279,10 +1279,10 @@ static int xyz_to_cube3x2(const V360Context *s, · 1278 unmodified lines | |||
| 1279 | *du = uf - ui; | 1279 | *du = uf - ui; |
| 1280 | *dv = vf - vi; | 1280 | *dv = vf - vi; |
| 1281 | 1281 | ||
| 1282 | for (int i = -1; i < 3; i++) { | 1282 | for (int i = 0; i < 4; i++) { |
| 1283 | for (int j = -1; j < 3; j++) { | 1283 | for (int j = 0; j < 4; j++) { |
| 1284 | int new_ui = ui + j; | 1284 | int new_ui = ui + j - 1; |
| 1285 | int new_vi = vi + i; | 1285 | int new_vi = vi + i - 1; |
| 1286 | int u_shift, v_shift; | 1286 | int u_shift, v_shift; |
| 1287 | int new_ewi, new_ehi; | 1287 | int new_ewi, new_ehi; |
| 1288 | 1288 | ||
| @@ -1316,8 +1316,8 @@ static int xyz_to_cube3x2(const V360Context *s, · 27 unmodified lines | |||
| 1316 | new_vi = av_clip(lrintf(0.5f * new_ehi * (vf + 1.f)), 0, new_ehi - 1); | 1316 | new_vi = av_clip(lrintf(0.5f * new_ehi * (vf + 1.f)), 0, new_ehi - 1); |
| 1317 | } | 1317 | } |
| 1318 | 1318 | ||
| 1319 | us[i + 1][j + 1] = u_shift + new_ui; | 1319 | us[i][j] = u_shift + new_ui; |
| 1320 | vs[i + 1][j + 1] = v_shift + new_vi; | 1320 | vs[i][j] = v_shift + new_vi; |
| 1321 | } | 1321 | } |
| 1322 | } | 1322 | } |
| 1323 | 1323 | ||
| @@ -1432,10 +1432,10 @@ static int xyz_to_cube1x6(const V360Context *s, · 108 unmodified lines | |||
| 1432 | *du = uf - ui; | 1432 | *du = uf - ui; |
| 1433 | *dv = vf - vi; | 1433 | *dv = vf - vi; |
| 1434 | 1434 | ||
| 1435 | for (int i = -1; i < 3; i++) { | 1435 | for (int i = 0; i < 4; i++) { |
| 1436 | for (int j = -1; j < 3; j++) { | 1436 | for (int j = 0; j < 4; j++) { |
| 1437 | int new_ui = ui + j; | 1437 | int new_ui = ui + j - 1; |
| 1438 | int new_vi = vi + i; | 1438 | int new_vi = vi + i - 1; |
| 1439 | int v_shift; | 1439 | int v_shift; |
| 1440 | int new_ehi; | 1440 | int new_ehi; |
| 1441 | 1441 | ||
| @@ -1462,8 +1462,8 @@ static int xyz_to_cube1x6(const V360Context *s, · 20 unmodified lines | |||
| 1462 | new_vi = av_clip(lrintf(0.5f * new_ehi * (vf + 1.f)), 0, new_ehi - 1); | 1462 | new_vi = av_clip(lrintf(0.5f * new_ehi * (vf + 1.f)), 0, new_ehi - 1); |
| 1463 | } | 1463 | } |
| 1464 | 1464 | ||
| 1465 | us[i + 1][j + 1] = new_ui; | 1465 | us[i][j] = new_ui; |
| 1466 | vs[i + 1][j + 1] = v_shift + new_vi; | 1466 | vs[i][j] = v_shift + new_vi; |
| 1467 | } | 1467 | } |
| 1468 | } | 1468 | } |
| 1469 | 1469 | ||
| @@ -1512,10 +1512,10 @@ static int xyz_to_cube6x1(const V360Context *s, · 42 unmodified lines | |||
| 1512 | *du = uf - ui; | 1512 | *du = uf - ui; |
| 1513 | *dv = vf - vi; | 1513 | *dv = vf - vi; |
| 1514 | 1514 | ||
| 1515 | for (int i = -1; i < 3; i++) { | 1515 | for (int i = 0; i < 4; i++) { |
| 1516 | for (int j = -1; j < 3; j++) { | 1516 | for (int j = 0; j < 4; j++) { |
| 1517 | int new_ui = ui + j; | 1517 | int new_ui = ui + j - 1; |
| 1518 | int new_vi = vi + i; | 1518 | int new_vi = vi + i - 1; |
| 1519 | int u_shift; | 1519 | int u_shift; |
| 1520 | int new_ewi; | 1520 | int new_ewi; |
| 1521 | 1521 | ||
| @@ -1542,8 +1542,8 @@ static int xyz_to_cube6x1(const V360Context *s, · 20 unmodified lines | |||
| 1542 | new_vi = av_clip(lrintf(0.5f * ehi * (vf + 1.f)), 0, ehi - 1); | 1542 | new_vi = av_clip(lrintf(0.5f * ehi * (vf + 1.f)), 0, ehi - 1); |
| 1543 | } | 1543 | } |
| 1544 | 1544 | ||
| 1545 | us[i + 1][j + 1] = u_shift + new_ui; | 1545 | us[i][j] = u_shift + new_ui; |
| 1546 | vs[i + 1][j + 1] = new_vi; | 1546 | vs[i][j] = new_vi; |
| 1547 | } | 1547 | } |
| 1548 | } | 1548 | } |
| 1549 | 1549 | ||
| @@ -1671,10 +1671,10 @@ static int xyz_to_stereographic(const V360Context *s, · 121 unmodified lines | |||
| 1671 | *du = visible ? uf - ui : 0.f; | 1671 | *du = visible ? uf - ui : 0.f; |
| 1672 | *dv = visible ? vf - vi : 0.f; | 1672 | *dv = visible ? vf - vi : 0.f; |
| 1673 | 1673 | ||
| 1674 | for (int i = -1; i < 3; i++) { | 1674 | for (int i = 0; i < 4; i++) { |
| 1675 | for (int j = -1; j < 3; j++) { | 1675 | for (int j = 0; j < 4; j++) { |
| 1676 | us[i + 1][j + 1] = visible ? av_clip(ui + j, 0, width - 1) : 0; | 1676 | us[i][j] = visible ? av_clip(ui + j - 1, 0, width - 1) : 0; |
| 1677 | vs[i + 1][j + 1] = visible ? av_clip(vi + i, 0, height - 1) : 0; | 1677 | vs[i][j] = visible ? av_clip(vi + i - 1, 0, height - 1) : 0; |
| 1678 | } | 1678 | } |
| 1679 | } | 1679 | } |
| 1680 | 1680 | ||
| @@ -1710,10 +1710,10 @@ static int xyz_to_equirect(const V360Context *s, · 29 unmodified lines | |||
| 1710 | *du = uf - ui; | 1710 | *du = uf - ui; |
| 1711 | *dv = vf - vi; | 1711 | *dv = vf - vi; |
| 1712 | 1712 | ||
| 1713 | for (int i = -1; i < 3; i++) { | 1713 | for (int i = 0; i < 4; i++) { |
| 1714 | for (int j = -1; j < 3; j++) { | 1714 | for (int j = 0; j < 4; j++) { |
| 1715 | us[i + 1][j + 1] = mod(ui + j, width); | 1715 | us[i][j] = mod(ui + j - 1, width); |
| 1716 | vs[i + 1][j + 1] = av_clip(vi + i, 0, height - 1); | 1716 | vs[i][j] = av_clip(vi + i - 1, 0, height - 1); |
| 1717 | } | 1717 | } |
| 1718 | } | 1718 | } |
| 1719 | 1719 | ||
| @@ -1774,10 +1774,10 @@ static int xyz_to_flat(const V360Context *s, · 54 unmodified lines | |||
| 1774 | *du = uf - ui; | 1774 | *du = uf - ui; |
| 1775 | *dv = vf - vi; | 1775 | *dv = vf - vi; |
| 1776 | 1776 | ||
| 1777 | for (int i = -1; i < 3; i++) { | 1777 | for (int i = 0; i < 4; i++) { |
| 1778 | for (int j = -1; j < 3; j++) { | 1778 | for (int j = 0; j < 4; j++) { |
| 1779 | us[i + 1][j + 1] = visible ? av_clip(ui + j, 0, width - 1) : 0; | 1779 | us[i][j] = visible ? av_clip(ui + j - 1, 0, width - 1) : 0; |
| 1780 | vs[i + 1][j + 1] = visible ? av_clip(vi + i, 0, height - 1) : 0; | 1780 | vs[i][j] = visible ? av_clip(vi + i - 1, 0, height - 1) : 0; |
| 1781 | } | 1781 | } |
| 1782 | } | 1782 | } |
| 1783 | 1783 | ||
| @@ -1813,10 +1813,10 @@ static int xyz_to_mercator(const V360Context *s, · 29 unmodified lines | |||
| 1813 | *du = uf - ui; | 1813 | *du = uf - ui; |
| 1814 | *dv = vf - vi; | 1814 | *dv = vf - vi; |
| 1815 | 1815 | ||
| 1816 | for (int i = -1; i < 3; i++) { | 1816 | for (int i = 0; i < 4; i++) { |
| 1817 | for (int j = -1; j < 3; j++) { | 1817 | for (int j = 0; j < 4; j++) { |
| 1818 | us[i + 1][j + 1] = av_clip(ui + j, 0, width - 1); | 1818 | us[i][j] = av_clip(ui + j - 1, 0, width - 1); |
| 1819 | vs[i + 1][j + 1] = av_clip(vi + i, 0, height - 1); | 1819 | vs[i][j] = av_clip(vi + i - 1, 0, height - 1); |
| 1820 | } | 1820 | } |
| 1821 | } | 1821 | } |
| 1822 | 1822 | ||
| @@ -1883,10 +1883,10 @@ static int xyz_to_ball(const V360Context *s, · 60 unmodified lines | |||
| 1883 | *du = uf - ui; | 1883 | *du = uf - ui; |
| 1884 | *dv = vf - vi; | 1884 | *dv = vf - vi; |
| 1885 | 1885 | ||
| 1886 | for (int i = -1; i < 3; i++) { | 1886 | for (int i = 0; i < 4; i++) { |
| 1887 | for (int j = -1; j < 3; j++) { | 1887 | for (int j = 0; j < 4; j++) { |
| 1888 | us[i + 1][j + 1] = av_clip(ui + j, 0, width - 1); | 1888 | us[i][j] = av_clip(ui + j - 1, 0, width - 1); |
| 1889 | vs[i + 1][j + 1] = av_clip(vi + i, 0, height - 1); | 1889 | vs[i][j] = av_clip(vi + i - 1, 0, height - 1); |
| 1890 | } | 1890 | } |
| 1891 | } | 1891 | } |
| 1892 | 1892 | ||
| @@ -1998,10 +1998,10 @@ static int xyz_to_hammer(const V360Context *s, · 105 unmodified lines | |||
| 1998 | *du = uf - ui; | 1998 | *du = uf - ui; |
| 1999 | *dv = vf - vi; | 1999 | *dv = vf - vi; |
| 2000 | 2000 | ||
| 2001 | for (int i = -1; i < 3; i++) { | 2001 | for (int i = 0; i < 4; i++) { |
| 2002 | for (int j = -1; j < 3; j++) { | 2002 | for (int j = 0; j < 4; j++) { |
| 2003 | us[i + 1][j + 1] = av_clip(ui + j, 0, width - 1); | 2003 | us[i][j] = av_clip(ui + j - 1, 0, width - 1); |
| 2004 | vs[i + 1][j + 1] = av_clip(vi + i, 0, height - 1); | 2004 | vs[i][j] = av_clip(vi + i - 1, 0, height - 1); |
| 2005 | } | 2005 | } |
| 2006 | } | 2006 | } |
| 2007 | 2007 | ||
| @@ -2068,10 +2068,10 @@ static int xyz_to_sinusoidal(const V360Context *s, · 60 unmodified lines | |||
| 2068 | *du = uf - ui; | 2068 | *du = uf - ui; |
| 2069 | *dv = vf - vi; | 2069 | *dv = vf - vi; |
| 2070 | 2070 | ||
| 2071 | for (int i = -1; i < 3; i++) { | 2071 | for (int i = 0; i < 4; i++) { |
| 2072 | for (int j = -1; j < 3; j++) { | 2072 | for (int j = 0; j < 4; j++) { |
| 2073 | us[i + 1][j + 1] = av_clip(ui + j, 0, width - 1); | 2073 | us[i][j] = av_clip(ui + j - 1, 0, width - 1); |
| 2074 | vs[i + 1][j + 1] = av_clip(vi + i, 0, height - 1); | 2074 | vs[i][j] = av_clip(vi + i - 1, 0, height - 1); |
| 2075 | } | 2075 | } |
| 2076 | } | 2076 | } |
| 2077 | 2077 | ||
| @@ -2319,10 +2319,10 @@ static int xyz_to_eac(const V360Context *s, · 241 unmodified lines | |||
| 2319 | *du = uf - ui; | 2319 | *du = uf - ui; |
| 2320 | *dv = vf - vi; | 2320 | *dv = vf - vi; |
| 2321 | 2321 | ||
| 2322 | for (int i = -1; i < 3; i++) { | 2322 | for (int i = 0; i < 4; i++) { |
| 2323 | for (int j = -1; j < 3; j++) { | 2323 | for (int j = 0; j < 4; j++) { |
| 2324 | us[i + 1][j + 1] = av_clip(ui + j, 0, width - 1); | 2324 | us[i][j] = av_clip(ui + j - 1, 0, width - 1); |
| 2325 | vs[i + 1][j + 1] = av_clip(vi + i, 0, height - 1); | 2325 | vs[i][j] = av_clip(vi + i - 1, 0, height - 1); |
| 2326 | } | 2326 | } |
| 2327 | } | 2327 | } |
| 2328 | 2328 | ||
| @@ -2469,10 +2469,10 @@ static int xyz_to_fisheye(const V360Context *s, · 140 unmodified lines | |||
| 2469 | *du = visible ? uf - ui : 0.f; | 2469 | *du = visible ? uf - ui : 0.f; |
| 2470 | *dv = visible ? vf - vi : 0.f; | 2470 | *dv = visible ? vf - vi : 0.f; |
| 2471 | 2471 | ||
| 2472 | for (int i = -1; i < 3; i++) { | 2472 | for (int i = 0; i < 4; i++) { |
| 2473 | for (int j = -1; j < 3; j++) { | 2473 | for (int j = 0; j < 4; j++) { |
| 2474 | us[i + 1][j + 1] = visible ? av_clip(ui + j, 0, width - 1) : 0; | 2474 | us[i][j] = visible ? av_clip(ui + j - 1, 0, width - 1) : 0; |
| 2475 | vs[i + 1][j + 1] = visible ? av_clip(vi + i, 0, height - 1) : 0; | 2475 | vs[i][j] = visible ? av_clip(vi + i - 1, 0, height - 1) : 0; |
| 2476 | } | 2476 | } |
| 2477 | } | 2477 | } |
| 2478 | 2478 | ||
| @@ -2614,10 +2614,10 @@ static int xyz_to_cylindrical(const V360Context *s, · 135 unmodified lines | |||
| 2614 | *du = uf - ui; | 2614 | *du = uf - ui; |
| 2615 | *dv = vf - vi; | 2615 | *dv = vf - vi; |
| 2616 | 2616 | ||
| 2617 | for (int i = -1; i < 3; i++) { | 2617 | for (int i = 0; i < 4; i++) { |
| 2618 | for (int j = -1; j < 3; j++) { | 2618 | for (int j = 0; j < 4; j++) { |
| 2619 | us[i + 1][j + 1] = visible ? av_clip(ui + j, 0, width - 1) : 0; | 2619 | us[i][j] = visible ? av_clip(ui + j - 1, 0, width - 1) : 0; |
| 2620 | vs[i + 1][j + 1] = visible ? av_clip(vi + i, 0, height - 1) : 0; | 2620 | vs[i][j] = visible ? av_clip(vi + i - 1, 0, height - 1) : 0; |
| 2621 | } | 2621 | } |
| 2622 | } | 2622 | } |
| 2623 | 2623 | ||
| @@ -2747,10 +2747,10 @@ static int xyz_to_tetrahedron(const V360Context *s, · 123 unmodified lines | |||
| 2747 | *du = uf - ui; | 2747 | *du = uf - ui; |
| 2748 | *dv = vf - vi; | 2748 | *dv = vf - vi; |
| 2749 | 2749 | ||
| 2750 | for (int i = -1; i < 3; i++) { | 2750 | for (int i = 0; i < 4; i++) { |
| 2751 | for (int j = -1; j < 3; j++) { | 2751 | for (int j = 0; j < 4; j++) { |
| 2752 | us[i + 1][j + 1] = mod(ui + j, width); | 2752 | us[i][j] = mod(ui + j - 1, width); |
| 2753 | vs[i + 1][j + 1] = av_clip(vi + i, 0, height - 1); | 2753 | vs[i][j] = av_clip(vi + i - 1, 0, height - 1); |
| 2754 | } | 2754 | } |
| 2755 | } | 2755 | } |
| 2756 | 2756 | ||
| @@ -2842,10 +2842,10 @@ static int xyz_to_dfisheye(const V360Context *s, · 85 unmodified lines | |||
| 2842 | *du = uf - ui; | 2842 | *du = uf - ui; |
| 2843 | *dv = vf - vi; | 2843 | *dv = vf - vi; |
| 2844 | 2844 | ||
| 2845 | for (int i = -1; i < 3; i++) { | 2845 | for (int i = 0; i < 4; i++) { |
| 2846 | for (int j = -1; j < 3; j++) { | 2846 | for (int j = 0; j < 4; j++) { |
| 2847 | us[i + 1][j + 1] = av_clip(u_shift + ui + j, 0, width - 1); | 2847 | us[i][j] = av_clip(u_shift + ui + j - 1, 0, width - 1); |
| 2848 | vs[i + 1][j + 1] = av_clip( vi + i, 0, height - 1); | 2848 | vs[i][j] = av_clip( vi + i - 1, 0, height - 1); |
| 2849 | } | 2849 | } |
| 2850 | } | 2850 | } |
| 2851 | 2851 | ||
| @@ -2989,10 +2989,10 @@ static int xyz_to_barrel(const V360Context *s, · 137 unmodified lines | |||
| 2989 | *du = uf - ui; | 2989 | *du = uf - ui; |
| 2990 | *dv = vf - vi; | 2990 | *dv = vf - vi; |
| 2991 | 2991 | ||
| 2992 | for (int i = -1; i < 3; i++) { | 2992 | for (int i = 0; i < 4; i++) { |
| 2993 | for (int j = -1; j < 3; j++) { | 2993 | for (int j = 0; j < 4; j++) { |
| 2994 | us[i + 1][j + 1] = u_shift + av_clip(ui + j, 0, ew - 1); | 2994 | us[i][j] = u_shift + av_clip(ui + j - 1, 0, ew - 1); |
| 2995 | vs[i + 1][j + 1] = v_shift + av_clip(vi + i, 0, eh - 1); | 2995 | vs[i][j] = v_shift + av_clip(vi + i - 1, 0, eh - 1); |
| 2996 | } | 2996 | } |
| 2997 | } | 2997 | } |
| 2998 | 2998 | ||
| @@ -3088,10 +3088,10 @@ static int xyz_to_barrelsplit(const V360Context *s, · 89 unmodified lines | |||
| 3088 | *du = uf - ui; | 3088 | *du = uf - ui; |
| 3089 | *dv = vf - vi; | 3089 | *dv = vf - vi; |
| 3090 | 3090 | ||
| 3091 | for (int i = -1; i < 3; i++) { | 3091 | for (int i = 0; i < 4; i++) { |
| 3092 | for (int j = -1; j < 3; j++) { | 3092 | for (int j = 0; j < 4; j++) { |
| 3093 | us[i + 1][j + 1] = u_shift + av_clip(ui + j, 0, ew - 1); | 3093 | us[i][j] = u_shift + av_clip(ui + j - 1, 0, ew - 1); |
| 3094 | vs[i + 1][j + 1] = v_shift + av_clip(vi + i, 0, eh - 1); | 3094 | vs[i][j] = v_shift + av_clip(vi + i - 1, 0, eh - 1); |
| 3095 | } | 3095 | } |
| 3096 | } | 3096 | } |
| 3097 | 3097 | ||