Commit ca24fef0 authored by Benjamin Gaignard's avatar Benjamin Gaignard Committed by Mauro Carvalho Chehab
Browse files

media: uapi: move HEVC stateless controls out of staging 



HEVC uAPI is used by 2 mainline drivers (Hantro, Cedrus)
and at least 2 out-of-tree drivers (rkvdec, RPi).
The uAPI has been reviewed so it is time to make it 'public' by
un-staging it.

Signed-off-by: default avatarBenjamin Gaignard <benjamin.gaignard@collabora.com>
Reviewed-by: default avatarEzequiel Garcia <ezequiel@vanguardiasur.com.ar>
Acked-by: default avatarNicolas Dufresne <nicolas.dufresne@collabora.com>
Tested-by: default avatarJernej Skrabec <jernej.skrabec@gmail.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent e7060d9a

Documentation/userspace-api/media/v4l/ext-ctrls-codec-stateless.rst

+902 −0

File changed.

Preview size limit exceeded, changes collapsed.

Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst

+0 −906

File changed.

Preview size limit exceeded, changes collapsed.

Documentation/userspace-api/media/v4l/pixfmt-compressed.rst

+1 −1
Original line number Original line Diff line number Diff line
@@ -212,7 +212,7 @@ Compressed Formats 
        ``V4L2_CID_MPEG_VIDEO_HEVC_SPS``,

        ``V4L2_CID_MPEG_VIDEO_HEVC_SPS``,

        ``V4L2_CID_MPEG_VIDEO_HEVC_PPS``, and

        ``V4L2_CID_MPEG_VIDEO_HEVC_PPS``, and

        ``V4L2_CID_MPEG_VIDEO_HEVC_SLICE_PARAMS``.

        ``V4L2_CID_MPEG_VIDEO_HEVC_SLICE_PARAMS``.

	See the :ref:`associated Codec Control IDs <v4l2-mpeg-hevc>`.

	See the :ref:`associated Codec Control IDs <v4l2-codec-stateless-hevc>`.

	Buffers associated with this pixel format must contain the appropriate

	Buffers associated with this pixel format must contain the appropriate

	number of macroblocks to decode a full corresponding frame.

	number of macroblocks to decode a full corresponding frame.

    * .. _V4L2-PIX-FMT-FWHT:

    * .. _V4L2-PIX-FMT-FWHT:

Documentation/userspace-api/media/v4l/vidioc-g-ext-ctrls.rst

+20 −0
Original line number Original line Diff line number Diff line
@@ -249,6 +249,26 @@ still cause this situation. 
      - ``p_hdr10_mastering``

      - ``p_hdr10_mastering``

      - A pointer to a struct :c:type:`v4l2_ctrl_hdr10_mastering_display`. Valid if this control is

      - A pointer to a struct :c:type:`v4l2_ctrl_hdr10_mastering_display`. Valid if this control is

        of type ``V4L2_CTRL_TYPE_HDR10_MASTERING_DISPLAY``.

        of type ``V4L2_CTRL_TYPE_HDR10_MASTERING_DISPLAY``.

    * - struct :c:type:`v4l2_ctrl_hevc_sps` *

      - ``p_hevc_sps``

      - A pointer to a struct :c:type:`v4l2_ctrl_hevc_sps`. Valid if this

        control is of type ``V4L2_CTRL_TYPE_HEVC_SPS``.

    * - struct :c:type:`v4l2_ctrl_hevc_pps` *

      - ``p_hevc_pps``

      - A pointer to a struct :c:type:`v4l2_ctrl_hevc_pps`. Valid if this

        control is of type ``V4L2_CTRL_TYPE_HEVC_PPS``.

    * - struct :c:type:`v4l2_ctrl_hevc_slice_params` *

      - ``p_hevc_slice_params``

      - A pointer to a struct :c:type:`v4l2_ctrl_hevc_slice_params`. Valid if this

        control is of type ``V4L2_CTRL_TYPE_HEVC_SLICE_PARAMS``.

    * - struct :c:type:`v4l2_ctrl_hevc_scaling_matrix` *

      - ``p_hevc_scaling_matrix``

      - A pointer to a struct :c:type:`v4l2_ctrl_hevc_scaling_matrix`. Valid if this

        control is of type ``V4L2_CTRL_TYPE_HEVC_SCALING_MATRIX``.

    * - struct :c:type:`v4l2_ctrl_hevc_decode_params` *

      - ``p_hevc_decode_params``

      - A pointer to a struct :c:type:`v4l2_ctrl_hevc_decode_params`. Valid if this

        control is of type ``V4L2_CTRL_TYPE_HEVC_DECODE_PARAMS``.

    * - void *

    * - void *

      - ``ptr``

      - ``ptr``

      - A pointer to a compound type which can be an N-dimensional array

      - A pointer to a compound type which can be an N-dimensional array

include/media/hevc-ctrls.h

deleted100644 → 0
+0 −474

File deleted.

Preview size limit exceeded, changes collapsed.