Mercurial > libavcore.hg
diff imgutils.c @ 16:1a1faa090ff1 libavcore
Implement inline function av_fill_image_max_pixstep() and use it for
factorizing code.
author | stefano |
---|---|
date | Wed, 18 Aug 2010 21:02:38 +0000 |
parents | 665cb0c97133 |
children | ebe3b7ce4cca |
line wrap: on
line diff
--- a/imgutils.c Thu Aug 12 15:05:58 2010 +0000 +++ b/imgutils.c Wed Aug 18 21:02:38 2010 +0000 @@ -29,21 +29,12 @@ const AVPixFmtDescriptor *desc = &av_pix_fmt_descriptors[pix_fmt]; int max_step [4]; /* max pixel step for each plane */ int max_step_comp[4]; /* the component for each plane which has the max pixel step */ - int s, i; + int s; if (desc->flags & PIX_FMT_BITSTREAM) return (width * (desc->comp[0].step_minus1+1) + 7) >> 3; - memset(max_step , 0, sizeof(max_step )); - memset(max_step_comp, 0, sizeof(max_step_comp)); - for (i = 0; i < 4; i++) { - const AVComponentDescriptor *comp = &(desc->comp[i]); - if ((comp->step_minus1+1) > max_step[comp->plane]) { - max_step [comp->plane] = comp->step_minus1+1; - max_step_comp[comp->plane] = i; - } - } - + av_fill_image_max_pixstep(max_step, max_step_comp, desc); s = (max_step_comp[plane] == 1 || max_step_comp[plane] == 2) ? desc->log2_chroma_w : 0; return max_step[plane] * (((width + (1 << s) - 1)) >> s); } @@ -65,16 +56,7 @@ return 0; } - memset(max_step , 0, sizeof(max_step )); - memset(max_step_comp, 0, sizeof(max_step_comp)); - for (i = 0; i < 4; i++) { - const AVComponentDescriptor *comp = &(desc->comp[i]); - if ((comp->step_minus1+1) > max_step[comp->plane]) { - max_step [comp->plane] = comp->step_minus1+1; - max_step_comp[comp->plane] = i; - } - } - + av_fill_image_max_pixstep(max_step, max_step_comp, desc); for (i = 0; i < 4; i++) { int s = (max_step_comp[i] == 1 || max_step_comp[i] == 2) ? desc->log2_chroma_w : 0; linesizes[i] = max_step[i] * (((width + (1 << s) - 1)) >> s);