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

Commit 95a98ff0 authored by Maheshwar Ajja's avatar Maheshwar Ajja Committed by Will McVicker
Browse files

UPSTREAM: media: v4l2-ctrl: Add H264 profile and levels 



Add H264 profile "Contrained High" and H264 levels "5.2",
"6.0", "6.1" and "6.2".

Bug: 161414994
Signed-off-by: default avatarMaheshwar Ajja <majja@codeaurora.org>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
(cherry picked from commit 1ca3cb46a992d83ebd093acc64241007b20c5033)
Signed-off-by: default avatarWill McVicker <willmcvicker@google.com>
Change-Id: I43ac36b9cc3fd4fa786df706f4c50db40fa48b2e
parent d90c8009

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

+5 −0
Original line number Diff line number Diff line
@@ -338,6 +338,10 @@ const char * const *v4l2_ctrl_get_menu(u32 id) 
		"4.2",

		"5",

		"5.1",

		"5.2",

		"6.0",

		"6.1",

		"6.2",

		NULL,

	};

	static const char * const h264_loop_filter[] = {
@@ -364,6 +368,7 @@ const char * const *v4l2_ctrl_get_menu(u32 id) 
		"Scalable High Intra",

		"Stereo High",

		"Multiview High",

		"Constrained High",

		NULL,

	};

	static const char * const vui_sar_idc[] = {

include/uapi/linux/v4l2-controls.h

+5 −0
Original line number Diff line number Diff line
@@ -438,6 +438,10 @@ enum v4l2_mpeg_video_h264_level { 
	V4L2_MPEG_VIDEO_H264_LEVEL_4_2	= 13,

	V4L2_MPEG_VIDEO_H264_LEVEL_5_0	= 14,

	V4L2_MPEG_VIDEO_H264_LEVEL_5_1	= 15,

	V4L2_MPEG_VIDEO_H264_LEVEL_5_2	= 16,

	V4L2_MPEG_VIDEO_H264_LEVEL_6_0	= 17,

	V4L2_MPEG_VIDEO_H264_LEVEL_6_1	= 18,

	V4L2_MPEG_VIDEO_H264_LEVEL_6_2	= 19,

};

#define V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_ALPHA	(V4L2_CID_MPEG_BASE+360)

#define V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_BETA	(V4L2_CID_MPEG_BASE+361)
@@ -466,6 +470,7 @@ enum v4l2_mpeg_video_h264_profile { 
	V4L2_MPEG_VIDEO_H264_PROFILE_SCALABLE_HIGH_INTRA	= 14,

	V4L2_MPEG_VIDEO_H264_PROFILE_STEREO_HIGH		= 15,

	V4L2_MPEG_VIDEO_H264_PROFILE_MULTIVIEW_HIGH		= 16,

	V4L2_MPEG_VIDEO_H264_PROFILE_CONSTRAINED_HIGH		= 17,

};

#define V4L2_CID_MPEG_VIDEO_H264_VUI_EXT_SAR_HEIGHT	(V4L2_CID_MPEG_BASE+364)

#define V4L2_CID_MPEG_VIDEO_H264_VUI_EXT_SAR_WIDTH	(V4L2_CID_MPEG_BASE+365)