aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/Documentation/userspace-api
diff options
context:
space:
mode:
authorMaheshwar Ajja <majja@codeaurora.org>2020-04-07 23:55:26 +0200
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>2020-04-21 13:26:43 +0200
commitff8c2784b057596ae1fe75693046e1ac3382d8bf (patch)
treedd47d76bee74dfce858cda7a32bb536b3bb914f4 /Documentation/userspace-api
parentmedia: v4l2-ctrl: Add H264 profile and levels (diff)
downloadwireguard-linux-ff8c2784b057596ae1fe75693046e1ac3382d8bf.tar.xz
wireguard-linux-ff8c2784b057596ae1fe75693046e1ac3382d8bf.zip
media: uapi: h264: Add new 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: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Diffstat (limited to 'Documentation/userspace-api')
-rw-r--r--Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst10
1 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst b/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst
index 9b48338fb783..d0d506a444b1 100644
--- a/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst
+++ b/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst
@@ -756,6 +756,14 @@ enum v4l2_mpeg_video_h264_level -
- Level 5.0
* - ``V4L2_MPEG_VIDEO_H264_LEVEL_5_1``
- Level 5.1
+ * - ``V4L2_MPEG_VIDEO_H264_LEVEL_5_2``
+ - Level 5.2
+ * - ``V4L2_MPEG_VIDEO_H264_LEVEL_6_0``
+ - Level 6.0
+ * - ``V4L2_MPEG_VIDEO_H264_LEVEL_6_1``
+ - Level 6.1
+ * - ``V4L2_MPEG_VIDEO_H264_LEVEL_6_2``
+ - Level 6.2
@@ -868,6 +876,8 @@ enum v4l2_mpeg_video_h264_profile -
- Stereo High profile
* - ``V4L2_MPEG_VIDEO_H264_PROFILE_MULTIVIEW_HIGH``
- Multiview High profile
+ * - ``V4L2_MPEG_VIDEO_H264_PROFILE_CONSTRAINED_HIGH``
+ - Constrained High profile