Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5a33287e authored by Wu-Cheng Li's avatar Wu-Cheng Li Committed by Mauro Carvalho Chehab
Browse files

[media] s5p-mfc: add the support of V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME 



There is a new control V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME to
force an encoder key frame. It is the same as requesting
V4L2_MPEG_MFC51_VIDEO_FORCE_FRAME_TYPE_I_FRAME.

Signed-off-by: default avatarWu-Cheng Li <wuchengli@chromium.org>
Acked-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent cedc1210

drivers/media/platform/s5p-mfc/s5p_mfc_enc.c

+12 −0
Original line number Original line Diff line number Diff line
@@ -211,6 +211,14 @@ static struct mfc_control controls[] = { 
		.default_value = V4L2_MPEG_MFC51_VIDEO_FORCE_FRAME_TYPE_DISABLED,

		.default_value = V4L2_MPEG_MFC51_VIDEO_FORCE_FRAME_TYPE_DISABLED,

		.menu_skip_mask = 0,

		.menu_skip_mask = 0,

	},

	},

	{

		.id = V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME,

		.type = V4L2_CTRL_TYPE_BUTTON,

		.minimum = 0,

		.maximum = 0,

		.step = 0,

		.default_value = 0,

	},

	{

	{

		.id = V4L2_CID_MPEG_VIDEO_VBV_SIZE,

		.id = V4L2_CID_MPEG_VIDEO_VBV_SIZE,

		.type = V4L2_CTRL_TYPE_INTEGER,

		.type = V4L2_CTRL_TYPE_INTEGER,
@@ -1423,6 +1431,10 @@ static int s5p_mfc_enc_s_ctrl(struct v4l2_ctrl *ctrl) 
	case V4L2_CID_MPEG_MFC51_VIDEO_FORCE_FRAME_TYPE:

	case V4L2_CID_MPEG_MFC51_VIDEO_FORCE_FRAME_TYPE:

		ctx->force_frame_type = ctrl->val;

		ctx->force_frame_type = ctrl->val;

		break;

		break;

	case V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME:

		ctx->force_frame_type =

			V4L2_MPEG_MFC51_VIDEO_FORCE_FRAME_TYPE_I_FRAME;

		break;

	case V4L2_CID_MPEG_VIDEO_VBV_SIZE:

	case V4L2_CID_MPEG_VIDEO_VBV_SIZE:

		p->vbv_size = ctrl->val;

		p->vbv_size = ctrl->val;

		break;

		break;