You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
47 lines
1.9 KiB
Diff
47 lines
1.9 KiB
Diff
From 20076d276d045c03f809bb16f0e1fafcfe63a81f Mon Sep 17 00:00:00 2001
|
|
From: Ricardo Ribalda Delgado <ribalda@kernel.org>
|
|
Date: Mon, 7 Oct 2019 12:06:32 -0300
|
|
Subject: [PATCH] media: Documentation: media: Document
|
|
V4L2_CTRL_TYPE_AREA
|
|
|
|
Commit 8ae3a0862993c09a8ef0f9abb379553370c517e3 upstream.
|
|
|
|
A struct v4l2_area containing the width and the height of a rectangular
|
|
area.
|
|
|
|
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
|
|
Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
|
|
Signed-off-by: Ricardo Ribalda Delgado <ribalda@kernel.org>
|
|
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
|
|
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
|
|
---
|
|
Documentation/media/uapi/v4l/vidioc-queryctrl.rst | 6 ++++++
|
|
Documentation/media/videodev2.h.rst.exceptions | 1 +
|
|
2 files changed, 7 insertions(+)
|
|
|
|
--- a/Documentation/media/uapi/v4l/vidioc-queryctrl.rst
|
|
+++ b/Documentation/media/uapi/v4l/vidioc-queryctrl.rst
|
|
@@ -443,6 +443,12 @@ See also the examples in :ref:`control`.
|
|
- n/a
|
|
- A struct :c:type:`v4l2_ctrl_mpeg2_quantization`, containing MPEG-2
|
|
quantization matrices for stateless video decoders.
|
|
+ * - ``V4L2_CTRL_TYPE_AREA``
|
|
+ - n/a
|
|
+ - n/a
|
|
+ - n/a
|
|
+ - A struct :c:type:`v4l2_area`, containing the width and the height
|
|
+ of a rectangular area. Units depend on the use case.
|
|
* - ``V4L2_CTRL_TYPE_H264_SPS``
|
|
- n/a
|
|
- n/a
|
|
--- a/Documentation/media/videodev2.h.rst.exceptions
|
|
+++ b/Documentation/media/videodev2.h.rst.exceptions
|
|
@@ -141,6 +141,7 @@ replace symbol V4L2_CTRL_TYPE_H264_PPS :
|
|
replace symbol V4L2_CTRL_TYPE_H264_SCALING_MATRIX :c:type:`v4l2_ctrl_type`
|
|
replace symbol V4L2_CTRL_TYPE_H264_SLICE_PARAMS :c:type:`v4l2_ctrl_type`
|
|
replace symbol V4L2_CTRL_TYPE_H264_DECODE_PARAMS :c:type:`v4l2_ctrl_type`
|
|
+replace symbol V4L2_CTRL_TYPE_AREA :c:type:`v4l2_ctrl_type`
|
|
|
|
# V4L2 capability defines
|
|
replace define V4L2_CAP_VIDEO_CAPTURE device-capabilities
|