lkml.org 
[lkml]   [2022]   [Mar]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v1 17/24] media: rkvdec: h264: Validate and use pic width and height in mbs
    Date
    From: Jonas Karlman <jonas@kwiboo.se>

    The width and height in mbs is currently configured based on OUTPUT buffer
    resolution, this works for frame pictures but can cause issues for field
    pictures.

    When frame_mbs_only_flag is 0 the height in mbs should be height of
    the field instead of height of frame.

    Validate pic_width_in_mbs_minus1 and pic_height_in_map_units_minus1
    against OUTPUT buffer resolution and use these values to configure HW.

    Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
    ---
    drivers/staging/media/rkvdec/rkvdec-h264.c | 4 ++--
    drivers/staging/media/rkvdec/rkvdec.c | 10 ++++++++++
    2 files changed, 12 insertions(+), 2 deletions(-)

    diff --git a/drivers/staging/media/rkvdec/rkvdec-h264.c b/drivers/staging/media/rkvdec/rkvdec-h264.c
    index db1e762baee5..847b8957dad3 100644
    --- a/drivers/staging/media/rkvdec/rkvdec-h264.c
    +++ b/drivers/staging/media/rkvdec/rkvdec-h264.c
    @@ -672,8 +672,8 @@ static void assemble_hw_pps(struct rkvdec_ctx *ctx,
    LOG2_MAX_PIC_ORDER_CNT_LSB_MINUS4);
    WRITE_PPS(!!(sps->flags & V4L2_H264_SPS_FLAG_DELTA_PIC_ORDER_ALWAYS_ZERO),
    DELTA_PIC_ORDER_ALWAYS_ZERO_FLAG);
    - WRITE_PPS(DIV_ROUND_UP(ctx->coded_fmt.fmt.pix_mp.width, 16), PIC_WIDTH_IN_MBS);
    - WRITE_PPS(DIV_ROUND_UP(ctx->coded_fmt.fmt.pix_mp.height, 16), PIC_HEIGHT_IN_MBS);
    + WRITE_PPS(sps->pic_width_in_mbs_minus1 + 1, PIC_WIDTH_IN_MBS);
    + WRITE_PPS(sps->pic_height_in_map_units_minus1 + 1, PIC_HEIGHT_IN_MBS);
    WRITE_PPS(!!(sps->flags & V4L2_H264_SPS_FLAG_FRAME_MBS_ONLY),
    FRAME_MBS_ONLY_FLAG);
    WRITE_PPS(!!(sps->flags & V4L2_H264_SPS_FLAG_MB_ADAPTIVE_FRAME_FIELD),
    diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvdec/rkvdec.c
    index 22c0382c579e..67539f4bf382 100644
    --- a/drivers/staging/media/rkvdec/rkvdec.c
    +++ b/drivers/staging/media/rkvdec/rkvdec.c
    @@ -29,8 +29,11 @@

    static int rkvdec_try_ctrl(struct v4l2_ctrl *ctrl)
    {
    + struct rkvdec_ctx *ctx = container_of(ctrl->handler, struct rkvdec_ctx, ctrl_hdl);
    +
    if (ctrl->id == V4L2_CID_STATELESS_H264_SPS) {
    const struct v4l2_ctrl_h264_sps *sps = ctrl->p_new.p_h264_sps;
    + unsigned int width, height;
    /*
    * TODO: The hardware supports 10-bit and 4:2:2 profiles,
    * but it's currently broken in the driver.
    @@ -45,6 +48,13 @@ static int rkvdec_try_ctrl(struct v4l2_ctrl *ctrl)
    if (sps->bit_depth_luma_minus8 != 0)
    /* Only 8-bit is supported */
    return -EINVAL;
    +
    + width = (sps->pic_width_in_mbs_minus1 + 1) * 16;
    + height = (sps->pic_height_in_map_units_minus1 + 1) * 16;
    +
    + if (width > ctx->coded_fmt.fmt.pix_mp.width ||
    + height > ctx->coded_fmt.fmt.pix_mp.height)
    + return -EINVAL;
    }
    return 0;
    }
    --
    2.34.1
    \
     
     \ /
      Last update: 2022-03-28 22:02    [W:5.621 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site