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

media: v4l2-ctrls: Fix h264 hierarchical coding type menu ctrl 



Add a name of the menu and fill control type.

Signed-off-by: default avatarStanimir Varbanov <stanimir.varbanov@linaro.org>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent fe1fd842

drivers/media/v4l2-core/v4l2-ctrls.c

+8 −0
Original line number Diff line number Diff line
@@ -421,6 +421,11 @@ const char * const *v4l2_ctrl_get_menu(u32 id) 
		"Annex B Start Code",

		NULL,

	};

	static const char * const h264_hierarchical_coding_type[] = {

		"Hier Coding B",

		"Hier Coding P",

		NULL,

	};

	static const char * const mpeg_mpeg2_level[] = {

		"Low",

		"Main",
@@ -697,6 +702,8 @@ const char * const *v4l2_ctrl_get_menu(u32 id) 
		return h264_decode_mode;

	case V4L2_CID_STATELESS_H264_START_CODE:

		return h264_start_code;

	case V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING_TYPE:

		return h264_hierarchical_coding_type;

	case V4L2_CID_MPEG_VIDEO_MPEG2_LEVEL:

		return mpeg_mpeg2_level;

	case V4L2_CID_MPEG_VIDEO_MPEG2_PROFILE:
@@ -1332,6 +1339,7 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type, 
	case V4L2_CID_MPEG_VIDEO_H264_VUI_SAR_IDC:

	case V4L2_CID_MPEG_VIDEO_H264_SEI_FP_ARRANGEMENT_TYPE:

	case V4L2_CID_MPEG_VIDEO_H264_FMO_MAP_TYPE:

	case V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING_TYPE:

	case V4L2_CID_MPEG_VIDEO_MPEG2_LEVEL:

	case V4L2_CID_MPEG_VIDEO_MPEG2_PROFILE:

	case V4L2_CID_MPEG_VIDEO_MPEG4_LEVEL: