git.openwrt.org Git - openwrt/staging/linusw.git/blob

   1 From 20076d276d045c03f809bb16f0e1fafcfe63a81f Mon Sep 17 00:00:00 2001
   2 From: Ricardo Ribalda Delgado <ribalda@kernel.org>
   3 Date: Mon, 7 Oct 2019 12:06:32 -0300
   4 Subject: [PATCH] media: Documentation: media: Document
   5  V4L2_CTRL_TYPE_AREA
   6
   7 Commit 8ae3a0862993c09a8ef0f9abb379553370c517e3 upstream.
   8
   9 A struct v4l2_area containing the width and the height of a rectangular
  10 area.
  11
  12 Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
  13 Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
  14 Signed-off-by: Ricardo Ribalda Delgado <ribalda@kernel.org>
  15 Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
  16 Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
  17 ---
  18  Documentation/media/uapi/v4l/vidioc-queryctrl.rst | 6 ++++++
  19  Documentation/media/videodev2.h.rst.exceptions    | 1 +
  20  2 files changed, 7 insertions(+)
  21
  22 --- a/Documentation/media/uapi/v4l/vidioc-queryctrl.rst
  23 +++ b/Documentation/media/uapi/v4l/vidioc-queryctrl.rst
  24 @@ -443,6 +443,12 @@ See also the examples in :ref:`control`.
  25        - n/a
  26        - A struct :c:type:`v4l2_ctrl_mpeg2_quantization`, containing MPEG-2
  27         quantization matrices for stateless video decoders.
  28 +    * - ``V4L2_CTRL_TYPE_AREA``
  29 +      - n/a
  30 +      - n/a
  31 +      - n/a
  32 +      - A struct :c:type:`v4l2_area`, containing the width and the height
  33 +        of a rectangular area. Units depend on the use case.
  34      * - ``V4L2_CTRL_TYPE_H264_SPS``
  35        - n/a
  36        - n/a
  37 --- a/Documentation/media/videodev2.h.rst.exceptions
  38 +++ b/Documentation/media/videodev2.h.rst.exceptions
  39 @@ -141,6 +141,7 @@ replace symbol V4L2_CTRL_TYPE_H264_PPS :
  40  replace symbol V4L2_CTRL_TYPE_H264_SCALING_MATRIX :c:type:`v4l2_ctrl_type`
  41  replace symbol V4L2_CTRL_TYPE_H264_SLICE_PARAMS :c:type:`v4l2_ctrl_type`
  42  replace symbol V4L2_CTRL_TYPE_H264_DECODE_PARAMS :c:type:`v4l2_ctrl_type`
  43 +replace symbol V4L2_CTRL_TYPE_AREA :c:type:`v4l2_ctrl_type`
  44
  45  # V4L2 capability defines
  46  replace define V4L2_CAP_VIDEO_CAPTURE device-capabilities