From a491b399dd47d62b024905ff3273d8da5657e265 Mon Sep 17 00:00:00 2001 From: Darshana Patil Date: Tue, 15 Oct 2019 18:52:27 -0700 Subject: [PATCH] msm: venc: Disable input extradata plane for secure encoding For secure encoding case, there is no camera usage. Hence, by default make number of planes as 1. If any input requires extradata, client will enable it and driver will update number of planes. Change-Id: Id9afd0a286a53d5d4c6045ba58227f57a0a8e0ca Signed-off-by: Darshana Patil --- msm/vidc/msm_venc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/msm/vidc/msm_venc.c b/msm/vidc/msm_venc.c index 08e179a73654..596404906973 100644 --- a/msm/vidc/msm_venc.c +++ b/msm/vidc/msm_venc.c @@ -1153,7 +1153,7 @@ int msm_venc_inst_init(struct msm_vidc_inst *inst) strlcpy(inst->fmts[INPUT_PORT].description, fmt_desc->description, sizeof(inst->fmts[INPUT_PORT].description)); inst->prop.bframe_changed = false; - inst->prop.extradata_ctrls = EXTRADATA_DEFAULT; + inst->prop.extradata_ctrls = EXTRADATA_NONE; inst->buffer_mode_set[INPUT_PORT] = HAL_BUFFER_MODE_DYNAMIC; inst->buffer_mode_set[OUTPUT_PORT] = HAL_BUFFER_MODE_STATIC; inst->clk_data.frame_rate = (DEFAULT_FPS << 16); @@ -1593,6 +1593,10 @@ int msm_venc_s_ctrl(struct msm_vidc_inst *inst, struct v4l2_ctrl *ctrl) inst->flags &= ~VIDC_SECURE; if (ctrl->val) inst->flags |= VIDC_SECURE; + f = &inst->fmts[INPUT_PORT].v4l2_fmt; + f->fmt.pix_mp.num_planes = 1; + s_vpr_h(sid, "%s: num planes %d for secure sessions\n", + __func__, f->fmt.pix_mp.num_planes); break; case V4L2_CID_MPEG_VIDC_VIDEO_USELTRFRAME: if (inst->state == MSM_VIDC_START_DONE) {