media: coda: Add control for h.264 constrained intra prediction

Allow to enable constrained intra prediction in the h.264 encoder.

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>

diff --git a/drivers/media/platform/coda/coda-bit.c b/drivers/media/platform/coda/coda-bit.c
index 8e0194993a52e826d82f325b22adc99a2f3313cb..2998c869f79fc76f7cb7b2cc497e58c167613b8d 100644 (file)
--- a/drivers/media/platform/coda/coda-bit.c
+++ b/drivers/media/platform/coda/coda-bit.c
@@ -1010,7 +1010,9 @@ static int coda_start_encoding(struct coda_ctx *ctx)
                         CODA_264PARAM_DEBLKFILTEROFFSETALPHA_OFFSET) |
                        ((ctx->params.h264_slice_beta_offset_div2 &
                          CODA_264PARAM_DEBLKFILTEROFFSETBETA_MASK) <<
-                        CODA_264PARAM_DEBLKFILTEROFFSETBETA_OFFSET);
+                        CODA_264PARAM_DEBLKFILTEROFFSETBETA_OFFSET) |
+                       (ctx->params.h264_constrained_intra_pred_flag <<
+                        CODA_264PARAM_CONSTRAINEDINTRAPREDFLAG_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 7518f01c48f762ad2d9b4f7cbadd3c2ac4b11cbd..f6c9273805bb3dac1dfdafc17e863f27d71a583f 100644 (file)
--- a/drivers/media/platform/coda/coda-common.c
+++ b/drivers/media/platform/coda/coda-common.c
@@ -1839,6 +1839,9 @@ static int coda_s_ctrl(struct v4l2_ctrl *ctrl)
        case V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_MODE:
                ctx->params.h264_disable_deblocking_filter_idc = ctrl->val;
                break;
+       case V4L2_CID_MPEG_VIDEO_H264_CONSTRAINED_INTRA_PREDICTION:
+               ctx->params.h264_constrained_intra_pred_flag = ctrl->val;
+               break;
        case V4L2_CID_MPEG_VIDEO_H264_PROFILE:
                /* TODO: switch between baseline and constrained baseline */
                if (ctx->inst_type == CODA_INST_ENCODER)
@@ -1925,6 +1928,9 @@ static void coda_encode_ctrls(struct coda_ctx *ctx)
                V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_MODE,
                V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_DISABLED_AT_SLICE_BOUNDARY,
                0x0, V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_ENABLED);
+       v4l2_ctrl_new_std(&ctx->ctrls, &coda_ctrl_ops,
+               V4L2_CID_MPEG_VIDEO_H264_CONSTRAINED_INTRA_PREDICTION, 0, 1, 1,
+               0);
        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 31cea72f5b2ac7b61b21206ccc3a5e06ba114254..f3d0cff4ef3a3252f3e669bd1f36e0d31511ac03 100644 (file)
--- a/drivers/media/platform/coda/coda.h
+++ b/drivers/media/platform/coda/coda.h
@@ -118,6 +118,7 @@ struct coda_params {
        u8                      h264_disable_deblocking_filter_idc;
        s8                      h264_slice_alpha_c0_offset_div2;
        s8                      h264_slice_beta_offset_div2;
+       bool                    h264_constrained_intra_pred_flag;
        u8                      h264_profile_idc;
        u8                      h264_level_idc;
        u8                      mpeg4_intra_qp;