lkml.org 
[lkml]   [2022]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 118/667] media: hantro: HEVC: unconditionnaly set pps_{cb/cr}_qp_offset values
    Date
    From: Benjamin Gaignard <benjamin.gaignard@collabora.com>

    [ Upstream commit 46c836569196f377f87a3657b330cffaf94bd727 ]

    Always set pps_cb_qp_offset and pps_cr_qp_offset values in Hantro/G2
    register whatever is V4L2_HEVC_PPS_FLAG_PPS_SLICE_CHROMA_QP_OFFSETS_PRESENT
    flag value.
    The vendor code does the same to set these values.
    This fixes conformance test CAINIT_G_SHARP_3.

    Fluster HEVC score is increase by one with this patch.

    Signed-off-by: Benjamin Gaignard <benjamin.gaignard@collabora.com>
    Reviewed-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
    Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/staging/media/hantro/hantro_g2_hevc_dec.c | 9 ++-------
    1 file changed, 2 insertions(+), 7 deletions(-)

    diff --git a/drivers/staging/media/hantro/hantro_g2_hevc_dec.c b/drivers/staging/media/hantro/hantro_g2_hevc_dec.c
    index 340efb57fd18..ee069564205a 100644
    --- a/drivers/staging/media/hantro/hantro_g2_hevc_dec.c
    +++ b/drivers/staging/media/hantro/hantro_g2_hevc_dec.c
    @@ -194,13 +194,8 @@ static void set_params(struct hantro_ctx *ctx)
    hantro_reg_write(vpu, &g2_max_cu_qpd_depth, 0);
    }

    - if (pps->flags & V4L2_HEVC_PPS_FLAG_PPS_SLICE_CHROMA_QP_OFFSETS_PRESENT) {
    - hantro_reg_write(vpu, &g2_cb_qp_offset, pps->pps_cb_qp_offset);
    - hantro_reg_write(vpu, &g2_cr_qp_offset, pps->pps_cr_qp_offset);
    - } else {
    - hantro_reg_write(vpu, &g2_cb_qp_offset, 0);
    - hantro_reg_write(vpu, &g2_cr_qp_offset, 0);
    - }
    + hantro_reg_write(vpu, &g2_cb_qp_offset, pps->pps_cb_qp_offset);
    + hantro_reg_write(vpu, &g2_cr_qp_offset, pps->pps_cr_qp_offset);

    hantro_reg_write(vpu, &g2_filt_offset_beta, pps->pps_beta_offset_div2);
    hantro_reg_write(vpu, &g2_filt_offset_tc, pps->pps_tc_offset_div2);
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-06-07 20:28    [W:4.094 / U:1.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site