Merge "msm: venc: fix ltrmode for unsupported codec/RC type"

This commit is contained in:
qctecmdr 2019-07-30 23:59:11 -07:00 committed by Gerrit - the friendly Code Review server
commit 8ce34de1fe

View File

@ -3738,6 +3738,7 @@ int msm_venc_set_ltr_mode(struct msm_vidc_inst *inst)
return -EINVAL;
}
hdev = inst->core->device;
ctrl = get_ctrl(inst, V4L2_CID_MPEG_VIDC_VIDEO_LTRCOUNT);
codec = get_v4l2_codec(inst);
if (!(codec == V4L2_PIX_FMT_HEVC || codec == V4L2_PIX_FMT_H264)) {
@ -3752,7 +3753,6 @@ int msm_venc_set_ltr_mode(struct msm_vidc_inst *inst)
goto disable_ltr;
}
ctrl = get_ctrl(inst, V4L2_CID_MPEG_VIDC_VIDEO_LTRCOUNT);
if (!ctrl->val)
return 0;
if (ctrl->val > inst->capability.cap[CAP_LTR_COUNT].max) {