har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avfilter/vf_v360: add partial size setup for flat

Browse Source 
Other part of size is calculated from both available horizontal
and vertical FOV and given one size component.
This commit is contained in:
Paul B Mahol 2020-02-29 20:22:37 +01:00
parent 3733a6bc20
commit f707c84b8b
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavfilter/vf_v360.c
View File

@ -3790,7 +3790,15 @@ static int config_output(AVFilterLink *outlink)
} }
// Override resolution with user values if specified // Override resolution with user values if specified
if (s->width > 0 && s->height > 0) { if (s->width > 0 && s->height <= 0 && s->h_fov > 0.f && s->v_fov > 0.f &&
s->out == FLAT && s->d_fov == 0.f) {
w = s->width;
h = w / tanf(s->h_fov * M_PI / 360.f) * tanf(s->v_fov * M_PI / 360.f);
} else if (s->width <= 0 && s->height > 0 && s->h_fov > 0.f && s->v_fov > 0.f &&
s->out == FLAT && s->d_fov == 0.f) {
h = s->height;
w = h / tanf(s->v_fov * M_PI / 360.f) * tanf(s->h_fov * M_PI / 360.f);
} else if (s->width > 0 && s->height > 0) {
w = s->width; w = s->width;
h = s->height; h = s->height;
} else if (s->width > 0 || s->height > 0) { } else if (s->width > 0 || s->height > 0) {