RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avfilter/vf_v360: add support for input fov to input sg format

This commit is contained in:
Paul B Mahol 2020-01-21 11:23:00 +01:00
parent 003a9c619c
commit fc2523c792
2 changed files with 36 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
doc/filters.texi
View File

@ -18961,7 +18961,14 @@ Format specific options:
@item h_fov @item h_fov
@item v_fov @item v_fov
@item d_fov @item d_fov
Set horizontal/vertical/diagonal field of view. Values in degrees. Set output horizontal/vertical/diagonal field of view. Values in degrees.
If diagonal field of view is set it overrides horizontal and vertical field of view.
@item ih_fov
@item iv_fov
@item id_fov
Set input horizontal/vertical/diagonal field of view. Values in degrees.
If diagonal field of view is set it overrides horizontal and vertical field of view. If diagonal field of view is set it overrides horizontal and vertical field of view.
@end table @end table
@ -19008,7 +19015,7 @@ Format specific options:
@item h_fov @item h_fov
@item v_fov @item v_fov
@item d_fov @item d_fov
Set horizontal/vertical/diagonal field of view. Values in degrees. Set output horizontal/vertical/diagonal field of view. Values in degrees.
If diagonal field of view is set it overrides horizontal and vertical field of view. If diagonal field of view is set it overrides horizontal and vertical field of view.

35
libavfilter/vf_v360.c
View File

@ -1581,6 +1581,23 @@ static void stereographic_to_xyz(const V360Context *s,
normalize_vector(vec); normalize_vector(vec);
} }
/**
* Prepare data for processing stereographic input format.
*
* @param ctx filter context
*
* @return error code
*/
static int prepare_stereographic_in(AVFilterContext *ctx)
{
V360Context *s = ctx->priv;
s->iflat_range[0] = tanf(FFMIN(s->ih_fov, 359.f) * M_PI / 720.f);
s->iflat_range[1] = tanf(FFMIN(s->iv_fov, 359.f) * M_PI / 720.f);
return 0;
}
/** /**
* Calculate frame position in stereographic format for corresponding 3D coordinates on sphere. * Calculate frame position in stereographic format for corresponding 3D coordinates on sphere.
* *
@ -1597,23 +1614,25 @@ static void xyz_to_stereographic(const V360Context *s,
const float *vec, int width, int height, const float *vec, int width, int height,
int16_t us[4][4], int16_t vs[4][4], float *du, float *dv) int16_t us[4][4], int16_t vs[4][4], float *du, float *dv)
{ {
const float x = av_clipf(vec[0] / (1.f - vec[1]), -1.f, 1.f) * s->input_mirror_modifier[0]; const float x = vec[0] / (1.f - vec[1]) / s->iflat_range[0] * s->input_mirror_modifier[0];
const float y = av_clipf(vec[2] / (1.f - vec[1]), -1.f, 1.f) * s->input_mirror_modifier[1]; const float y = vec[2] / (1.f - vec[1]) / s->iflat_range[1] * s->input_mirror_modifier[1];
float uf, vf; float uf, vf;
int ui, vi; int visible, ui, vi;
uf = (x + 1.f) * width / 2.f; uf = (x + 1.f) * width / 2.f;
vf = (y + 1.f) * height / 2.f; vf = (y + 1.f) * height / 2.f;
ui = floorf(uf); ui = floorf(uf);
vi = floorf(vf); vi = floorf(vf);
*du = uf - ui; visible = isfinite(x) && isfinite(y) && vi >= 0 && vi < height && ui >= 0 && ui < width;
*dv = vf - vi;
*du = visible ? uf - ui : 0.f;
*dv = visible ? vf - vi : 0.f;
for (int i = -1; i < 3; i++) { for (int i = -1; i < 3; i++) {
for (int j = -1; j < 3; j++) { for (int j = -1; j < 3; j++) {
us[i + 1][j + 1] = av_clip(ui + j, 0, width - 1); us[i + 1][j + 1] = visible ? av_clip(ui + j, 0, width - 1) : 0;
vs[i + 1][j + 1] = av_clip(vi + i, 0, height - 1); vs[i + 1][j + 1] = visible ? av_clip(vi + i, 0, height - 1) : 0;
} }
} }
} }
@ -3088,7 +3107,7 @@ static int config_output(AVFilterLink *outlink)
break; break;
case STEREOGRAPHIC: case STEREOGRAPHIC:
s->in_transform = xyz_to_stereographic; s->in_transform = xyz_to_stereographic;
err = 0; err = prepare_stereographic_in(ctx);
wf = w; wf = w;
hf = h / 2.f; hf = h / 2.f;
break; break;