queue-4.14/media-coda-fix-h.264-deblocking-filter-controls.patch

   1 From 6068839ca5ebcf8a06ac6456566a506793ba676e Mon Sep 17 00:00:00 2001
   2 From: Philipp Zabel <p.zabel@pengutronix.de>
   3 Date: Wed, 28 Nov 2018 08:01:22 -0500
   4 Subject: media: coda: fix H.264 deblocking filter controls
   5
   6 [ Upstream commit 75fa6e4f83a0923fe753827d354998d448b4fd6a ]
   7
   8 Add support for the third loop filter mode
   9 V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_DISABLED_AT_SLICE_BOUNDARY,
  10 and fix V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_ALPHA and
  11 V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_BETA controls.
  12
  13 The filter offset controls are signed values in the -6 to 6 range and
  14 are stored into the slice header fields slice_alpha_c0_offset_div2 and
  15 slice_beta_offset_div2. The actual filter offsets FilterOffsetA/B are
  16 double their value, in range of -12 to 12.
  17
  18 Rename variables to more closely match the nomenclature in the H.264
  19 specification.
  20
  21 Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
  22 Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
  23 Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
  24 Signed-off-by: Sasha Levin <sashal@kernel.org>
  25 ---
  26  drivers/media/platform/coda/coda-bit.c    | 19 +++++++++----------
  27  drivers/media/platform/coda/coda-common.c | 15 +++++++--------
  28  drivers/media/platform/coda/coda.h        |  6 +++---
  29  drivers/media/platform/coda/coda_regs.h   |  2 +-
  30  4 files changed, 20 insertions(+), 22 deletions(-)
  31
  32 diff --git a/drivers/media/platform/coda/coda-bit.c b/drivers/media/platform/coda/coda-bit.c
  33 index 291c40933935..3457a5f1c8a8 100644
  34 --- a/drivers/media/platform/coda/coda-bit.c
  35 +++ b/drivers/media/platform/coda/coda-bit.c
  36 @@ -953,16 +953,15 @@ static int coda_start_encoding(struct coda_ctx *ctx)
  37                 else
  38                         coda_write(dev, CODA_STD_H264,
  39                                    CODA_CMD_ENC_SEQ_COD_STD);
  40 -               if (ctx->params.h264_deblk_enabled) {
  41 -                       value = ((ctx->params.h264_deblk_alpha &
  42 -                                 CODA_264PARAM_DEBLKFILTEROFFSETALPHA_MASK) <<
  43 -                                CODA_264PARAM_DEBLKFILTEROFFSETALPHA_OFFSET) |
  44 -                               ((ctx->params.h264_deblk_beta &
  45 -                                 CODA_264PARAM_DEBLKFILTEROFFSETBETA_MASK) <<
  46 -                                CODA_264PARAM_DEBLKFILTEROFFSETBETA_OFFSET);
  47 -               } else {
  48 -                       value = 1 << CODA_264PARAM_DISABLEDEBLK_OFFSET;
  49 -               }
  50 +               value = ((ctx->params.h264_disable_deblocking_filter_idc &
  51 +                         CODA_264PARAM_DISABLEDEBLK_MASK) <<
  52 +                        CODA_264PARAM_DISABLEDEBLK_OFFSET) |
  53 +                       ((ctx->params.h264_slice_alpha_c0_offset_div2 &
  54 +                         CODA_264PARAM_DEBLKFILTEROFFSETALPHA_MASK) <<
  55 +                        CODA_264PARAM_DEBLKFILTEROFFSETALPHA_OFFSET) |
  56 +                       ((ctx->params.h264_slice_beta_offset_div2 &
  57 +                         CODA_264PARAM_DEBLKFILTEROFFSETBETA_MASK) <<
  58 +                        CODA_264PARAM_DEBLKFILTEROFFSETBETA_OFFSET);
  59                 coda_write(dev, value, CODA_CMD_ENC_SEQ_264_PARA);
  60                 break;
  61         case V4L2_PIX_FMT_JPEG:
  62 diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/coda/coda-common.c
  63 index 99d138d3f87f..2e1472fadc2c 100644
  64 --- a/drivers/media/platform/coda/coda-common.c
  65 +++ b/drivers/media/platform/coda/coda-common.c
  66 @@ -1675,14 +1675,13 @@ static int coda_s_ctrl(struct v4l2_ctrl *ctrl)
  67                 ctx->params.h264_max_qp = ctrl->val;
  68                 break;
  69         case V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_ALPHA:
  70 -               ctx->params.h264_deblk_alpha = ctrl->val;
  71 +               ctx->params.h264_slice_alpha_c0_offset_div2 = ctrl->val;
  72                 break;
  73         case V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_BETA:
  74 -               ctx->params.h264_deblk_beta = ctrl->val;
  75 +               ctx->params.h264_slice_beta_offset_div2 = ctrl->val;
  76                 break;
  77         case V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_MODE:
  78 -               ctx->params.h264_deblk_enabled = (ctrl->val ==
  79 -                               V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_ENABLED);
  80 +               ctx->params.h264_disable_deblocking_filter_idc = ctrl->val;
  81                 break;
  82         case V4L2_CID_MPEG_VIDEO_H264_PROFILE:
  83                 /* TODO: switch between baseline and constrained baseline */
  84 @@ -1764,13 +1763,13 @@ static void coda_encode_ctrls(struct coda_ctx *ctx)
  85         v4l2_ctrl_new_std(&ctx->ctrls, &coda_ctrl_ops,
  86                 V4L2_CID_MPEG_VIDEO_H264_MAX_QP, 0, 51, 1, 51);
  87         v4l2_ctrl_new_std(&ctx->ctrls, &coda_ctrl_ops,
  88 -               V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_ALPHA, 0, 15, 1, 0);
  89 +               V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_ALPHA, -6, 6, 1, 0);
  90         v4l2_ctrl_new_std(&ctx->ctrls, &coda_ctrl_ops,
  91 -               V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_BETA, 0, 15, 1, 0);
  92 +               V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_BETA, -6, 6, 1, 0);
  93         v4l2_ctrl_new_std_menu(&ctx->ctrls, &coda_ctrl_ops,
  94                 V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_MODE,
  95 -               V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_DISABLED, 0x0,
  96 -               V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_ENABLED);
  97 +               V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_DISABLED_AT_SLICE_BOUNDARY,
  98 +               0x0, V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_ENABLED);
  99         v4l2_ctrl_new_std_menu(&ctx->ctrls, &coda_ctrl_ops,
 100                 V4L2_CID_MPEG_VIDEO_H264_PROFILE,
 101                 V4L2_MPEG_VIDEO_H264_PROFILE_BASELINE, 0x0,
 102 diff --git a/drivers/media/platform/coda/coda.h b/drivers/media/platform/coda/coda.h
 103 index c5f504d8cf67..389a882cc3da 100644
 104 --- a/drivers/media/platform/coda/coda.h
 105 +++ b/drivers/media/platform/coda/coda.h
 106 @@ -114,9 +114,9 @@ struct coda_params {
 107         u8                      h264_inter_qp;
 108         u8                      h264_min_qp;
 109         u8                      h264_max_qp;
 110 -       u8                      h264_deblk_enabled;
 111 -       u8                      h264_deblk_alpha;
 112 -       u8                      h264_deblk_beta;
 113 +       u8                      h264_disable_deblocking_filter_idc;
 114 +       s8                      h264_slice_alpha_c0_offset_div2;
 115 +       s8                      h264_slice_beta_offset_div2;
 116         u8                      h264_profile_idc;
 117         u8                      h264_level_idc;
 118         u8                      mpeg4_intra_qp;
 119 diff --git a/drivers/media/platform/coda/coda_regs.h b/drivers/media/platform/coda/coda_regs.h
 120 index 38df5fd9a2fa..546f5762357c 100644
 121 --- a/drivers/media/platform/coda/coda_regs.h
 122 +++ b/drivers/media/platform/coda/coda_regs.h
 123 @@ -292,7 +292,7 @@
 124  #define                CODA_264PARAM_DEBLKFILTEROFFSETALPHA_OFFSET     8
 125  #define                CODA_264PARAM_DEBLKFILTEROFFSETALPHA_MASK       0x0f
 126  #define                CODA_264PARAM_DISABLEDEBLK_OFFSET               6
 127 -#define                CODA_264PARAM_DISABLEDEBLK_MASK         0x01
 128 +#define                CODA_264PARAM_DISABLEDEBLK_MASK         0x03
 129  #define                CODA_264PARAM_CONSTRAINEDINTRAPREDFLAG_OFFSET   5
 130  #define                CODA_264PARAM_CONSTRAINEDINTRAPREDFLAG_MASK     0x01
 131  #define                CODA_264PARAM_CHROMAQPOFFSET_OFFSET             0
 132 --
 133 2.19.1
 134