Commit c3042bff authored by Stanimir Varbanov's avatar Stanimir Varbanov Committed by Mauro Carvalho Chehab
Browse files

media: s5p-mfc: Use display delay and display enable std controls 



Use the standard display_delay and display_delay_enable controls,
the legacy private MFC controls are kept for backward compatibility.

Acked-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: default avatarStanimir Varbanov <stanimir.varbanov@linaro.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 8ec0b7b0

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

+16 −0
Original line number Diff line number Diff line
@@ -167,6 +167,13 @@ static struct mfc_control controls[] = { 
		.step = 1,

		.default_value = 0,

	},

	{

		.id = V4L2_CID_MPEG_VIDEO_DEC_DISPLAY_DELAY,

		.type = V4L2_CTRL_TYPE_INTEGER,

		.minimum = 0,

		.maximum = 16383,

		.default_value = 0,

	},

	{

		.id = V4L2_CID_MPEG_MFC51_VIDEO_DECODER_H264_DISPLAY_DELAY_ENABLE,

		.type = V4L2_CTRL_TYPE_BOOLEAN,
@@ -176,6 +183,13 @@ static struct mfc_control controls[] = { 
		.step = 1,

		.default_value = 0,

	},

	{

		.id = V4L2_CID_MPEG_VIDEO_DEC_DISPLAY_DELAY_ENABLE,

		.type = V4L2_CTRL_TYPE_BOOLEAN,

		.minimum = 0,

		.maximum = 1,

		.default_value = 0,

	},

	{

		.id = V4L2_CID_MPEG_VIDEO_DECODER_MPEG4_DEBLOCK_FILTER,

		.type = V4L2_CTRL_TYPE_BOOLEAN,
@@ -690,9 +704,11 @@ static int s5p_mfc_dec_s_ctrl(struct v4l2_ctrl *ctrl) 


	switch (ctrl->id) {

	case V4L2_CID_MPEG_MFC51_VIDEO_DECODER_H264_DISPLAY_DELAY:

	case V4L2_CID_MPEG_VIDEO_DEC_DISPLAY_DELAY:

		ctx->display_delay = ctrl->val;

		break;

	case V4L2_CID_MPEG_MFC51_VIDEO_DECODER_H264_DISPLAY_DELAY_ENABLE:

	case V4L2_CID_MPEG_VIDEO_DEC_DISPLAY_DELAY_ENABLE:

		ctx->display_delay_enable = ctrl->val;

		break;

	case V4L2_CID_MPEG_VIDEO_DECODER_MPEG4_DEBLOCK_FILTER: