media: venus: add support for key frame (c35f0b16) · Commits · 戴 / test

drivers/media/platform/qcom/venus/venc_ctrls.c

+18 −1

Original line number	Original line	Diff line number	Diff line
	@@ -79,6 +79,7 @@ static int venc_op_s_ctrl(struct v4l2_ctrl *ctrl)
	{		{
	struct venus_inst *inst = ctrl_to_inst(ctrl);		struct venus_inst *inst = ctrl_to_inst(ctrl);
	struct venc_controls *ctr = &inst->controls.enc;		struct venc_controls *ctr = &inst->controls.enc;
			struct hfi_enable en = { .enable = 1 };
	struct hfi_bitrate brate;		struct hfi_bitrate brate;
	u32 bframes;		u32 bframes;
	u32 ptype;		u32 ptype;
	@@ -188,6 +189,19 @@ static int venc_op_s_ctrl(struct v4l2_ctrl *ctrl)

	ctr->num_b_frames = bframes;		ctr->num_b_frames = bframes;
	break;		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:		default:
	return -EINVAL;		return -EINVAL;
	}		}
	@@ -203,7 +217,7 @@ int venc_ctrl_init(struct venus_inst *inst)
	{		{
	int ret;		int ret;

	ret = v4l2_ctrl_handler_init(&inst->ctrl_handler, 27);		ret = v4l2_ctrl_handler_init(&inst->ctrl_handler, 28);
	if (ret)		if (ret)
	return 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_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops,
	V4L2_CID_MPEG_VIDEO_H264_I_PERIOD, 0, (1 << 16) - 1, 1, 0);		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;		ret = inst->ctrl_handler.error;
	if (ret)		if (ret)
	goto err;		goto err;

Admin message