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

media: hevc: Add decode params control 



Add decode params control and the associated structure to group
all the information that are needed to decode a reference frame as
is described in ITU-T Rec. H.265 section "8.3.2 Decoding process
for reference picture set".

Adapt Cedrus driver to these changes.

Signed-off-by: default avatarBenjamin Gaignard <benjamin.gaignard@collabora.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 4dd0f63b

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

+76 −18
Original line number Diff line number Diff line
@@ -3000,9 +3000,6 @@ enum v4l2_mpeg_video_hevc_size_of_length_field - 
    * - __u8

      - ``pic_struct``

      -

    * - __u8

      - ``num_active_dpb_entries``

      - The number of entries in ``dpb``.

    * - __u8

      - ``ref_idx_l0[V4L2_HEVC_DPB_ENTRIES_NUM_MAX]``

      - The list of L0 reference elements as indices in the DPB.
@@ -3010,22 +3007,8 @@ enum v4l2_mpeg_video_hevc_size_of_length_field - 
      - ``ref_idx_l1[V4L2_HEVC_DPB_ENTRIES_NUM_MAX]``

      - The list of L1 reference elements as indices in the DPB.

    * - __u8

      - ``num_rps_poc_st_curr_before``

      - The number of reference pictures in the short-term set that come before

        the current frame.

    * - __u8

      - ``num_rps_poc_st_curr_after``

      - The number of reference pictures in the short-term set that come after

        the current frame.

    * - __u8

      - ``num_rps_poc_lt_curr``

      - The number of reference pictures in the long-term set.

    * - __u8

      - ``padding[7]``

      - ``padding``

      - Applications and drivers must set this to zero.

    * - struct :c:type:`v4l2_hevc_dpb_entry`

      - ``dpb[V4L2_HEVC_DPB_ENTRIES_NUM_MAX]``

      - The decoded picture buffer, for meta-data about reference frames.

    * - struct :c:type:`v4l2_hevc_pred_weight_table`

      - ``pred_weight_table``

      - The prediction weight coefficients for inter-picture prediction.
@@ -3281,3 +3264,78 @@ enum v4l2_mpeg_video_hevc_size_of_length_field - 
    encoding the next frame queued after setting this control.

    This provides a bitmask which consists of bits [0, LTR_COUNT-1].

    This is applicable to the H264 and HEVC encoders.



``V4L2_CID_MPEG_VIDEO_HEVC_DECODE_PARAMS (struct)``

    Specifies various decode parameters, especially the references picture order

    count (POC) for all the lists (short, long, before, current, after) and the

    number of entries for each of them.

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

    They are described in section 8.3 "Slice decoding process" of the

    specification.



.. c:type:: v4l2_ctrl_hevc_decode_params



.. cssclass:: longtable



.. flat-table:: struct v4l2_ctrl_hevc_decode_params

    :header-rows:  0

    :stub-columns: 0

    :widths:       1 1 2



    * - __s32

      - ``pic_order_cnt_val``

      - PicOrderCntVal as described in section 8.3.1 "Decoding process

        for picture order count" of the specification.

    * - __u8

      - ``num_active_dpb_entries``

      - The number of entries in ``dpb``.

    * - struct :c:type:`v4l2_hevc_dpb_entry`

      - ``dpb[V4L2_HEVC_DPB_ENTRIES_NUM_MAX]``

      - The decoded picture buffer, for meta-data about reference frames.

    * - __u8

      - ``num_poc_st_curr_before``

      - The number of reference pictures in the short-term set that come before

        the current frame.

    * - __u8

      - ``num_poc_st_curr_after``

      - The number of reference pictures in the short-term set that come after

        the current frame.

    * - __u8

      - ``num_poc_lt_curr``

      - The number of reference pictures in the long-term set.

    * - __u8

      - ``poc_st_curr_before[V4L2_HEVC_DPB_ENTRIES_NUM_MAX]``

      - PocStCurrBefore as described in section 8.3.2 "Decoding process for reference

        picture set.

    * - __u8

      - ``poc_st_curr_after[V4L2_HEVC_DPB_ENTRIES_NUM_MAX]``

      - PocStCurrAfter as described in section 8.3.2 "Decoding process for reference

        picture set.

    * - __u8

      - ``poc_lt_curr[V4L2_HEVC_DPB_ENTRIES_NUM_MAX]``

      - PocLtCurr as described in section 8.3.2 "Decoding process for reference

        picture set.

    * - __u64

      - ``flags``

      - See :ref:`Decode Parameters Flags <hevc_decode_params_flags>`



.. _hevc_decode_params_flags:



``Decode Parameters Flags``



.. cssclass:: longtable



.. flat-table::

    :header-rows:  0

    :stub-columns: 0

    :widths:       1 1 2



    * - ``V4L2_HEVC_DECODE_PARAM_FLAG_IRAP_PIC``

      - 0x00000001

      -

    * - ``V4L2_HEVC_DECODE_PARAM_FLAG_IDR_PIC``

      - 0x00000002

      -

    * - ``V4L2_HEVC_DECODE_PARAM_FLAG_NO_OUTPUT_OF_PRIOR``

      - 0x00000004

      -

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

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

      - A struct :c:type:`v4l2_ctrl_vp8_frame`, containing VP8

	frame parameters for stateless video decoders.

    * - ``V4L2_CTRL_TYPE_HEVC_DECODE_PARAMS``

      - n/a

      - n/a

      - n/a

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

	decoding parameters for stateless video decoders.



.. raw:: latex

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

+14 −7
Original line number Diff line number Diff line
@@ -337,6 +337,7 @@ static int std_validate_compound(const struct v4l2_ctrl *ctrl, u32 idx, 
	struct v4l2_ctrl_hevc_pps *p_hevc_pps;

	struct v4l2_ctrl_hevc_slice_params *p_hevc_slice_params;

	struct v4l2_ctrl_hdr10_mastering_display *p_hdr10_mastering;

	struct v4l2_ctrl_hevc_decode_params *p_hevc_decode_params;

	struct v4l2_area *area;

	void *p = ptr.p + idx * ctrl->elem_size;

	unsigned int i;
@@ -616,23 +617,26 @@ static int std_validate_compound(const struct v4l2_ctrl *ctrl, u32 idx, 
		zero_padding(*p_hevc_pps);

		break;



	case V4L2_CTRL_TYPE_HEVC_SLICE_PARAMS:

		p_hevc_slice_params = p;

	case V4L2_CTRL_TYPE_HEVC_DECODE_PARAMS:

		p_hevc_decode_params = p;



		if (p_hevc_slice_params->num_active_dpb_entries >

		if (p_hevc_decode_params->num_active_dpb_entries >

		    V4L2_HEVC_DPB_ENTRIES_NUM_MAX)

			return -EINVAL;



		zero_padding(p_hevc_slice_params->pred_weight_table);



		for (i = 0; i < p_hevc_slice_params->num_active_dpb_entries;

		for (i = 0; i < p_hevc_decode_params->num_active_dpb_entries;

		     i++) {

			struct v4l2_hevc_dpb_entry *dpb_entry =

				&p_hevc_slice_params->dpb[i];

				&p_hevc_decode_params->dpb[i];



			zero_padding(*dpb_entry);

		}

		break;



	case V4L2_CTRL_TYPE_HEVC_SLICE_PARAMS:

		p_hevc_slice_params = p;



		zero_padding(p_hevc_slice_params->pred_weight_table);

		zero_padding(*p_hevc_slice_params);

		break;
@@ -1236,6 +1240,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_DECODE_PARAMS:

		elem_size = sizeof(struct v4l2_ctrl_hevc_decode_params);

		break;

	case V4L2_CTRL_TYPE_HDR10_CLL_INFO:

		elem_size = sizeof(struct v4l2_ctrl_hdr10_cll_info);

		break;

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

+4 −0
Original line number Diff line number Diff line
@@ -996,6 +996,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_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";
@@ -1487,6 +1488,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_DECODE_PARAMS:

		*type = V4L2_CTRL_TYPE_HEVC_DECODE_PARAMS;

		break;

	case V4L2_CID_UNIT_CELL_SIZE:

		*type = V4L2_CTRL_TYPE_AREA;

		*flags |= V4L2_CTRL_FLAG_READ_ONLY;

drivers/staging/media/sunxi/cedrus/cedrus.c

+6 −0
Original line number Diff line number Diff line
@@ -157,6 +157,12 @@ static const struct cedrus_control cedrus_controls[] = { 
		},

		.codec		= CEDRUS_CODEC_VP8,

	},

	{

		.cfg = {

			.id = V4L2_CID_MPEG_VIDEO_HEVC_DECODE_PARAMS,

		},

		.codec		= CEDRUS_CODEC_H265,

	},

};



#define CEDRUS_CONTROLS_COUNT	ARRAY_SIZE(cedrus_controls)