highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avfilter/vf_v360: fix fov calculation from dfov for fisheye input/output

Browse Source
This commit is contained in:
Paul B Mahol 2020-01-24 23:10:38 +01:00
parent cbb254cb4c
commit a4f2fc9341
1 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libavfilter/vf_v360.c
View File

@ -3006,8 +3006,20 @@ static int allocate_plane(V360Context *s, int sizeof_uv, int sizeof_ker, int p)
return 0; return 0;
} }
static void fov_from_dfov(float d_fov, float w, float h, float *h_fov, float *v_fov) static void fov_from_dfov(int format, float d_fov, float w, float h, float *h_fov, float *v_fov)
{ {
switch (format) {
case FISHEYE:
{
const float d = 0.5f * hypotf(w, h);
*h_fov = d / h * d_fov;
*v_fov = d / w * d_fov;
}
break;
case FLAT:
default:
{
const float da = tanf(0.5 * FFMIN(d_fov, 359.f) * M_PI / 180.f); const float da = tanf(0.5 * FFMIN(d_fov, 359.f) * M_PI / 180.f);
const float d = hypotf(w, h); const float d = hypotf(w, h);
@ -3018,6 +3030,9 @@ static void fov_from_dfov(float d_fov, float w, float h, float *h_fov, float *v_
*h_fov += 360.f; *h_fov += 360.f;
if (*v_fov < 0.f) if (*v_fov < 0.f)
*v_fov += 360.f; *v_fov += 360.f;
}
break;
}
} }
static void set_dimensions(int *outw, int *outh, int w, int h, const AVPixFmtDescriptor *desc) static void set_dimensions(int *outw, int *outh, int w, int h, const AVPixFmtDescriptor *desc)
@ -3190,7 +3205,7 @@ static int config_output(AVFilterLink *outlink)
s->in_height = s->inplaneheight[0]; s->in_height = s->inplaneheight[0];
if (s->id_fov > 0.f) if (s->id_fov > 0.f)
fov_from_dfov(s->id_fov, w, h, &s->ih_fov, &s->iv_fov); fov_from_dfov(s->in, s->id_fov, w, h, &s->ih_fov, &s->iv_fov);
if (s->in_transpose) if (s->in_transpose)
FFSWAP(int, s->in_width, s->in_height); FFSWAP(int, s->in_width, s->in_height);
@ -3435,7 +3450,7 @@ static int config_output(AVFilterLink *outlink)
} }
if (s->d_fov > 0.f) if (s->d_fov > 0.f)
fov_from_dfov(s->d_fov, w, h, &s->h_fov, &s->v_fov); fov_from_dfov(s->out, s->d_fov, w, h, &s->h_fov, &s->v_fov);
if (prepare_out) { if (prepare_out) {
err = prepare_out(ctx); err = prepare_out(ctx);