media: venus: add support for key frame
authorMalathi Gottam <mgottam@codeaurora.org>
Fri, 2 Nov 2018 12:57:56 +0000 (08:57 -0400)
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Fri, 7 Dec 2018 13:14:20 +0000 (08:14 -0500)
When client requests for a keyframe, set the property
to hardware to generate the sync frame.

Signed-off-by: Malathi Gottam <mgottam@codeaurora.org>
Acked-by: Tomasz Figa <tfiga@chromium.org>
Acked-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
drivers/media/platform/qcom/venus/venc_ctrls.c

index 89e655b..ac1e1d2 100644 (file)
@@ -79,6 +79,7 @@ static int venc_op_s_ctrl(struct v4l2_ctrl *ctrl)
 {
        struct venus_inst *inst = ctrl_to_inst(ctrl);
        struct venc_controls *ctr = &inst->controls.enc;
+       struct hfi_enable en = { .enable = 1 };
        struct hfi_bitrate brate;
        u32 bframes;
        u32 ptype;
@@ -188,6 +189,19 @@ static int venc_op_s_ctrl(struct v4l2_ctrl *ctrl)
 
                ctr->num_b_frames = bframes;
                break;
+       case V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME:
+               mutex_lock(&inst->lock);
+               if (inst->streamon_out && inst->streamon_cap) {
+                       ptype = HFI_PROPERTY_CONFIG_VENC_REQUEST_SYNC_FRAME;
+                       ret = hfi_session_set_property(inst, ptype, &en);
+
+                       if (ret) {
+                               mutex_unlock(&inst->lock);
+                               return ret;
+                       }
+               }
+               mutex_unlock(&inst->lock);
+               break;
        default:
                return -EINVAL;
        }
@@ -203,7 +217,7 @@ int venc_ctrl_init(struct venus_inst *inst)
 {
        int ret;
 
-       ret = v4l2_ctrl_handler_init(&inst->ctrl_handler, 27);
+       ret = v4l2_ctrl_handler_init(&inst->ctrl_handler, 28);
        if (ret)
                return ret;
 
@@ -324,6 +338,9 @@ int venc_ctrl_init(struct venus_inst *inst)
        v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops,
                V4L2_CID_MPEG_VIDEO_H264_I_PERIOD, 0, (1 << 16) - 1, 1, 0);
 
+       v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops,
+                         V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME, 0, 0, 0, 0);
+
        ret = inst->ctrl_handler.error;
        if (ret)
                goto err;