History

avfilter/vf_v360: add padding option for cubemap

Eugene Lyapustin committed 7 years ago

Commit d0442521 parent b26094e2 files · +93 −25Browse files

Unified · Split

2 files
  1. doc/filters.texi +16 −2
  2. libavfilter/vf_v360.c +77 −23
doc/filters.texi+16−2
@@ -17917,6 +17917,20 @@ Cubemap with 3x2/6x1 layout. · 17916 unmodified lines
1791717917 Format specific options:
1791817918
1791917919 @table @option
17920+@item in_pad
17921+@item out_pad
17922+Set padding proprtion for the input/output cubemap. Values in decimals.
17923+
17924+Example values:
17925+@table @samp
17926+@item 0
17927+No padding.
17928+@item 0.01
17929+1% of face is padding. For example, with 1920x1280 resolution face size would be 640x640 and padding would be 3 pixels from each side. (640 * 0.01 = 6 pixels)
17930+@end table
17931+
17932+Default value is @b{@samp{0}}.
17933+
1792017934 @item in_forder
1792117935 @item out_forder
1792217936 Set order of faces for the input/output cubemap. Choose one direction for each position.
@@ -18017,9 +18031,9 @@ Flip the output video horizontally/vertically/in-depth. Boolean values. · 94 unmodified lines
1801718031
1801818032 @itemize
1801918033 @item
18020−Convert equirectangular video to cubemap with 3x2 layout using bicubic interpolation:
18034+Convert equirectangular video to cubemap with 3x2 layout and 1% padding using bicubic interpolation:
1802118035 @example
18022−ffmpeg -i input.mkv -vf v360=e:c3x2:cubic output.mkv
18036+ffmpeg -i input.mkv -vf v360=e:c3x2:cubic:out_pad=0.01 output.mkv
1802318037 @end example
1802418038 @item
1802518039 Extract back view of Equi-Angular Cubemap:
libavfilter/vf_v360.c+77−23
@@ -102,6 +102,8 @@ typedef struct V360Context { · 101 unmodified lines
102102 int in_cubemap_face_rotation[6];
103103 int out_cubemap_face_rotation[6];
104104
105+ float in_pad, out_pad;
106+
105107 float yaw, pitch, roll;
106108
107109 int h_flip, v_flip, d_flip;
@@ -155,6 +157,8 @@ static const AVOption v360_options[] = { · 47 unmodified lines
155157 {"out_forder", "output cubemap face order", OFFSET(out_forder), AV_OPT_TYPE_STRING, {.str="rludfb"}, 0, NB_DIRECTIONS-1, FLAGS, "out_forder"},
156158 { "in_frot", "input cubemap face rotation", OFFSET(in_frot), AV_OPT_TYPE_STRING, {.str="000000"}, 0, NB_DIRECTIONS-1, FLAGS, "in_frot"},
157159 { "out_frot", "output cubemap face rotation",OFFSET(out_frot), AV_OPT_TYPE_STRING, {.str="000000"}, 0, NB_DIRECTIONS-1, FLAGS, "out_frot"},
160+ { "in_pad", "input cubemap pads", OFFSET(in_pad), AV_OPT_TYPE_FLOAT, {.dbl=0.f}, 0.f, 1.f, FLAGS, "in_pad"},
161+ { "out_pad", "output cubemap pads", OFFSET(out_pad), AV_OPT_TYPE_FLOAT, {.dbl=0.f}, 0.f, 1.f, FLAGS, "out_pad"},
158162 { "yaw", "yaw rotation", OFFSET(yaw), AV_OPT_TYPE_FLOAT, {.dbl=0.f}, -180.f, 180.f, FLAGS, "yaw"},
159163 { "pitch", "pitch rotation", OFFSET(pitch), AV_OPT_TYPE_FLOAT, {.dbl=0.f}, -180.f, 180.f, FLAGS, "pitch"},
160164 { "roll", "roll rotation", OFFSET(roll), AV_OPT_TYPE_FLOAT, {.dbl=0.f}, -180.f, 180.f, FLAGS, "roll"},
@@ -734,6 +738,9 @@ static void cube_to_xyz(const V360Context *s, · 573 unmodified lines
734738 float norm;
735739 float l_x, l_y, l_z;
736740
741+ uf /= (1.f - s->out_pad);
742+ vf /= (1.f - s->out_pad);
743+
737744 rotate_cube_face_inverse(&uf, &vf, s->out_cubemap_face_rotation[face]);
738745
739746 switch (direction) {
@@ -1091,6 +1098,9 @@ static void xyz_to_cube3x2(const V360Context *s, · 351 unmodified lines
10911098
10921099 xyz_to_cube(s, vec, &uf, &vf, &direction);
10931100
1101+ uf *= (1.f - s->in_pad);
1102+ vf *= (1.f - s->in_pad);
1103+
10941104 face = s->in_cubemap_face_order[direction];
10951105 u_face = face % 3;
10961106 v_face = face / 3;
@@ -1108,22 +1118,44 @@ static void xyz_to_cube3x2(const V360Context *s, · 11 unmodified lines
11081118
11091119 for (i = -1; i < 3; i++) {
11101120 for (j = -1; j < 3; j++) {
1111− float u, v;
1121+ int new_ui = ui + j;
1122+ int new_vi = vi + i;
11121123 int u_shift, v_shift;
11131124 int new_ewi, new_ehi;
11141125
1115− process_cube_coordinates(s, 2.f * (ui + j) / ewi - 1.f,
1116− 2.f * (vi + i) / ehi - 1.f,
1117− direction, &u, &v, &face);
1118− u_face = face % 3;
1119− v_face = face / 3;
1120− u_shift = ceilf(ew * u_face);
1121− v_shift = ceilf(eh * v_face);
1122− new_ewi = ceilf(ew * (u_face + 1)) - u_shift;
1123− new_ehi = ceilf(eh * (v_face + 1)) - v_shift;
1124−
1125− us[i + 1][j + 1] = u_shift + av_clip(roundf(0.5f * new_ewi * (u + 1.f)), 0, new_ewi - 1);
1126− vs[i + 1][j + 1] = v_shift + av_clip(roundf(0.5f * new_ehi * (v + 1.f)), 0, new_ehi - 1);
1126+ if (new_ui >= 0 && new_ui < ewi && new_vi >= 0 && new_vi < ehi) {
1127+ face = s->in_cubemap_face_order[direction];
1128+
1129+ u_face = face % 3;
1130+ v_face = face / 3;
1131+ u_shift = ceilf(ew * u_face);
1132+ v_shift = ceilf(eh * v_face);
1133+ } else {
1134+ uf = 2.f * new_ui / ewi - 1.f;
1135+ vf = 2.f * new_vi / ehi - 1.f;
1136+
1137+ uf /= (1.f - s->in_pad);
1138+ vf /= (1.f - s->in_pad);
1139+
1140+ process_cube_coordinates(s, uf, vf, direction, &uf, &vf, &face);
1141+
1142+ uf *= (1.f - s->in_pad);
1143+ vf *= (1.f - s->in_pad);
1144+
1145+ u_face = face % 3;
1146+ v_face = face / 3;
1147+ u_shift = ceilf(ew * u_face);
1148+ v_shift = ceilf(eh * v_face);
1149+ new_ewi = ceilf(ew * (u_face + 1)) - u_shift;
1150+ new_ehi = ceilf(eh * (v_face + 1)) - v_shift;
1151+
1152+ new_ui = av_clip(roundf(0.5f * new_ewi * (uf + 1.f)), 0, new_ewi - 1);
1153+ new_vi = av_clip(roundf(0.5f * new_ehi * (vf + 1.f)), 0, new_ehi - 1);
1154+ }
1155+
1156+
1157+ us[i + 1][j + 1] = u_shift + new_ui;
1158+ vs[i + 1][j + 1] = v_shift + new_vi;
11271159 }
11281160 }
11291161 }
@@ -1173,7 +1205,7 @@ static void xyz_to_cube6x1(const V360Context *s, · 43 unmodified lines
11731205 uint16_t us[4][4], uint16_t vs[4][4], float *du, float *dv)
11741206 {
11751207 const float ew = width / 6.f;
1176− const float eh = height;
1208+ const int ehi = height;
11771209 float uf, vf;
11781210 int ui, vi;
11791211 int ewi;
@@ -1182,11 +1214,14 @@ static void xyz_to_cube6x1(const V360Context *s, · 2 unmodified lines
11821214
11831215 xyz_to_cube(s, vec, &uf, &vf, &direction);
11841216
1217+ uf *= (1.f - s->in_pad);
1218+ vf *= (1.f - s->in_pad);
1219+
11851220 face = s->in_cubemap_face_order[direction];
11861221 ewi = ceilf(ew * (face + 1)) - ceilf(ew * face);
11871222
11881223 uf = 0.5f * ewi * (uf + 1.f);
1189− vf = 0.5f * eh * (vf + 1.f);
1224+ vf = 0.5f * ehi * (vf + 1.f);
11901225
11911226 ui = floorf(uf);
11921227 vi = floorf(vf);
@@ -1196,18 +1231,37 @@ static void xyz_to_cube6x1(const V360Context *s, · 3 unmodified lines
11961231
11971232 for (i = -1; i < 3; i++) {
11981233 for (j = -1; j < 3; j++) {
1199− float u, v;
1234+ int new_ui = ui + j;
1235+ int new_vi = vi + i;
12001236 int u_shift;
12011237 int new_ewi;
12021238
1203− process_cube_coordinates(s, 2.f * (ui + j) / ewi - 1.f,
1204− 2.f * (vi + i) / eh - 1.f,
1205− direction, &u, &v, &face);
1206− u_shift = ceilf(ew * face);
1207− new_ewi = ceilf(ew * (face + 1)) - u_shift;
1239+ if (new_ui >= 0 && new_ui < ewi && new_vi >= 0 && new_vi < ehi) {
1240+ face = s->in_cubemap_face_order[direction];
1241+
1242+ u_shift = ceilf(ew * face);
1243+ } else {
1244+ uf = 2.f * new_ui / ewi - 1.f;
1245+ vf = 2.f * new_vi / ehi - 1.f;
1246+
1247+ uf /= (1.f - s->in_pad);
1248+ vf /= (1.f - s->in_pad);
1249+
1250+ process_cube_coordinates(s, uf, vf, direction, &uf, &vf, &face);
1251+
1252+ uf *= (1.f - s->in_pad);
1253+ vf *= (1.f - s->in_pad);
1254+
1255+ u_shift = ceilf(ew * face);
1256+ new_ewi = ceilf(ew * (face + 1)) - u_shift;
1257+
1258+ new_ui = av_clip(roundf(0.5f * new_ewi * (uf + 1.f)), 0, new_ewi - 1);
1259+ new_vi = av_clip(roundf(0.5f * ehi * (vf + 1.f)), 0, ehi - 1);
1260+ }
1261+
12081262
1209− us[i + 1][j + 1] = u_shift + av_clip(roundf(0.5f * new_ewi * (u + 1.f)), 0, new_ewi - 1);
1210− vs[i + 1][j + 1] = av_clip(roundf(0.5f * eh * (v + 1.f)), 0, eh - 1);
1263+ us[i + 1][j + 1] = u_shift + new_ui;
1264+ vs[i + 1][j + 1] = new_vi;
12111265 }
12121266 }
12131267 }

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