From a2e13c93b9f649a0910b803f2666a259f33e4ae4 Mon Sep 17 00:00:00 2001 From: Yang Xiaoqin Date: Fri, 2 Jul 2021 11:22:08 +0800 Subject: [PATCH] msm: venc: set auto frame rate only for VBR CFR native recorder Don't set AUDO_FRAME_RATE for non camera-recorder usercase. Change-Id: I1e072538d2a7f431653c7bfd933b5d1c0b83f906 Signed-off-by: Yang Xiaoqin --- msm/vidc/msm_venc.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/msm/vidc/msm_venc.c b/msm/vidc/msm_venc.c index c47f37121628..849dc9b72c10 100644 --- a/msm/vidc/msm_venc.c +++ b/msm/vidc/msm_venc.c @@ -2150,6 +2150,7 @@ int msm_venc_store_timestamp(struct msm_vidc_inst *inst, u64 timestamp_us) int count = 0; int rc = 0; struct v4l2_ctrl *superframe_ctrl = NULL; + struct v4l2_ctrl *ctrl = NULL; if (!inst || !inst->core) { d_vpr_e("%s: invalid parameters\n", __func__); @@ -2160,6 +2161,12 @@ int msm_venc_store_timestamp(struct msm_vidc_inst *inst, u64 timestamp_us) is_image_session(inst)) return rc; + /* set auto-framerate only for VBR CFR native recorder */ + ctrl = get_ctrl(inst, V4L2_CID_MPEG_VIDC_VENC_NATIVE_RECORDER); + if ((ctrl && ctrl->val == V4L2_MPEG_MSM_VIDC_DISABLE) || + (inst->rc_type != V4L2_MPEG_VIDEO_BITRATE_MODE_VBR)) + return rc; + mutex_lock(&inst->timestamps.lock); list_for_each_entry(node, &inst->timestamps.list, list) { count++;