lkml.org 
[lkml]   [2023]   [Feb]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 07/12] media: verisilicon: Compute motion vectors size for AV1 frames
    Date
    Compute the additional space required to store motion vectors at
    the end of the frames buffers.

    Signed-off-by: Benjamin Gaignard <benjamin.gaignard@collabora.com>
    ---
    version 4:
    - Double motion vectors buffer size.

    drivers/media/platform/verisilicon/hantro_hw.h | 13 +++++++++++++
    .../media/platform/verisilicon/hantro_postproc.c | 3 +++
    drivers/media/platform/verisilicon/hantro_v4l2.c | 5 +++++
    3 files changed, 21 insertions(+)

    diff --git a/drivers/media/platform/verisilicon/hantro_hw.h b/drivers/media/platform/verisilicon/hantro_hw.h
    index e83f0c523a30..bc61d4e051c7 100644
    --- a/drivers/media/platform/verisilicon/hantro_hw.h
    +++ b/drivers/media/platform/verisilicon/hantro_hw.h
    @@ -417,6 +417,19 @@ hantro_hevc_mv_size(unsigned int width, unsigned int height)
    return width * height / 16;
    }

    +static inline unsigned short hantro_av1_num_sbs(unsigned short dimension)
    +{
    + return DIV_ROUND_UP(dimension, 64);
    +}
    +
    +static inline size_t
    +hantro_av1_mv_size(unsigned int width, unsigned int height)
    +{
    + size_t num_sbs = hantro_av1_num_sbs(width) * hantro_av1_num_sbs(height);
    +
    + return ALIGN(num_sbs * 384, 16) * 2 + 512;
    +}
    +
    int hantro_g1_mpeg2_dec_run(struct hantro_ctx *ctx);
    int rockchip_vpu2_mpeg2_dec_run(struct hantro_ctx *ctx);
    void hantro_mpeg2_dec_copy_qtable(u8 *qtable,
    diff --git a/drivers/media/platform/verisilicon/hantro_postproc.c b/drivers/media/platform/verisilicon/hantro_postproc.c
    index 6437423ccf3a..bb16af50719d 100644
    --- a/drivers/media/platform/verisilicon/hantro_postproc.c
    +++ b/drivers/media/platform/verisilicon/hantro_postproc.c
    @@ -213,6 +213,9 @@ int hantro_postproc_alloc(struct hantro_ctx *ctx)
    else if (ctx->vpu_src_fmt->fourcc == V4L2_PIX_FMT_HEVC_SLICE)
    buf_size += hantro_hevc_mv_size(pix_mp.width,
    pix_mp.height);
    + else if (ctx->vpu_src_fmt->fourcc == V4L2_PIX_FMT_AV1_FRAME)
    + buf_size += hantro_av1_mv_size(pix_mp.width,
    + pix_mp.height);

    for (i = 0; i < num_buffers; ++i) {
    struct hantro_aux_buf *priv = &ctx->postproc.dec_q[i];
    diff --git a/drivers/media/platform/verisilicon/hantro_v4l2.c b/drivers/media/platform/verisilicon/hantro_v4l2.c
    index 7e74e47c9a89..9adca9b7ef24 100644
    --- a/drivers/media/platform/verisilicon/hantro_v4l2.c
    +++ b/drivers/media/platform/verisilicon/hantro_v4l2.c
    @@ -336,6 +336,11 @@ static int hantro_try_fmt(const struct hantro_ctx *ctx,
    pix_mp->plane_fmt[0].sizeimage +=
    hantro_hevc_mv_size(pix_mp->width,
    pix_mp->height);
    + else if (ctx->vpu_src_fmt->fourcc == V4L2_PIX_FMT_AV1_FRAME &&
    + !hantro_needs_postproc(ctx, fmt))
    + pix_mp->plane_fmt[0].sizeimage +=
    + hantro_av1_mv_size(pix_mp->width,
    + pix_mp->height);
    } else if (!pix_mp->plane_fmt[0].sizeimage) {
    /*
    * For coded formats the application can specify
    --
    2.34.1
    \
     
     \ /
      Last update: 2023-03-27 00:21    [W:2.366 / U:0.220 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site