Merge "video: driver: add frame_skip mode control setting for heic"

driver/platform/waipio/src/msm_vidc_waipio.c

@@ -377,7 +377,7 @@ static struct msm_platform_inst_capability instance_data_waipio[] = {
 		1, V4L2_MPEG_MSM_VIDC_DISABLE,
 		V4L2_CID_MPEG_VIDEO_HEVC_LOSSLESS_CU},
 
-	{FRAME_SKIP_MODE, ENC, H264|HEVC,
+	{FRAME_SKIP_MODE, ENC, H264|HEVC|HEIC,
 		V4L2_MPEG_VIDEO_FRAME_SKIP_MODE_DISABLED,
 		V4L2_MPEG_VIDEO_FRAME_SKIP_MODE_BUF_LIMIT,
 		BIT(V4L2_MPEG_VIDEO_FRAME_SKIP_MODE_DISABLED) |

driver/vidc/src/msm_vidc_driver.c

@@ -4756,6 +4756,14 @@ static bool msm_vidc_allow_image_encode_session(struct msm_vidc_inst *inst)
 		goto exit;
 	}
 
+	/* is frame skip mode disabled */
+	allow = !capability->cap[FRAME_SKIP_MODE].value;
+	if (!allow) {
+		i_vpr_e(inst, "%s: frame skip mode not disabled: %#x\n", __func__,
+			capability->cap[FRAME_SKIP_MODE].value);
+		goto exit;
+	}
+
 	/* is profile type Still Pic */
 	if (is_10bit_colorformat(pix_fmt))
 		allow = profile == V4L2_MPEG_VIDEO_HEVC_PROFILE_MAIN_10_STILL_PICTURE;