diff options
| author | Maheshwar Ajja <majja@codeaurora.org> | 2020-03-16 23:42:30 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2020-04-21 13:26:26 +0200 |
| commit | 1ca3cb46a992d83ebd093acc64241007b20c5033 (patch) | |
| tree | 2fe42d49405ef96f13d126eaf90e84d43415149c /drivers/media/v4l2-core/v4l2-ctrls.c | |
| parent | 33d236371f707582128ab05faf7b9f95f479aa63 (diff) | |
| download | linux-stable-1ca3cb46a992d83ebd093acc64241007b20c5033.tar.gz linux-stable-1ca3cb46a992d83ebd093acc64241007b20c5033.tar.bz2 linux-stable-1ca3cb46a992d83ebd093acc64241007b20c5033.zip | |
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".
Signed-off-by: Maheshwar Ajja <majja@codeaurora.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Diffstat (limited to 'drivers/media/v4l2-core/v4l2-ctrls.c')
| -rw-r--r-- | drivers/media/v4l2-core/v4l2-ctrls.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c index 93d33d1db4e8..0186ba85aac7 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls.c +++ b/drivers/media/v4l2-core/v4l2-ctrls.c @@ -336,6 +336,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[] = { @@ -362,6 +366,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[] = { |