2021-03-04 07:25:32

by Stanimir Varbanov

Subject: [PATCH] v4l2-ctrls: Fix h264 hierarchical coding type menu ctrl

Add a name of the menu and fill control type.

Signed-off-by: Stanimir Varbanov <[email protected]>
---
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 016cf6204cbb..5d99e2294335 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_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:
@@ -1326,6 +1333,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:
--
2.25.1

2021-03-20 11:57:22

by Stanimir Varbanov

Subject: Re: [PATCH] v4l2-ctrls: Fix h264 hierarchical coding type menu ctrl

Kindly ping for review.

On 3/3/21 12:42 AM, Stanimir Varbanov wrote:
> Add a name of the menu and fill control type.
>
> Signed-off-by: Stanimir Varbanov <[email protected]>
> ---
> 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 016cf6204cbb..5d99e2294335 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_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:
> @@ -1326,6 +1333,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:
>

--
regards,
Stan

2021-03-20 12:21:41

by Hans Verkuil

Subject: Re: [PATCH] v4l2-ctrls: Fix h264 hierarchical coding type menu ctrl

On 20/03/2021 12:53, Stanimir Varbanov wrote:
> Kindly ping for review.

Weird, it was marked as 'Under Review' in patchwork, but it wasn't delegated
to anyone.

I've changed it to 'New' and delegated it to myself.

It looks good and I'll pick it up next time I collect 'various fixes' in a PR.
Probably next week.

Regards,

Hans

>
> On 3/3/21 12:42 AM, Stanimir Varbanov wrote:
>> Add a name of the menu and fill control type.
>>
>> Signed-off-by: Stanimir Varbanov <[email protected]>
>> ---
>> 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 016cf6204cbb..5d99e2294335 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_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:
>> @@ -1326,6 +1333,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:
>>
>