Browse Source

avfilter/vf_v360: remove uneeded array element

tags/n4.3
Paul B Mahol 5 years ago
parent
commit
8b58d9cb47
2 changed files with 6 additions and 8 deletions
  1. +1
    -1
      libavfilter/v360.h
  2. +5
    -7
      libavfilter/vf_v360.c

+ 1
- 1
libavfilter/v360.h View File

@@ -121,7 +121,7 @@ typedef struct V360Context {
int in_transpose, out_transpose; int in_transpose, out_transpose;


float h_fov, v_fov, d_fov; float h_fov, v_fov, d_fov;
float flat_range[3];
float flat_range[2];


float rot_mat[3][3]; float rot_mat[3][3];




+ 5
- 7
libavfilter/vf_v360.c View File

@@ -1916,9 +1916,8 @@ static int prepare_flat_out(AVFilterContext *ctx)
const float h_angle = 0.5f * s->h_fov * M_PI / 180.f; const float h_angle = 0.5f * s->h_fov * M_PI / 180.f;
const float v_angle = 0.5f * s->v_fov * M_PI / 180.f; const float v_angle = 0.5f * s->v_fov * M_PI / 180.f;


s->flat_range[0] = tanf(h_angle);
s->flat_range[1] = tanf(v_angle);
s->flat_range[2] = -1.f;
s->flat_range[0] = tanf(h_angle);
s->flat_range[1] = tanf(v_angle);


return 0; return 0;
} }
@@ -1939,11 +1938,10 @@ static void flat_to_xyz(const V360Context *s,
{ {
const float l_x = s->flat_range[0] * (2.f * i / width - 1.f); const float l_x = s->flat_range[0] * (2.f * i / width - 1.f);
const float l_y = -s->flat_range[1] * (2.f * j / height - 1.f); const float l_y = -s->flat_range[1] * (2.f * j / height - 1.f);
const float l_z = s->flat_range[2];


vec[0] = l_x;
vec[1] = l_y;
vec[2] = l_z;
vec[0] = l_x;
vec[1] = l_y;
vec[2] = -1.f;


normalize_vector(vec); normalize_vector(vec);
} }


Loading…
Cancel
Save