msm: vidc: fix slice mbs setting

When MB_MODE slice is enabled, should use output
width/height to calculate the allowed slice size.
Fix warning log for NV21 format.

Change-Id: I97441cef36484ac6e82ba78b816f96d4b5bf2ab4
Signed-off-by: Qiwei Liu <qiweil@codeaurora.org>
This commit is contained in:
Qiwei Liu 2019-06-25 17:59:38 +08:00
commit 254903a695
2 changed files with 3 additions and 1 deletions

View file

@ -2902,7 +2902,7 @@ int msm_venc_set_slice_control_mode(struct msm_vidc_inst *inst)
goto set_and_exit;
}
f = &inst->fmts[INPUT_PORT].v4l2_fmt;
f = &inst->fmts[OUTPUT_PORT].v4l2_fmt;
output_width = f->fmt.pix_mp.width;
output_height = f->fmt.pix_mp.height;
if ((codec == V4L2_PIX_FMT_HEVC) &&

View file

@ -3532,6 +3532,8 @@ u32 msm_comm_convert_color_fmt(u32 v4l2_fmt)
switch (v4l2_fmt) {
case V4L2_PIX_FMT_NV12:
return COLOR_FMT_NV12;
case V4L2_PIX_FMT_NV21:
return COLOR_FMT_NV21;
case V4L2_PIX_FMT_NV12_512:
return COLOR_FMT_NV12_512;
case V4L2_PIX_FMT_SDE_Y_CBCR_H2V2_P010_VENUS: