| Message ID | 20190108171313.1750-3-p.zabel@pengutronix.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/4] media: v4l2-ctrl: Add control to enable h.264 constrained intra prediction | expand |
Hi Philipp On 08/01/2019 17:13, Philipp Zabel wrote: > Allow to enable constrained intra prediction in the h.264 encoder. > > Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> > --- > drivers/media/platform/coda/coda-bit.c | 4 +++- > drivers/media/platform/coda/coda-common.c | 6 ++++++ > drivers/media/platform/coda/coda.h | 1 + > 3 files changed, 10 insertions(+), 1 deletion(-) > > diff --git a/drivers/media/platform/coda/coda-bit.c b/drivers/media/platform/coda/coda-bit.c > index 8e0194993a52..5e5accc3ae62 100644 > --- 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 << Shouldn't need !! as it's already a bool. Regards, Ian > + 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 7518f01c48f7..f6c9273805bb 100644 > --- 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 31cea72f5b2a..f3d0cff4ef3a 100644 > --- 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; >
diff --git a/drivers/media/platform/coda/coda-bit.c b/drivers/media/platform/coda/coda-bit.c index 8e0194993a52..5e5accc3ae62 100644 --- 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 7518f01c48f7..f6c9273805bb 100644 --- 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 31cea72f5b2a..f3d0cff4ef3a 100644 --- 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;
Allow to enable constrained intra prediction in the h.264 encoder. Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> --- drivers/media/platform/coda/coda-bit.c | 4 +++- drivers/media/platform/coda/coda-common.c | 6 ++++++ drivers/media/platform/coda/coda.h | 1 + 3 files changed, 10 insertions(+), 1 deletion(-)