History

avfilter/vf_v360: refactor creation of remap data

Paul B Mahol committed 7 years ago

Commit 05ffaa21 parent a09213d2 files · +92 −82Browse files

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

Unified · Split

2 files
  1. libavfilter/v360.h +18 −0
  2. libavfilter/vf_v360.c +74 −82
libavfilter/v360.h+18−0
@@ -85,6 +85,12 @@ enum RotationOrder { · 84 unmodified lines
8585 NB_RORDERS,
8686 };
8787
88+typedef struct XYRemap {
89+ uint16_t u[4][4];
90+ uint16_t v[4][4];
91+ float ker[4][4];
92+} XYRemap;
93+
8894 typedef struct V360Context {
8995 const AVClass *class;
9096 int in, out;
@@ -130,11 +136,23 @@ typedef struct V360Context { · 39 unmodified lines
130136 int uv_linesize[4];
131137 int nb_planes;
132138 int nb_allocated;
139+ int elements;
133140
134141 uint16_t *u[4], *v[4];
135142 int16_t *ker[4];
136143 unsigned map[4];
137144
145+ void (*in_transform)(const struct V360Context *s,
146+ const float *vec, int width, int height,
147+ uint16_t us[4][4], uint16_t vs[4][4], float *du, float *dv);
148+
149+ void (*out_transform)(const struct V360Context *s,
150+ int i, int j, int width, int height,
151+ float *vec);
152+
153+ void (*calculate_kernel)(float du, float dv, const XYRemap *rmap,
154+ uint16_t *u, uint16_t *v, int16_t *ker);
155+
138156 int (*remap_slice)(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs);
139157
140158 void (*remap_line)(uint8_t *dst, int width, const uint8_t *src, ptrdiff_t in_linesize,
libavfilter/vf_v360.c+74−82
@@ -207,12 +207,6 @@ static void remap1_##bits##bit_line_c(uint8_t *dst, int width, const uint8_t *sr · 206 unmodified lines
207207 DEFINE_REMAP1_LINE( 8, 1)
208208 DEFINE_REMAP1_LINE(16, 2)
209209
210−typedef struct XYRemap {
211− uint16_t u[4][4];
212− uint16_t v[4][4];
213− float ker[4][4];
214−} XYRemap;
215−
216210 /**
217211 * Generate remapping function with a given window size and pixel depth.
218212 *
@@ -2167,6 +2161,47 @@ static void set_dimensions(int *outw, int *outh, int w, int h, const AVPixFmtDes · 1948 unmodified lines
21672161 outh[0] = outh[3] = h;
21682162 }
21692163
2164+// Calculate remap data
2165+static av_always_inline void v360_filter(AVFilterContext *ctx)
2166+{
2167+ V360Context *s = ctx->priv;
2168+
2169+ for (int p = 0; p < s->nb_allocated; p++) {
2170+ const int width = s->pr_width[p];
2171+ const int uv_linesize = s->uv_linesize[p];
2172+ const int height = s->pr_height[p];
2173+ const int in_width = s->inplanewidth[p];
2174+ const int in_height = s->inplaneheight[p];
2175+ float du, dv;
2176+ float vec[3];
2177+ XYRemap rmap;
2178+
2179+ for (int j = 0; j < height; j++) {
2180+ for (int i = 0; i < width; i++) {
2181+ uint16_t *u = s->u[p] + (j * uv_linesize + i) * s->elements;
2182+ uint16_t *v = s->v[p] + (j * uv_linesize + i) * s->elements;
2183+ int16_t *ker = s->ker[p] + (j * uv_linesize + i) * s->elements;
2184+
2185+ if (s->out_transpose)
2186+ s->out_transform(s, j, i, height, width, vec);
2187+ else
2188+ s->out_transform(s, i, j, width, height, vec);
2189+ av_assert1(!isnan(vec[0]) && !isnan(vec[1]) && !isnan(vec[2]));
2190+ rotate(s->rot_mat, vec);
2191+ av_assert1(!isnan(vec[0]) && !isnan(vec[1]) && !isnan(vec[2]));
2192+ normalize_vector(vec);
2193+ mirror(s->output_mirror_modifier, vec);
2194+ if (s->in_transpose)
2195+ s->in_transform(s, vec, in_height, in_width, rmap.v, rmap.u, &du, &dv);
2196+ else
2197+ s->in_transform(s, vec, in_width, in_height, rmap.u, rmap.v, &du, &dv);
2198+ av_assert1(!isnan(du) && !isnan(dv));
2199+ s->calculate_kernel(du, dv, &rmap, u, v, ker);
2200+ }
2201+ }
2202+ }
2203+}
2204+
21702205 static int config_output(AVFilterLink *outlink)
21712206 {
21722207 AVFilterContext *ctx = outlink->src;
@@ -2176,20 +2211,11 @@ static int config_output(AVFilterLink *outlink) · 3 unmodified lines
21762211 const int depth = desc->comp[0].depth;
21772212 int sizeof_uv;
21782213 int sizeof_ker;
2179− int elements;
21802214 int err;
21812215 int h, w;
21822216 int in_offset_h, in_offset_w;
21832217 int out_offset_h, out_offset_w;
21842218 float hf, wf;
2185− void (*in_transform)(const V360Context *s,
2186− const float *vec, int width, int height,
2187− uint16_t us[4][4], uint16_t vs[4][4], float *du, float *dv);
2188− void (*out_transform)(const V360Context *s,
2189− int i, int j, int width, int height,
2190− float *vec);
2191− void (*calculate_kernel)(float du, float dv, const XYRemap *rmap,
2192− uint16_t *u, uint16_t *v, int16_t *ker);
21932219 int (*prepare_out)(AVFilterContext *ctx);
21942220
21952221 s->input_mirror_modifier[0] = s->ih_flip ? -1.f : 1.f;
@@ -2197,32 +2223,32 @@ static int config_output(AVFilterLink *outlink) · 1 unmodified line
21972223
21982224 switch (s->interp) {
21992225 case NEAREST:
2200− calculate_kernel = nearest_kernel;
2226+ s->calculate_kernel = nearest_kernel;
22012227 s->remap_slice = depth <= 8 ? remap1_8bit_slice : remap1_16bit_slice;
2202− elements = 1;
2203− sizeof_uv = sizeof(uint16_t) * elements;
2228+ s->elements = 1;
2229+ sizeof_uv = sizeof(uint16_t) * s->elements;
22042230 sizeof_ker = 0;
22052231 break;
22062232 case BILINEAR:
2207− calculate_kernel = bilinear_kernel;
2233+ s->calculate_kernel = bilinear_kernel;
22082234 s->remap_slice = depth <= 8 ? remap2_8bit_slice : remap2_16bit_slice;
2209− elements = 2 * 2;
2210− sizeof_uv = sizeof(uint16_t) * elements;
2211− sizeof_ker = sizeof(uint16_t) * elements;
2235+ s->elements = 2 * 2;
2236+ sizeof_uv = sizeof(uint16_t) * s->elements;
2237+ sizeof_ker = sizeof(uint16_t) * s->elements;
22122238 break;
22132239 case BICUBIC:
2214− calculate_kernel = bicubic_kernel;
2240+ s->calculate_kernel = bicubic_kernel;
22152241 s->remap_slice = depth <= 8 ? remap4_8bit_slice : remap4_16bit_slice;
2216− elements = 4 * 4;
2217− sizeof_uv = sizeof(uint16_t) * elements;
2218− sizeof_ker = sizeof(uint16_t) * elements;
2242+ s->elements = 4 * 4;
2243+ sizeof_uv = sizeof(uint16_t) * s->elements;
2244+ sizeof_ker = sizeof(uint16_t) * s->elements;
22192245 break;
22202246 case LANCZOS:
2221− calculate_kernel = lanczos_kernel;
2247+ s->calculate_kernel = lanczos_kernel;
22222248 s->remap_slice = depth <= 8 ? remap4_8bit_slice : remap4_16bit_slice;
2223− elements = 4 * 4;
2224− sizeof_uv = sizeof(uint16_t) * elements;
2225− sizeof_ker = sizeof(uint16_t) * elements;
2249+ s->elements = 4 * 4;
2250+ sizeof_uv = sizeof(uint16_t) * s->elements;
2251+ sizeof_ker = sizeof(uint16_t) * s->elements;
22262252 break;
22272253 default:
22282254 av_assert0(0);
@@ -2277,31 +2303,31 @@ static int config_output(AVFilterLink *outlink) · 48 unmodified lines
22772303
22782304 switch (s->in) {
22792305 case EQUIRECTANGULAR:
2280− in_transform = xyz_to_equirect;
2306+ s->in_transform = xyz_to_equirect;
22812307 err = 0;
22822308 wf = w;
22832309 hf = h;
22842310 break;
22852311 case CUBEMAP_3_2:
2286− in_transform = xyz_to_cube3x2;
2312+ s->in_transform = xyz_to_cube3x2;
22872313 err = prepare_cube_in(ctx);
22882314 wf = w / 3.f * 4.f;
22892315 hf = h;
22902316 break;
22912317 case CUBEMAP_1_6:
2292− in_transform = xyz_to_cube1x6;
2318+ s->in_transform = xyz_to_cube1x6;
22932319 err = prepare_cube_in(ctx);
22942320 wf = w * 4.f;
22952321 hf = h / 3.f;
22962322 break;
22972323 case CUBEMAP_6_1:
2298− in_transform = xyz_to_cube6x1;
2324+ s->in_transform = xyz_to_cube6x1;
22992325 err = prepare_cube_in(ctx);
23002326 wf = w / 3.f * 2.f;
23012327 hf = h * 2.f;
23022328 break;
23032329 case EQUIANGULAR:
2304− in_transform = xyz_to_eac;
2330+ s->in_transform = xyz_to_eac;
23052331 err = prepare_eac_in(ctx);
23062332 wf = w;
23072333 hf = h / 9.f * 8.f;
@@ -2310,19 +2336,19 @@ static int config_output(AVFilterLink *outlink) · 2 unmodified lines
23102336 av_log(ctx, AV_LOG_ERROR, "Flat format is not accepted as input.\n");
23112337 return AVERROR(EINVAL);
23122338 case DUAL_FISHEYE:
2313− in_transform = xyz_to_dfisheye;
2339+ s->in_transform = xyz_to_dfisheye;
23142340 err = 0;
23152341 wf = w;
23162342 hf = h;
23172343 break;
23182344 case BARREL:
2319− in_transform = xyz_to_barrel;
2345+ s->in_transform = xyz_to_barrel;
23202346 err = 0;
23212347 wf = w / 5.f * 4.f;
23222348 hf = h;
23232349 break;
23242350 case STEREOGRAPHIC:
2325− in_transform = xyz_to_stereographic;
2351+ s->in_transform = xyz_to_stereographic;
23262352 err = 0;
23272353 wf = w;
23282354 hf = h / 2.f;
@@ -2338,55 +2364,55 @@ static int config_output(AVFilterLink *outlink) · 9 unmodified lines
23382364
23392365 switch (s->out) {
23402366 case EQUIRECTANGULAR:
2341− out_transform = equirect_to_xyz;
2367+ s->out_transform = equirect_to_xyz;
23422368 prepare_out = NULL;
23432369 w = roundf(wf);
23442370 h = roundf(hf);
23452371 break;
23462372 case CUBEMAP_3_2:
2347− out_transform = cube3x2_to_xyz;
2373+ s->out_transform = cube3x2_to_xyz;
23482374 prepare_out = prepare_cube_out;
23492375 w = roundf(wf / 4.f * 3.f);
23502376 h = roundf(hf);
23512377 break;
23522378 case CUBEMAP_1_6:
2353− out_transform = cube1x6_to_xyz;
2379+ s->out_transform = cube1x6_to_xyz;
23542380 prepare_out = prepare_cube_out;
23552381 w = roundf(wf / 4.f);
23562382 h = roundf(hf * 3.f);
23572383 break;
23582384 case CUBEMAP_6_1:
2359− out_transform = cube6x1_to_xyz;
2385+ s->out_transform = cube6x1_to_xyz;
23602386 prepare_out = prepare_cube_out;
23612387 w = roundf(wf / 2.f * 3.f);
23622388 h = roundf(hf / 2.f);
23632389 break;
23642390 case EQUIANGULAR:
2365− out_transform = eac_to_xyz;
2391+ s->out_transform = eac_to_xyz;
23662392 prepare_out = prepare_eac_out;
23672393 w = roundf(wf);
23682394 h = roundf(hf / 8.f * 9.f);
23692395 break;
23702396 case FLAT:
2371− out_transform = flat_to_xyz;
2397+ s->out_transform = flat_to_xyz;
23722398 prepare_out = prepare_flat_out;
23732399 w = roundf(wf);
23742400 h = roundf(hf);
23752401 break;
23762402 case DUAL_FISHEYE:
2377− out_transform = dfisheye_to_xyz;
2403+ s->out_transform = dfisheye_to_xyz;
23782404 prepare_out = NULL;
23792405 w = roundf(wf);
23802406 h = roundf(hf);
23812407 break;
23822408 case BARREL:
2383− out_transform = barrel_to_xyz;
2409+ s->out_transform = barrel_to_xyz;
23842410 prepare_out = NULL;
23852411 w = roundf(wf / 4.f * 5.f);
23862412 h = roundf(hf);
23872413 break;
23882414 case STEREOGRAPHIC:
2389− out_transform = stereographic_to_xyz;
2415+ s->out_transform = stereographic_to_xyz;
23902416 prepare_out = prepare_stereographic_out;
23912417 w = roundf(wf);
23922418 h = roundf(hf * 2.f);
@@ -2467,41 +2493,7 @@ static int config_output(AVFilterLink *outlink) · 74 unmodified lines
24672493 calculate_rotation_matrix(s->yaw, s->pitch, s->roll, s->rot_mat, s->rotation_order);
24682494 set_mirror_modifier(s->h_flip, s->v_flip, s->d_flip, s->output_mirror_modifier);
24692495
2470− // Calculate remap data
2471− for (int p = 0; p < s->nb_allocated; p++) {
2472− const int width = s->pr_width[p];
2473− const int uv_linesize = s->uv_linesize[p];
2474− const int height = s->pr_height[p];
2475− const int in_width = s->inplanewidth[p];
2476− const int in_height = s->inplaneheight[p];
2477− float du, dv;
2478− float vec[3];
2479− XYRemap rmap;
2480−
2481− for (int j = 0; j < height; j++) {
2482− for (int i = 0; i < width; i++) {
2483− uint16_t *u = s->u[p] + (j * uv_linesize + i) * elements;
2484− uint16_t *v = s->v[p] + (j * uv_linesize + i) * elements;
2485− int16_t *ker = s->ker[p] + (j * uv_linesize + i) * elements;
2486−
2487− if (s->out_transpose)
2488− out_transform(s, j, i, height, width, vec);
2489− else
2490− out_transform(s, i, j, width, height, vec);
2491− av_assert1(!isnan(vec[0]) && !isnan(vec[1]) && !isnan(vec[2]));
2492− rotate(s->rot_mat, vec);
2493− av_assert1(!isnan(vec[0]) && !isnan(vec[1]) && !isnan(vec[2]));
2494− normalize_vector(vec);
2495− mirror(s->output_mirror_modifier, vec);
2496− if (s->in_transpose)
2497− in_transform(s, vec, in_height, in_width, rmap.v, rmap.u, &du, &dv);
2498− else
2499− in_transform(s, vec, in_width, in_height, rmap.u, rmap.v, &du, &dv);
2500− av_assert1(!isnan(du) && !isnan(dv));
2501− calculate_kernel(du, dv, &rmap, u, v, ker);
2502− }
2503− }
2504− }
2496+ v360_filter(ctx);
25052497
25062498 return 0;
25072499 }

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