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 <stanimir.varbanov@linaro.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c
index 4ee301cc6e5b00389b354ebed79bc2414c1619f1..39038c6ad8fb9aa3e99b6967844acf90ca5f7b1f 100644 (file)
--- 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_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: