From a7dfa6b446e8ced9f25efd0597e6073e6b22a94b Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Mon, 15 Nov 2021 11:22:53 +0100 Subject: [PATCH] avfilter/v360: add support for off-axis projection output --- doc/filters.texi | 5 ++++ libavfilter/v360.h | 1 + libavfilter/vf_v360.c | 56 ++++++++++++++----------------------------- 3 files changed, 24 insertions(+), 38 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index 3aa54e6c69..b4f888c14d 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -21814,6 +21814,11 @@ Set if input video is transposed. Boolean value, by default disabled. @item out_trans Set if output video needs to be transposed. Boolean value, by default disabled. +@item h_offset +@item v_offset +Set output horizontal/vertical off-axis offset. Default is set to 0. +Allowed range is from -1 to 1. + @item alpha_mask Build mask in alpha plane for all unmapped pixels by marking them fully transparent. Boolean value, by default disabled. diff --git a/libavfilter/v360.h b/libavfilter/v360.h index 05e3435b44..5d797ab828 100644 --- a/libavfilter/v360.h +++ b/libavfilter/v360.h @@ -142,6 +142,7 @@ typedef struct V360Context { int fin_pad, fout_pad; float yaw, pitch, roll; + float h_offset, v_offset; int ih_flip, iv_flip; int h_flip, v_flip, d_flip; diff --git a/libavfilter/vf_v360.c b/libavfilter/vf_v360.c index 5df273d375..9e590a228c 100644 --- a/libavfilter/vf_v360.c +++ b/libavfilter/vf_v360.c @@ -163,6 +163,8 @@ static const AVOption v360_options[] = { { "ih_fov", "input horizontal field of view",OFFSET(ih_fov), AV_OPT_TYPE_FLOAT, {.dbl=0.f}, 0.f, 360.f,TFLAGS, "ih_fov"}, { "iv_fov", "input vertical field of view", OFFSET(iv_fov), AV_OPT_TYPE_FLOAT, {.dbl=0.f}, 0.f, 360.f,TFLAGS, "iv_fov"}, { "id_fov", "input diagonal field of view", OFFSET(id_fov), AV_OPT_TYPE_FLOAT, {.dbl=0.f}, 0.f, 360.f,TFLAGS, "id_fov"}, + { "h_offset", "output horizontal off-axis offset",OFFSET(h_offset), AV_OPT_TYPE_FLOAT,{.dbl=0.f}, -1.f, 1.f,TFLAGS, "h_offset"}, + { "v_offset", "output vertical off-axis offset", OFFSET(v_offset), AV_OPT_TYPE_FLOAT,{.dbl=0.f}, -1.f, 1.f,TFLAGS, "v_offset"}, {"alpha_mask", "build mask in alpha plane", OFFSET(alpha), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS, "alpha"}, { "reset_rot", "reset rotation", OFFSET(reset_rot), AV_OPT_TYPE_BOOL, {.i64=0}, -1, 1,TFLAGS, "reset_rot"}, { NULL } @@ -1027,6 +1029,17 @@ static inline void rotate_cube_face_inverse(float *uf, float *vf, int rotation) } } +/** + * Offset vector. + * + * @param vec vector + */ +static void offset_vector(float *vec, float h_offset, float v_offset) +{ + vec[0] += h_offset; + vec[1] += v_offset; +} + /** * Normalize vector. * @@ -1103,8 +1116,6 @@ static void cube_to_xyz(const V360Context *s, vec[0] = l_x; vec[1] = l_y; vec[2] = l_z; - - normalize_vector(vec); } /** @@ -1854,8 +1865,6 @@ static int stereographic_to_xyz(const V360Context *s, vec[1] = y / r * sin_theta; vec[2] = cosf(theta); - normalize_vector(vec); - return 1; } @@ -1960,8 +1969,6 @@ static int equisolid_to_xyz(const V360Context *s, vec[1] = y / r * sin_theta; vec[2] = cosf(theta); - normalize_vector(vec); - return 1; } @@ -2066,12 +2073,11 @@ static int orthographic_to_xyz(const V360Context *s, vec[0] = x; vec[1] = y; - normalize_vector(vec); return 1; } else { - vec[0] = 0; - vec[1] = 0; - vec[2] = 1; + vec[0] = 0.f; + vec[1] = 0.f; + vec[2] = 1.f; return 0; } @@ -2474,8 +2480,6 @@ static int hammer_to_xyz(const V360Context *s, vec[1] = M_SQRT2 * y * z; vec[2] = w * (bb - aa) / (aa + bb); - normalize_vector(vec); - return 1; } @@ -2546,8 +2550,6 @@ static int sinusoidal_to_xyz(const V360Context *s, vec[1] = sin_theta; vec[2] = cos_theta * cos_phi; - normalize_vector(vec); - return 1; } @@ -2743,8 +2745,6 @@ static int eac_to_xyz(const V360Context *s, vec[1] = l_y; vec[2] = l_z; - normalize_vector(vec); - return 1; } @@ -2846,8 +2846,6 @@ static int flat_to_xyz(const V360Context *s, vec[1] = l_y; vec[2] = 1.f; - normalize_vector(vec); - return 1; } @@ -2897,8 +2895,6 @@ static int fisheye_to_xyz(const V360Context *s, vec[1] = cos_theta * sin_phi; vec[2] = sin_theta; - normalize_vector(vec); - return 1; } @@ -2993,8 +2989,6 @@ static int pannini_to_xyz(const V360Context *s, vec[1] = sinf(lat); vec[2] = cosf(lon) * cosf(lat); - normalize_vector(vec); - return 1; } @@ -3090,8 +3084,6 @@ static int cylindrical_to_xyz(const V360Context *s, vec[1] = sin_theta; vec[2] = cos_theta * cos_phi; - normalize_vector(vec); - return 1; } @@ -3217,8 +3209,6 @@ static int cylindricalea_to_xyz(const V360Context *s, vec[1] = sin_theta; vec[2] = cos_theta * cos_phi; - normalize_vector(vec); - return 1; } @@ -3331,8 +3321,6 @@ static int tetrahedron_to_xyz(const V360Context *s, vec[1] = 1.f - vf * 2.f; vec[2] = 2.f * fabsf(1.f - fabsf(1.f - uf * 2.f + vf)) - 1.f; - normalize_vector(vec); - return 1; } @@ -3444,8 +3432,6 @@ static int dfisheye_to_xyz(const V360Context *s, vec[1] = cos_theta * vf / lh; vec[2] = sin_theta; - normalize_vector(vec); - return 1; } @@ -3568,8 +3554,6 @@ static int barrel_to_xyz(const V360Context *s, vec[1] = l_y; vec[2] = l_z; - normalize_vector(vec); - return 1; } @@ -3826,8 +3810,6 @@ static int barrelsplit_to_xyz(const V360Context *s, vec[1] = l_y; vec[2] = l_z; - normalize_vector(vec); - return 1; } @@ -3884,8 +3866,6 @@ static int tspyramid_to_xyz(const V360Context *s, vec[2] = -2.f * (1.f - y) / 0.375f + 1.f; } - normalize_vector(vec); - return 1; } @@ -3987,8 +3967,6 @@ static int octahedron_to_xyz(const V360Context *s, vec[1] = y; } - normalize_vector(vec); - return 1; } @@ -4293,6 +4271,8 @@ static av_always_inline int v360_slice(AVFilterContext *ctx, void *arg, int jobn out_mask = s->out_transform(s, j, i, height, width, vec); else out_mask = s->out_transform(s, i, j, width, height, vec); + offset_vector(vec, s->h_offset, s->v_offset); + normalize_vector(vec); av_assert1(!isnan(vec[0]) && !isnan(vec[1]) && !isnan(vec[2])); rotate(s->rot_quaternion, vec); av_assert1(!isnan(vec[0]) && !isnan(vec[1]) && !isnan(vec[2]));