From 9d8af9284ff4732352c97169112c664f1460a8ac Mon Sep 17 00:00:00 2001 From: Stanimir Varbanov Date: Wed, 3 Mar 2021 00:42:06 +0200 Subject: [PATCH] FROMGIT: media: v4l2-ctrls: Fix h264 hierarchical coding type menu ctrl Add a name of the menu and fill control type. Signed-off-by: Stanimir Varbanov Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab (cherry picked from commit a9e3863d0006ddad14e6b5745cb1a04e9801885f git://linuxtv.org/media_tree.git master) Bug: 183580469 Link: https://lkml.org/lkml/2021/3/20/122 [dikshita : Resolved minor conflict in v4l2-ctrls.c] Change-Id: Ib66f1dd1c27dc2d96919c1ebc99ca58d0b0cf633 Signed-off-by: Dikshita Agarwal --- drivers/media/v4l2-core/v4l2-ctrls.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c index 4fd35f1087c1..f25015263c3a 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls.c +++ b/drivers/media/v4l2-core/v4l2-ctrls.c @@ -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_MPEG_VIDEO_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: @@ -1324,6 +1331,7 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type, case V4L2_CID_MPEG_VIDEO_H264_FMO_MAP_TYPE: case V4L2_CID_MPEG_VIDEO_H264_DECODE_MODE: case V4L2_CID_MPEG_VIDEO_H264_START_CODE: + 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: