From 3498fb8bbca90b8ed4f467a790215d46c5e07a6d Mon Sep 17 00:00:00 2001 From: Shi Zhongbo Date: Mon, 14 Oct 2019 16:27:08 +0800 Subject: [PATCH] msm: venc: fix to skip mbpf checking for HEIF Fix to add condition to skip mbpf capability checking for HEIF image encoding. Change-Id: Ife323366b8c08040c3f6fab8a0d15b89fe6f6777 Signed-off-by: Shi Zhongbo --- msm/vidc/msm_vidc_common.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/msm/vidc/msm_vidc_common.c b/msm/vidc/msm_vidc_common.c index ac91f707ec54..f6facbfcc156 100644 --- a/msm/vidc/msm_vidc_common.c +++ b/msm/vidc/msm_vidc_common.c @@ -5477,7 +5477,7 @@ static int msm_vidc_check_mbpf_supported(struct msm_vidc_inst *inst) if (is_thumbnail_session(temp)) continue; /* ignore HEIF sessions */ - if (is_image_session(temp)) + if (is_image_session(temp) || is_grid_session(temp)) continue; mbpf += NUM_MBS_PER_FRAME( temp->fmts[INPUT_PORT].v4l2_fmt.fmt.pix_mp.height, @@ -5745,7 +5745,8 @@ int msm_vidc_check_session_supported(struct msm_vidc_inst *inst) /* Image size max capability has equal width and height, * hence, don't check mbpf for image sessions. */ - if (!rc && !is_image_session(inst) && + if (!rc && !(is_image_session(inst) || + is_grid_session(inst)) && NUM_MBS_PER_FRAME(input_width, input_height) > mbpf_max) { s_vpr_e(sid, "Unsupported mbpf %d, max %d\n",