lkml.org 
[lkml]   [2019]   [Jan]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.20 144/304] media: coda: fix H.264 deblocking filter controls
    Date
    From: Philipp Zabel <p.zabel@pengutronix.de>

    [ Upstream commit 75fa6e4f83a0923fe753827d354998d448b4fd6a ]

    Add support for the third loop filter mode
    V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_DISABLED_AT_SLICE_BOUNDARY,
    and fix V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_ALPHA and
    V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_BETA controls.

    The filter offset controls are signed values in the -6 to 6 range and
    are stored into the slice header fields slice_alpha_c0_offset_div2 and
    slice_beta_offset_div2. The actual filter offsets FilterOffsetA/B are
    double their value, in range of -12 to 12.

    Rename variables to more closely match the nomenclature in the H.264
    specification.

    Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
    Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/media/platform/coda/coda-bit.c | 19 +++++++++----------
    drivers/media/platform/coda/coda-common.c | 15 +++++++--------
    drivers/media/platform/coda/coda.h | 6 +++---
    drivers/media/platform/coda/coda_regs.h | 2 +-
    4 files changed, 20 insertions(+), 22 deletions(-)

    diff --git a/drivers/media/platform/coda/coda-bit.c b/drivers/media/platform/coda/coda-bit.c
    index d26c2d85a009..d20d3df5778b 100644
    --- a/drivers/media/platform/coda/coda-bit.c
    +++ b/drivers/media/platform/coda/coda-bit.c
    @@ -991,16 +991,15 @@ static int coda_start_encoding(struct coda_ctx *ctx)
    else
    coda_write(dev, CODA_STD_H264,
    CODA_CMD_ENC_SEQ_COD_STD);
    - if (ctx->params.h264_deblk_enabled) {
    - value = ((ctx->params.h264_deblk_alpha &
    - CODA_264PARAM_DEBLKFILTEROFFSETALPHA_MASK) <<
    - CODA_264PARAM_DEBLKFILTEROFFSETALPHA_OFFSET) |
    - ((ctx->params.h264_deblk_beta &
    - CODA_264PARAM_DEBLKFILTEROFFSETBETA_MASK) <<
    - CODA_264PARAM_DEBLKFILTEROFFSETBETA_OFFSET);
    - } else {
    - value = 1 << CODA_264PARAM_DISABLEDEBLK_OFFSET;
    - }
    + value = ((ctx->params.h264_disable_deblocking_filter_idc &
    + CODA_264PARAM_DISABLEDEBLK_MASK) <<
    + CODA_264PARAM_DISABLEDEBLK_OFFSET) |
    + ((ctx->params.h264_slice_alpha_c0_offset_div2 &
    + CODA_264PARAM_DEBLKFILTEROFFSETALPHA_MASK) <<
    + CODA_264PARAM_DEBLKFILTEROFFSETALPHA_OFFSET) |
    + ((ctx->params.h264_slice_beta_offset_div2 &
    + CODA_264PARAM_DEBLKFILTEROFFSETBETA_MASK) <<
    + CODA_264PARAM_DEBLKFILTEROFFSETBETA_OFFSET);
    coda_write(dev, value, CODA_CMD_ENC_SEQ_264_PARA);
    break;
    case V4L2_PIX_FMT_JPEG:
    diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/coda/coda-common.c
    index 2848ea5f464d..d0b36d6eb86e 100644
    --- a/drivers/media/platform/coda/coda-common.c
    +++ b/drivers/media/platform/coda/coda-common.c
    @@ -1792,14 +1792,13 @@ static int coda_s_ctrl(struct v4l2_ctrl *ctrl)
    ctx->params.h264_max_qp = ctrl->val;
    break;
    case V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_ALPHA:
    - ctx->params.h264_deblk_alpha = ctrl->val;
    + ctx->params.h264_slice_alpha_c0_offset_div2 = ctrl->val;
    break;
    case V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_BETA:
    - ctx->params.h264_deblk_beta = ctrl->val;
    + ctx->params.h264_slice_beta_offset_div2 = ctrl->val;
    break;
    case V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_MODE:
    - ctx->params.h264_deblk_enabled = (ctrl->val ==
    - V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_ENABLED);
    + ctx->params.h264_disable_deblocking_filter_idc = ctrl->val;
    break;
    case V4L2_CID_MPEG_VIDEO_H264_PROFILE:
    /* TODO: switch between baseline and constrained baseline */
    @@ -1881,13 +1880,13 @@ static void coda_encode_ctrls(struct coda_ctx *ctx)
    v4l2_ctrl_new_std(&ctx->ctrls, &coda_ctrl_ops,
    V4L2_CID_MPEG_VIDEO_H264_MAX_QP, 0, 51, 1, 51);
    v4l2_ctrl_new_std(&ctx->ctrls, &coda_ctrl_ops,
    - V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_ALPHA, 0, 15, 1, 0);
    + V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_ALPHA, -6, 6, 1, 0);
    v4l2_ctrl_new_std(&ctx->ctrls, &coda_ctrl_ops,
    - V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_BETA, 0, 15, 1, 0);
    + V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_BETA, -6, 6, 1, 0);
    v4l2_ctrl_new_std_menu(&ctx->ctrls, &coda_ctrl_ops,
    V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_MODE,
    - V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_DISABLED, 0x0,
    - V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_ENABLED);
    + V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_DISABLED_AT_SLICE_BOUNDARY,
    + 0x0, V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_ENABLED);
    v4l2_ctrl_new_std_menu(&ctx->ctrls, &coda_ctrl_ops,
    V4L2_CID_MPEG_VIDEO_H264_PROFILE,
    V4L2_MPEG_VIDEO_H264_PROFILE_BASELINE, 0x0,
    diff --git a/drivers/media/platform/coda/coda.h b/drivers/media/platform/coda/coda.h
    index 19ac0b9dc6eb..2469ca1dc598 100644
    --- a/drivers/media/platform/coda/coda.h
    +++ b/drivers/media/platform/coda/coda.h
    @@ -115,9 +115,9 @@ struct coda_params {
    u8 h264_inter_qp;
    u8 h264_min_qp;
    u8 h264_max_qp;
    - u8 h264_deblk_enabled;
    - u8 h264_deblk_alpha;
    - u8 h264_deblk_beta;
    + u8 h264_disable_deblocking_filter_idc;
    + s8 h264_slice_alpha_c0_offset_div2;
    + s8 h264_slice_beta_offset_div2;
    u8 h264_profile_idc;
    u8 h264_level_idc;
    u8 mpeg4_intra_qp;
    diff --git a/drivers/media/platform/coda/coda_regs.h b/drivers/media/platform/coda/coda_regs.h
    index 5e7b00a97671..e675e38f3475 100644
    --- a/drivers/media/platform/coda/coda_regs.h
    +++ b/drivers/media/platform/coda/coda_regs.h
    @@ -292,7 +292,7 @@
    #define CODA_264PARAM_DEBLKFILTEROFFSETALPHA_OFFSET 8
    #define CODA_264PARAM_DEBLKFILTEROFFSETALPHA_MASK 0x0f
    #define CODA_264PARAM_DISABLEDEBLK_OFFSET 6
    -#define CODA_264PARAM_DISABLEDEBLK_MASK 0x01
    +#define CODA_264PARAM_DISABLEDEBLK_MASK 0x03
    #define CODA_264PARAM_CONSTRAINEDINTRAPREDFLAG_OFFSET 5
    #define CODA_264PARAM_CONSTRAINEDINTRAPREDFLAG_MASK 0x01
    #define CODA_264PARAM_CHROMAQPOFFSET_OFFSET 0
    --
    2.19.1
    \
     
     \ /
      Last update: 2019-01-28 18:42    [W:4.148 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site