lkml.org 
[lkml]   [2020]   [Jul]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5/9] media: v4l2-common: Add helpers to calculate bytesperline and sizeimage
    Date
    Add helper functions to calculate plane bytesperline and sizeimage, these
    new helpers consider block width and height when calculating plane
    bytesperline and sizeimage.

    This prepare support for new pixel formats added in next patch that make
    use of block width and height.

    Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
    ---
    drivers/media/v4l2-core/v4l2-common.c | 77 +++++++++++++--------------
    1 file changed, 38 insertions(+), 39 deletions(-)

    diff --git a/drivers/media/v4l2-core/v4l2-common.c b/drivers/media/v4l2-core/v4l2-common.c
    index 3dc17ebe14fa..4102c373b48a 100644
    --- a/drivers/media/v4l2-core/v4l2-common.c
    +++ b/drivers/media/v4l2-core/v4l2-common.c
    @@ -333,6 +333,33 @@ static inline unsigned int v4l2_format_block_height(const struct v4l2_format_inf
    return info->block_h[plane];
    }

    +static inline unsigned int v4l2_format_plane_width(const struct v4l2_format_info *info, int plane,
    + unsigned int width)
    +{
    + unsigned int hdiv = plane ? info->hdiv : 1;
    + unsigned int bytes = DIV_ROUND_UP(width * info->bpp[plane],
    + v4l2_format_block_width(info, plane) *
    + v4l2_format_block_height(info, plane));
    +
    + return DIV_ROUND_UP(bytes, hdiv);
    +}
    +
    +static inline unsigned int v4l2_format_plane_height(const struct v4l2_format_info *info, int plane,
    + unsigned int height)
    +{
    + unsigned int vdiv = plane ? info->vdiv : 1;
    + unsigned int lines = ALIGN(height, v4l2_format_block_height(info, plane));
    +
    + return DIV_ROUND_UP(lines, vdiv);
    +}
    +
    +static inline unsigned int v4l2_format_plane_size(const struct v4l2_format_info *info, int plane,
    + unsigned int width, unsigned int height)
    +{
    + return v4l2_format_plane_width(info, plane, width) *
    + v4l2_format_plane_height(info, plane, height);
    +}
    +
    void v4l2_apply_frmsize_constraints(u32 *width, u32 *height,
    const struct v4l2_frmsize_stepwise *frmsize)
    {
    @@ -368,37 +395,19 @@ int v4l2_fill_pixfmt_mp(struct v4l2_pix_format_mplane *pixfmt,

    if (info->mem_planes == 1) {
    plane = &pixfmt->plane_fmt[0];
    - plane->bytesperline = ALIGN(width, v4l2_format_block_width(info, 0)) * info->bpp[0];
    + plane->bytesperline = v4l2_format_plane_width(info, 0, width);
    plane->sizeimage = 0;

    - for (i = 0; i < info->comp_planes; i++) {
    - unsigned int hdiv = (i == 0) ? 1 : info->hdiv;
    - unsigned int vdiv = (i == 0) ? 1 : info->vdiv;
    - unsigned int aligned_width;
    - unsigned int aligned_height;
    -
    - aligned_width = ALIGN(width, v4l2_format_block_width(info, i));
    - aligned_height = ALIGN(height, v4l2_format_block_height(info, i));
    -
    - plane->sizeimage += info->bpp[i] *
    - DIV_ROUND_UP(aligned_width, hdiv) *
    - DIV_ROUND_UP(aligned_height, vdiv);
    - }
    + for (i = 0; i < info->comp_planes; i++)
    + plane->sizeimage +=
    + v4l2_format_plane_size(info, i, width, height);
    } else {
    for (i = 0; i < info->comp_planes; i++) {
    - unsigned int hdiv = (i == 0) ? 1 : info->hdiv;
    - unsigned int vdiv = (i == 0) ? 1 : info->vdiv;
    - unsigned int aligned_width;
    - unsigned int aligned_height;
    -
    - aligned_width = ALIGN(width, v4l2_format_block_width(info, i));
    - aligned_height = ALIGN(height, v4l2_format_block_height(info, i));
    -
    plane = &pixfmt->plane_fmt[i];
    plane->bytesperline =
    - info->bpp[i] * DIV_ROUND_UP(aligned_width, hdiv);
    - plane->sizeimage =
    - plane->bytesperline * DIV_ROUND_UP(aligned_height, vdiv);
    + v4l2_format_plane_width(info, i, width);
    + plane->sizeimage = plane->bytesperline *
    + v4l2_format_plane_height(info, i, height);
    }
    }
    return 0;
    @@ -422,22 +431,12 @@ int v4l2_fill_pixfmt(struct v4l2_pix_format *pixfmt, u32 pixelformat,
    pixfmt->width = width;
    pixfmt->height = height;
    pixfmt->pixelformat = pixelformat;
    - pixfmt->bytesperline = ALIGN(width, v4l2_format_block_width(info, 0)) * info->bpp[0];
    + pixfmt->bytesperline = v4l2_format_plane_width(info, 0, width);
    pixfmt->sizeimage = 0;

    - for (i = 0; i < info->comp_planes; i++) {
    - unsigned int hdiv = (i == 0) ? 1 : info->hdiv;
    - unsigned int vdiv = (i == 0) ? 1 : info->vdiv;
    - unsigned int aligned_width;
    - unsigned int aligned_height;
    -
    - aligned_width = ALIGN(width, v4l2_format_block_width(info, i));
    - aligned_height = ALIGN(height, v4l2_format_block_height(info, i));
    -
    - pixfmt->sizeimage += info->bpp[i] *
    - DIV_ROUND_UP(aligned_width, hdiv) *
    - DIV_ROUND_UP(aligned_height, vdiv);
    - }
    + for (i = 0; i < info->comp_planes; i++)
    + pixfmt->sizeimage +=
    + v4l2_format_plane_size(info, i, width, height);
    return 0;
    }
    EXPORT_SYMBOL_GPL(v4l2_fill_pixfmt);
    --
    2.17.1
    \
     
     \ /
      Last update: 2020-07-01 23:57    [W:4.025 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site