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

Commit afd14f48 authored by Andrzej Hajda's avatar Andrzej Hajda Committed by Mauro Carvalho Chehab
Browse files

[media] v4l/s5p-mfc: corrected encoder v4l control definitions 



Patch corrects definition of H264 level control and
changes bare numbers to enums in two other cases.

Signed-off-by: default avatarAndrzej Hajda <a.hajda@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 9f4161a6

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

+2 −8
Original line number Diff line number Diff line
@@ -243,12 +243,6 @@ static struct mfc_control controls[] = { 
		.minimum = V4L2_MPEG_VIDEO_H264_LEVEL_1_0,

		.maximum = V4L2_MPEG_VIDEO_H264_LEVEL_4_0,

		.default_value = V4L2_MPEG_VIDEO_H264_LEVEL_1_0,

		.menu_skip_mask = ~(

				(1 << V4L2_MPEG_VIDEO_H264_LEVEL_4_1) |

				(1 << V4L2_MPEG_VIDEO_H264_LEVEL_4_2) |

				(1 << V4L2_MPEG_VIDEO_H264_LEVEL_5_0) |

				(1 << V4L2_MPEG_VIDEO_H264_LEVEL_5_1)

				),

	},

	{

		.id = V4L2_CID_MPEG_VIDEO_MPEG4_LEVEL,
@@ -494,7 +488,7 @@ static struct mfc_control controls[] = { 
		.type = V4L2_CTRL_TYPE_MENU,

		.minimum = V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_UNSPECIFIED,

		.maximum = V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_EXTENDED,

		.default_value = 0,

		.default_value = V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_UNSPECIFIED,

		.menu_skip_mask = 0,

	},

	{
@@ -534,7 +528,7 @@ static struct mfc_control controls[] = { 
		.type = V4L2_CTRL_TYPE_MENU,

		.minimum = V4L2_MPEG_VIDEO_MPEG4_PROFILE_SIMPLE,

		.maximum = V4L2_MPEG_VIDEO_MPEG4_PROFILE_ADVANCED_SIMPLE,

		.default_value = 0,

		.default_value = V4L2_MPEG_VIDEO_MPEG4_PROFILE_SIMPLE,

		.menu_skip_mask = 0,

	},

	{