History

avfilter/vf_v360: add options to h/w unflip input video

Paul B Mahol committed 7 years ago

Commit 5b12a471 parent a06d7033 files · +73 −27Browse files

Showing the changes to libavfilter (2 of 3 files). Show all

Unified · Split

2 files
  1. libavfilter/v360.h +3 −0
  2. libavfilter/vf_v360.c +66 −27
libavfilter/v360.h+3−0
@@ -98,12 +98,15 @@ typedef struct V360Context { · 97 unmodified lines
9898
9999 float yaw, pitch, roll;
100100
101+ int ih_flip, iv_flip;
101102 int h_flip, v_flip, d_flip;
102103 int in_transpose, out_transpose;
103104
104105 float h_fov, v_fov;
105106 float flat_range[3];
106107
108+ float input_mirror_modifier[2];
109+
107110 int planewidth[4], planeheight[4];
108111 int inplanewidth[4], inplaneheight[4];
109112 int nb_planes;
libavfilter/vf_v360.c+66−27
@@ -96,6 +96,8 @@ static const AVOption v360_options[] = { · 95 unmodified lines
9696 { "h_flip", "flip out video horizontally", OFFSET(h_flip), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS, "h_flip"},
9797 { "v_flip", "flip out video vertically", OFFSET(v_flip), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS, "v_flip"},
9898 { "d_flip", "flip out video indepth", OFFSET(d_flip), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS, "d_flip"},
99+ { "ih_flip", "flip in video horizontally", OFFSET(ih_flip), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS, "ih_flip"},
100+ { "iv_flip", "flip in video vertically", OFFSET(iv_flip), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS, "iv_flip"},
99101 { "in_trans", "transpose video input", OFFSET(in_transpose), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS, "in_transpose"},
100102 { "out_trans", "transpose video output", OFFSET(out_transpose), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS, "out_transpose"},
101103 { NULL }
@@ -815,6 +817,9 @@ static void xyz_to_cube(const V360Context *s, · 713 unmodified lines
815817
816818 face = s->in_cubemap_face_order[*direction];
817819 rotate_cube_face(uf, vf, s->in_cubemap_face_rotation[face]);
820+
821+ (*uf) *= s->input_mirror_modifier[0];
822+ (*vf) *= s->input_mirror_modifier[1];
818823 }
819824
820825 /**
@@ -1125,7 +1130,6 @@ static void xyz_to_cube3x2(const V360Context *s, · 304 unmodified lines
11251130 new_vi = av_clip(roundf(0.5f * new_ehi * (vf + 1.f)), 0, new_ehi - 1);
11261131 }
11271132
1128−
11291133 us[i + 1][j + 1] = u_shift + new_ui;
11301134 vs[i + 1][j + 1] = v_shift + new_vi;
11311135 }
@@ -1259,7 +1263,6 @@ static void xyz_to_cube1x6(const V360Context *s, · 127 unmodified lines
12591263 new_vi = av_clip(roundf(0.5f * new_ehi * (vf + 1.f)), 0, new_ehi - 1);
12601264 }
12611265
1262−
12631266 us[i + 1][j + 1] = new_ui;
12641267 vs[i + 1][j + 1] = v_shift + new_vi;
12651268 }
@@ -1337,7 +1340,6 @@ static void xyz_to_cube6x1(const V360Context *s, · 71 unmodified lines
13371340 new_vi = av_clip(roundf(0.5f * ehi * (vf + 1.f)), 0, ehi - 1);
13381341 }
13391342
1340−
13411343 us[i + 1][j + 1] = u_shift + new_ui;
13421344 vs[i + 1][j + 1] = new_vi;
13431345 }
@@ -1387,8 +1389,8 @@ static void xyz_to_equirect(const V360Context *s, · 43 unmodified lines
13871389 const float *vec, int width, int height,
13881390 uint16_t us[4][4], uint16_t vs[4][4], float *du, float *dv)
13891391 {
1390− const float phi = atan2f(vec[0], -vec[2]);
1391− const float theta = asinf(-vec[1]);
1392+ const float phi = atan2f(vec[0], -vec[2]) * s->input_mirror_modifier[0];
1393+ const float theta = asinf(-vec[1]) * s->input_mirror_modifier[1];
13921394 float uf, vf;
13931395 int ui, vi;
13941396 int i, j;
@@ -1420,19 +1422,51 @@ static int prepare_eac_in(AVFilterContext *ctx) · 25 unmodified lines
14201422 {
14211423 V360Context *s = ctx->priv;
14221424
1423− s->in_cubemap_face_order[RIGHT] = TOP_RIGHT;
1424− s->in_cubemap_face_order[LEFT] = TOP_LEFT;
1425− s->in_cubemap_face_order[UP] = BOTTOM_RIGHT;
1426− s->in_cubemap_face_order[DOWN] = BOTTOM_LEFT;
1427− s->in_cubemap_face_order[FRONT] = TOP_MIDDLE;
1428− s->in_cubemap_face_order[BACK] = BOTTOM_MIDDLE;
1425+ if (s->ih_flip && s->iv_flip) {
1426+ s->in_cubemap_face_order[RIGHT] = BOTTOM_LEFT;
1427+ s->in_cubemap_face_order[LEFT] = BOTTOM_RIGHT;
1428+ s->in_cubemap_face_order[UP] = TOP_LEFT;
1429+ s->in_cubemap_face_order[DOWN] = TOP_RIGHT;
1430+ s->in_cubemap_face_order[FRONT] = BOTTOM_MIDDLE;
1431+ s->in_cubemap_face_order[BACK] = TOP_MIDDLE;
1432+ } else if (s->ih_flip) {
1433+ s->in_cubemap_face_order[RIGHT] = TOP_LEFT;
1434+ s->in_cubemap_face_order[LEFT] = TOP_RIGHT;
1435+ s->in_cubemap_face_order[UP] = BOTTOM_LEFT;
1436+ s->in_cubemap_face_order[DOWN] = BOTTOM_RIGHT;
1437+ s->in_cubemap_face_order[FRONT] = TOP_MIDDLE;
1438+ s->in_cubemap_face_order[BACK] = BOTTOM_MIDDLE;
1439+ } else if (s->iv_flip) {
1440+ s->in_cubemap_face_order[RIGHT] = BOTTOM_RIGHT;
1441+ s->in_cubemap_face_order[LEFT] = BOTTOM_LEFT;
1442+ s->in_cubemap_face_order[UP] = TOP_RIGHT;
1443+ s->in_cubemap_face_order[DOWN] = TOP_LEFT;
1444+ s->in_cubemap_face_order[FRONT] = BOTTOM_MIDDLE;
1445+ s->in_cubemap_face_order[BACK] = TOP_MIDDLE;
1446+ } else {
1447+ s->in_cubemap_face_order[RIGHT] = TOP_RIGHT;
1448+ s->in_cubemap_face_order[LEFT] = TOP_LEFT;
1449+ s->in_cubemap_face_order[UP] = BOTTOM_RIGHT;
1450+ s->in_cubemap_face_order[DOWN] = BOTTOM_LEFT;
1451+ s->in_cubemap_face_order[FRONT] = TOP_MIDDLE;
1452+ s->in_cubemap_face_order[BACK] = BOTTOM_MIDDLE;
1453+ }
14291454
1430− s->in_cubemap_face_rotation[TOP_LEFT] = ROT_0;
1431− s->in_cubemap_face_rotation[TOP_MIDDLE] = ROT_0;
1432− s->in_cubemap_face_rotation[TOP_RIGHT] = ROT_0;
1433− s->in_cubemap_face_rotation[BOTTOM_LEFT] = ROT_270;
1434− s->in_cubemap_face_rotation[BOTTOM_MIDDLE] = ROT_90;
1435− s->in_cubemap_face_rotation[BOTTOM_RIGHT] = ROT_270;
1455+ if (s->iv_flip) {
1456+ s->in_cubemap_face_rotation[TOP_LEFT] = ROT_270;
1457+ s->in_cubemap_face_rotation[TOP_MIDDLE] = ROT_90;
1458+ s->in_cubemap_face_rotation[TOP_RIGHT] = ROT_270;
1459+ s->in_cubemap_face_rotation[BOTTOM_LEFT] = ROT_0;
1460+ s->in_cubemap_face_rotation[BOTTOM_MIDDLE] = ROT_0;
1461+ s->in_cubemap_face_rotation[BOTTOM_RIGHT] = ROT_0;
1462+ } else {
1463+ s->in_cubemap_face_rotation[TOP_LEFT] = ROT_0;
1464+ s->in_cubemap_face_rotation[TOP_MIDDLE] = ROT_0;
1465+ s->in_cubemap_face_rotation[TOP_RIGHT] = ROT_0;
1466+ s->in_cubemap_face_rotation[BOTTOM_LEFT] = ROT_270;
1467+ s->in_cubemap_face_rotation[BOTTOM_MIDDLE] = ROT_90;
1468+ s->in_cubemap_face_rotation[BOTTOM_RIGHT] = ROT_270;
1469+ }
14361470
14371471 return 0;
14381472 }
@@ -1694,8 +1728,8 @@ static void xyz_to_dfisheye(const V360Context *s, · 255 unmodified lines
16941728 const float ew = width / 2.f;
16951729 const float eh = height;
16961730
1697− const float phi = atan2f(-vec[1], -vec[0]);
1698− const float theta = acosf(fabsf(vec[2])) / M_PI;
1731+ const float phi = atan2f(-vec[1], -vec[0]) * s->input_mirror_modifier[0];
1732+ const float theta = acosf(fabsf(vec[2])) / M_PI * s->input_mirror_modifier[1];
16991733
17001734 float uf = (theta * cosf(phi) * scale + 0.5f) * ew;
17011735 float vf = (theta * sinf(phi) * scale + 0.5f) * eh;
@@ -1818,8 +1852,8 @@ static void xyz_to_barrel(const V360Context *s, · 116 unmodified lines
18181852 {
18191853 const float scale = 0.99f;
18201854
1821− const float phi = atan2f(vec[0], -vec[2]);
1822− const float theta = asinf(-vec[1]);
1855+ const float phi = atan2f(vec[0], -vec[2]) * s->input_mirror_modifier[0];
1856+ const float theta = asinf(-vec[1]) * s->input_mirror_modifier[1];
18231857 const float theta_range = M_PI / 4.f;
18241858
18251859 int ew, eh;
@@ -1832,7 +1866,7 @@ static void xyz_to_barrel(const V360Context *s, · 6 unmodified lines
18321866 ew = 4 * width / 5;
18331867 eh = height;
18341868
1835− u_shift = 0;
1869+ u_shift = s->ih_flip ? width / 5 : 0;
18361870 v_shift = 0;
18371871
18381872 uf = (phi / M_PI * scale + 1.f) * ew / 2.f;
@@ -1841,7 +1875,7 @@ static void xyz_to_barrel(const V360Context *s, · 2 unmodified lines
18411875 ew = width / 5;
18421876 eh = height / 2;
18431877
1844− u_shift = 4 * ew;
1878+ u_shift = s->ih_flip ? 0 : 4 * ew;
18451879
18461880 if (theta < 0.f) { // UP
18471881 uf = vec[0] / vec[1];
@@ -1853,6 +1887,9 @@ static void xyz_to_barrel(const V360Context *s, · 5 unmodified lines
18531887 v_shift = eh;
18541888 }
18551889
1890+ uf *= s->input_mirror_modifier[0] * s->input_mirror_modifier[1];
1891+ vf *= s->input_mirror_modifier[1];
1892+
18561893 uf = 0.5f * ew * (uf * scale + 1.f);
18571894 vf = 0.5f * eh * (vf * scale + 1.f);
18581895 }
@@ -1869,7 +1906,6 @@ static void xyz_to_barrel(const V360Context *s, · 10 unmodified lines
18691906 vs[i + 1][j + 1] = v_shift + av_clip(vi + i, 0, eh - 1);
18701907 }
18711908 }
1872−
18731909 }
18741910
18751911 static void multiply_matrix(float c[3][3], const float a[3][3], const float b[3][3])
@@ -1984,7 +2020,7 @@ static int config_output(AVFilterLink *outlink) · 108 unmodified lines
19842020 int err;
19852021 int p, h, w;
19862022 float hf, wf;
1987− float mirror_modifier[3];
2023+ float output_mirror_modifier[3];
19882024 void (*in_transform)(const V360Context *s,
19892025 const float *vec, int width, int height,
19902026 uint16_t us[4][4], uint16_t vs[4][4], float *du, float *dv);
@@ -1995,6 +2031,9 @@ static int config_output(AVFilterLink *outlink) · 4 unmodified lines
19952031 uint16_t *u, uint16_t *v, int16_t *ker);
19962032 float rot_mat[3][3];
19972033
2034+ s->input_mirror_modifier[0] = s->ih_flip ? -1.f : 1.f;
2035+ s->input_mirror_modifier[1] = s->iv_flip ? -1.f : 1.f;
2036+
19982037 switch (s->interp) {
19992038 case NEAREST:
20002039 calculate_kernel = nearest_kernel;
@@ -2212,7 +2251,7 @@ static int config_output(AVFilterLink *outlink) · 211 unmodified lines
22122251 }
22132252
22142253 calculate_rotation_matrix(s->yaw, s->pitch, s->roll, rot_mat, s->rotation_order);
2215− set_mirror_modifier(s->h_flip, s->v_flip, s->d_flip, mirror_modifier);
2254+ set_mirror_modifier(s->h_flip, s->v_flip, s->d_flip, output_mirror_modifier);
22162255
22172256 // Calculate remap data
22182257 for (p = 0; p < s->nb_allocated; p++) {
@@ -2236,7 +2275,7 @@ static int config_output(AVFilterLink *outlink) · 17 unmodified lines
22362275 else
22372276 out_transform(s, i, j, width, height, vec);
22382277 rotate(rot_mat, vec);
2239− mirror(mirror_modifier, vec);
2278+ mirror(output_mirror_modifier, vec);
22402279 if (s->in_transpose)
22412280 in_transform(s, vec, in_height, in_width, r_tmp.v, r_tmp.u, &du, &dv);
22422281 else

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