diff options
author | Paul B Mahol <onemda@gmail.com> | 2020-01-20 13:45:07 +0100 |
---|---|---|
committer | Paul B Mahol <onemda@gmail.com> | 2020-01-20 21:10:37 +0100 |
commit | 091695f8e8e804518b29e9ff672562e922e31dd9 (patch) | |
tree | e4b85a4373d6f09669cef75b66226956594e847f /libavfilter/vf_v360.c | |
parent | e16cd7b86c5a346594942252176e6ff00fef58a1 (diff) |
avfilter/vf_v360: rewrite fov_from_dfov()
Diffstat (limited to 'libavfilter/vf_v360.c')
-rw-r--r-- | libavfilter/vf_v360.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libavfilter/vf_v360.c b/libavfilter/vf_v360.c index bfd94dfd52..f00c7c448c 100644 --- a/libavfilter/vf_v360.c +++ b/libavfilter/vf_v360.c @@ -2716,18 +2716,18 @@ static int allocate_plane(V360Context *s, int sizeof_uv, int sizeof_ker, int p) return 0; } -static void fov_from_dfov(V360Context *s, float w, float h) +static void fov_from_dfov(float d_fov, float w, float h, float *h_fov, float *v_fov) { - const float da = tanf(0.5 * FFMIN(s->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); - s->h_fov = atan2f(da * w, d) * 360.f / M_PI; - s->v_fov = atan2f(da * h, d) * 360.f / M_PI; + *h_fov = atan2f(da * w, d) * 360.f / M_PI; + *v_fov = atan2f(da * h, d) * 360.f / M_PI; - if (s->h_fov < 0.f) - s->h_fov += 360.f; - if (s->v_fov < 0.f) - s->v_fov += 360.f; + if (*h_fov < 0.f) + *h_fov += 360.f; + if (*v_fov < 0.f) + *v_fov += 360.f; } static void set_dimensions(int *outw, int *outh, int w, int h, const AVPixFmtDescriptor *desc) @@ -3115,7 +3115,7 @@ static int config_output(AVFilterLink *outlink) } if (s->d_fov > 0.f) - fov_from_dfov(s, w, h); + fov_from_dfov(s->d_fov, w, h, &s->h_fov, &s->v_fov); if (prepare_out) { err = prepare_out(ctx); |