virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-14 00:58:38 +02:00
Code Issues Releases Activity

avfilter/vf_v360: refactor dimensions and offsets calculations

Browse Source
This commit is contained in:
Paul B Mahol 2019-09-15 10:37:42 +02:00
parent 197985c5bf
commit 7f8f886344
1 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
libavfilter/vf_v360.c
View File

@ -2157,6 +2157,14 @@ static void fov_from_dfov(V360Context *s, float w, float h)
s->v_fov += 360.f; s->v_fov += 360.f;
} }
static void set_dimensions(int *outw, int *outh, int w, int h, const AVPixFmtDescriptor *desc)
{
outw[1] = outw[2] = FF_CEIL_RSHIFT(w, desc->log2_chroma_w);
outw[0] = outw[3] = w;
outh[1] = outh[2] = FF_CEIL_RSHIFT(h, desc->log2_chroma_h);
outh[0] = outh[3] = h;
}
static int config_output(AVFilterLink *outlink) static int config_output(AVFilterLink *outlink)
{ {
AVFilterContext *ctx = outlink->src; AVFilterContext *ctx = outlink->src;
@ -2264,15 +2272,8 @@ static int config_output(AVFilterLink *outlink)
av_assert0(0); av_assert0(0);
} }
s->inplaneheight[1] = s->inplaneheight[2] = FF_CEIL_RSHIFT(h, desc->log2_chroma_h); set_dimensions(s->inplanewidth, s->inplaneheight, w, h, desc);
s->inplaneheight[0] = s->inplaneheight[3] = h; set_dimensions(s->in_offset_w, s->in_offset_h, in_offset_w, in_offset_h, desc);
s->inplanewidth[1] = s->inplanewidth[2] = FF_CEIL_RSHIFT(w, desc->log2_chroma_w);
s->inplanewidth[0] = s->inplanewidth[3] = w;
s->in_offset_h[1] = s->in_offset_h[2] = FF_CEIL_RSHIFT(in_offset_h, desc->log2_chroma_h);
s->in_offset_h[0] = s->in_offset_h[3] = in_offset_h;
s->in_offset_w[1] = s->in_offset_w[2] = FF_CEIL_RSHIFT(in_offset_w, desc->log2_chroma_w);
s->in_offset_w[0] = s->in_offset_w[3] = in_offset_w;
switch (s->in) { switch (s->in) {
case EQUIRECTANGULAR: case EQUIRECTANGULAR:
@ -2419,10 +2420,7 @@ static int config_output(AVFilterLink *outlink)
return err; return err;
} }
s->pr_height[1] = s->pr_height[2] = FF_CEIL_RSHIFT(h, desc->log2_chroma_h); set_dimensions(s->pr_width, s->pr_height, w, h, desc);
s->pr_height[0] = s->pr_height[3] = h;
s->pr_width[1] = s->pr_width[2] = FF_CEIL_RSHIFT(w, desc->log2_chroma_w);
s->pr_width[0] = s->pr_width[3] = w;
switch (s->out_stereo) { switch (s->out_stereo) {
case STEREO_2D: case STEREO_2D:
@ -2442,15 +2440,8 @@ static int config_output(AVFilterLink *outlink)
av_assert0(0); av_assert0(0);
} }
s->out_offset_h[1] = s->out_offset_h[2] = FF_CEIL_RSHIFT(out_offset_h, desc->log2_chroma_h); set_dimensions(s->out_offset_w, s->out_offset_h, out_offset_w, out_offset_h, desc);
s->out_offset_h[0] = s->out_offset_h[3] = out_offset_h; set_dimensions(s->planewidth, s->planeheight, w, h, desc);
s->out_offset_w[1] = s->out_offset_w[2] = FF_CEIL_RSHIFT(out_offset_w, desc->log2_chroma_w);
s->out_offset_w[0] = s->out_offset_w[3] = out_offset_w;
s->planeheight[1] = s->planeheight[2] = FF_CEIL_RSHIFT(h, desc->log2_chroma_h);
s->planeheight[0] = s->planeheight[3] = h;
s->planewidth[1] = s->planewidth[2] = FF_CEIL_RSHIFT(w, desc->log2_chroma_w);
s->planewidth[0] = s->planewidth[3] = w;
for (int i = 0; i < 4; i++) for (int i = 0; i < 4; i++)
s->uv_linesize[i] = FFALIGN(s->pr_width[i], 8); s->uv_linesize[i] = FFALIGN(s->pr_width[i], 8);