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

media: hevc: Add scaling matrix control 



HEVC scaling lists are used for the scaling process for transform
coefficients.
V4L2_HEVC_SPS_FLAG_SCALING_LIST_ENABLED has to set when they are
encoded in the bitstream.

Signed-off-by: default avatarBenjamin Gaignard <benjamin.gaignard@collabora.com>
Reviewed-by: default avatarJernej Skrabec <jernej.skrabec@gmail.com>
Reviewed-by: default avatarEzequiel Garcia <ezequiel@collabora.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent d2e86540

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

+57 −0
Original line number Diff line number Diff line
@@ -3088,6 +3088,63 @@ enum v4l2_mpeg_video_hevc_size_of_length_field - 


    \normalsize



``V4L2_CID_MPEG_VIDEO_HEVC_SCALING_MATRIX (struct)``

    Specifies the HEVC scaling matrix parameters used for the scaling process

    for transform coefficients.

    These matrix and parameters are defined according to :ref:`hevc`.

    They are described in section 7.4.5 "Scaling list data semantics" of

    the specification.



.. c:type:: v4l2_ctrl_hevc_scaling_matrix



.. raw:: latex



    \scriptsize



.. tabularcolumns:: |p{5.4cm}|p{6.8cm}|p{5.1cm}|



.. cssclass:: longtable



.. flat-table:: struct v4l2_ctrl_hevc_scaling_matrix

    :header-rows:  0

    :stub-columns: 0

    :widths:       1 1 2



    * - __u8

      - ``scaling_list_4x4[6][16]``

      - Scaling list is used for the scaling process for transform

        coefficients. The values on each scaling list are expected

        in raster scan order.

    * - __u8

      - ``scaling_list_8x8[6][64]``

      - Scaling list is used for the scaling process for transform

        coefficients. The values on each scaling list are expected

        in raster scan order.

    * - __u8

      - ``scaling_list_16x16[6][64]``

      - Scaling list is used for the scaling process for transform

        coefficients. The values on each scaling list are expected

        in raster scan order.

    * - __u8

      - ``scaling_list_32x32[2][64]``

      - Scaling list is used for the scaling process for transform

        coefficients. The values on each scaling list are expected

        in raster scan order.

    * - __u8

      - ``scaling_list_dc_coef_16x16[6]``

      - Scaling list is used for the scaling process for transform

        coefficients. The values on each scaling list are expected

        in raster scan order.

    * - __u8

      - ``scaling_list_dc_coef_32x32[2]``

      - Scaling list is used for the scaling process for transform

        coefficients. The values on each scaling list are expected

        in raster scan order.



.. raw:: latex



    \normalsize



.. c:type:: v4l2_hevc_dpb_entry



.. raw:: latex

Documentation/userspace-api/media/v4l/vidioc-queryctrl.rst

+6 −0
Original line number Diff line number Diff line
@@ -495,6 +495,12 @@ See also the examples in :ref:`control`. 
      - n/a

      - A struct :c:type:`v4l2_ctrl_hevc_slice_params`, containing HEVC

	slice parameters for stateless video decoders.

    * - ``V4L2_CTRL_TYPE_HEVC_SCALING_MATRIX``

      - n/a

      - n/a

      - n/a

      - A struct :c:type:`v4l2_ctrl_hevc_scaling_matrix`, containing HEVC

	scaling matrix for stateless video decoders.

    * - ``V4L2_CTRL_TYPE_VP8_FRAME``

      - n/a

      - n/a

drivers/media/v4l2-core/v4l2-ctrls-core.c

+6 −0
Original line number Diff line number Diff line
@@ -687,6 +687,9 @@ static int std_validate_compound(const struct v4l2_ctrl *ctrl, u32 idx, 


		break;



	case V4L2_CTRL_TYPE_HEVC_SCALING_MATRIX:

		break;



	case V4L2_CTRL_TYPE_AREA:

		area = p;

		if (!area->width || !area->height)
@@ -1240,6 +1243,9 @@ static struct v4l2_ctrl *v4l2_ctrl_new(struct v4l2_ctrl_handler *hdl, 
	case V4L2_CTRL_TYPE_HEVC_SLICE_PARAMS:

		elem_size = sizeof(struct v4l2_ctrl_hevc_slice_params);

		break;

	case V4L2_CTRL_TYPE_HEVC_SCALING_MATRIX:

		elem_size = sizeof(struct v4l2_ctrl_hevc_scaling_matrix);

		break;

	case V4L2_CTRL_TYPE_HEVC_DECODE_PARAMS:

		elem_size = sizeof(struct v4l2_ctrl_hevc_decode_params);

		break;

drivers/media/v4l2-core/v4l2-ctrls-defs.c

+4 −0
Original line number Diff line number Diff line
@@ -997,6 +997,7 @@ const char *v4l2_ctrl_get_name(u32 id) 
	case V4L2_CID_MPEG_VIDEO_HEVC_SPS:			return "HEVC Sequence Parameter Set";

	case V4L2_CID_MPEG_VIDEO_HEVC_PPS:			return "HEVC Picture Parameter Set";

	case V4L2_CID_MPEG_VIDEO_HEVC_SLICE_PARAMS:		return "HEVC Slice Parameters";

	case V4L2_CID_MPEG_VIDEO_HEVC_SCALING_MATRIX:		return "HEVC Scaling Matrix";

	case V4L2_CID_MPEG_VIDEO_HEVC_DECODE_PARAMS:		return "HEVC Decode Parameters";

	case V4L2_CID_MPEG_VIDEO_HEVC_DECODE_MODE:		return "HEVC Decode Mode";

	case V4L2_CID_MPEG_VIDEO_HEVC_START_CODE:		return "HEVC Start Code";
@@ -1490,6 +1491,9 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type, 
	case V4L2_CID_MPEG_VIDEO_HEVC_SLICE_PARAMS:

		*type = V4L2_CTRL_TYPE_HEVC_SLICE_PARAMS;

		break;

	case V4L2_CID_MPEG_VIDEO_HEVC_SCALING_MATRIX:

		*type = V4L2_CTRL_TYPE_HEVC_SCALING_MATRIX;

		break;

	case V4L2_CID_MPEG_VIDEO_HEVC_DECODE_PARAMS:

		*type = V4L2_CTRL_TYPE_HEVC_DECODE_PARAMS;

		break;

include/media/hevc-ctrls.h

+11 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#define V4L2_CID_MPEG_VIDEO_HEVC_SPS		(V4L2_CID_CODEC_BASE + 1008)

#define V4L2_CID_MPEG_VIDEO_HEVC_PPS		(V4L2_CID_CODEC_BASE + 1009)

#define V4L2_CID_MPEG_VIDEO_HEVC_SLICE_PARAMS	(V4L2_CID_CODEC_BASE + 1010)

#define V4L2_CID_MPEG_VIDEO_HEVC_SCALING_MATRIX	(V4L2_CID_CODEC_BASE + 1011)

#define V4L2_CID_MPEG_VIDEO_HEVC_DECODE_PARAMS	(V4L2_CID_CODEC_BASE + 1012)

#define V4L2_CID_MPEG_VIDEO_HEVC_DECODE_MODE	(V4L2_CID_CODEC_BASE + 1015)

#define V4L2_CID_MPEG_VIDEO_HEVC_START_CODE	(V4L2_CID_CODEC_BASE + 1016)
@@ -27,6 +28,7 @@ 
#define V4L2_CTRL_TYPE_HEVC_SPS 0x0120

#define V4L2_CTRL_TYPE_HEVC_PPS 0x0121

#define V4L2_CTRL_TYPE_HEVC_SLICE_PARAMS 0x0122

#define V4L2_CTRL_TYPE_HEVC_SCALING_MATRIX 0x0123

#define V4L2_CTRL_TYPE_HEVC_DECODE_PARAMS 0x0124



enum v4l2_mpeg_video_hevc_decode_mode {
@@ -225,6 +227,15 @@ struct v4l2_ctrl_hevc_decode_params { 
	__u64	flags;

};



struct v4l2_ctrl_hevc_scaling_matrix {

	__u8	scaling_list_4x4[6][16];

	__u8	scaling_list_8x8[6][64];

	__u8	scaling_list_16x16[6][64];

	__u8	scaling_list_32x32[2][64];

	__u8	scaling_list_dc_coef_16x16[6];

	__u8	scaling_list_dc_coef_32x32[2];

};



/*  MPEG-class control IDs specific to the Hantro driver as defined by V4L2 */

#define V4L2_CID_CODEC_HANTRO_BASE				(V4L2_CTRL_CLASS_CODEC | 0x1200)

/*