avfilter/vf_v360: unbreak fov_from_dfov() for (d)fisheye when width != height

Based on patch by Daniel Playfair Cal.
This commit is contained in:
Paul B Mahol 2021-04-11 10:09:48 +02:00
parent 5d52c4cbba
commit e917cd9828

View File

@ -4078,18 +4078,18 @@ static void fov_from_dfov(int format, float d_fov, float w, float h, float *h_fo
break; break;
case DUAL_FISHEYE: case DUAL_FISHEYE:
{ {
const float d = 0.5f * hypotf(w * 0.5f, h); const float d = hypotf(w * 0.5f, h);
*h_fov = d / w * 2.f * d_fov; *h_fov = 0.5f * w / d * d_fov;
*v_fov = d / h * d_fov; *v_fov = h / d * d_fov;
} }
break; break;
case FISHEYE: case FISHEYE:
{ {
const float d = 0.5f * hypotf(w, h); const float d = hypotf(w, h);
*h_fov = d / w * d_fov; *h_fov = w / d * d_fov;
*v_fov = d / h * d_fov; *v_fov = h / d * d_fov;
} }
break; break;
case FLAT: case FLAT: