On Tue, Jul 05, 2022 at 10:54:07AM +0200, Benjamin Gaignard wrote:
> Complete the HEVC controls with missing fields from H.265 specifications.
> Even if these fields aren't used by the current mainlined drivers
> they will be required for (at least) the rkvdec driver.
>
> Signed-off-by: Benjamin Gaignard <benjamin.gaignard@xxxxxxxxxxxxx>
> Acked-by: Nicolas Dufresne <nicolas.dufresne@xxxxxxxxxxxxx>
> Tested-by: Jernej Skrabec <jernej.skrabec@xxxxxxxxx>
Reviewed-by: Ezequiel Garcia <ezequiel@xxxxxxxxxxxxxxxxxxxx>
> ---
> version 9:
> - fix typo
>
> .../media/v4l/ext-ctrls-codec.rst | 32 +++++++++++++++++++
> include/media/hevc-ctrls.h | 8 ++++-
> 2 files changed, 39 insertions(+), 1 deletion(-)
>
> diff --git a/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst b/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst
> index 6183f43f4d73..cff742142a55 100644
> --- a/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst
> +++ b/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst
> @@ -2683,6 +2683,16 @@ enum v4l2_mpeg_video_hevc_size_of_length_field -
> :stub-columns: 0
> :widths: 1 1 2
>
> + * - __u8
> + - ``video_parameter_set_id``
> + - Specifies the value of the vps_video_parameter_set_id of the active VPS
> + as described in section "7.4.3.2.1 General sequence parameter set RBSP semantics"
> + of H.265 specifications.
> + * - __u8
> + - ``seq_parameter_set_id``
> + - Provides an identifier for the SPS for reference by other syntax elements
> + as described in section "7.4.3.2.1 General sequence parameter set RBSP semantics"
> + of H.265 specifications.
> * - __u16
> - ``pic_width_in_luma_samples``
> -
> @@ -2822,6 +2832,9 @@ enum v4l2_mpeg_video_hevc_size_of_length_field -
> :stub-columns: 0
> :widths: 1 1 2
>
> + * - __u8
> + - ``pic_parameter_set_id``
> + - Identifies the PPS for reference by other syntax elements.
> * - __u8
> - ``num_extra_slice_header_bits``
> -
> @@ -3048,6 +3061,15 @@ enum v4l2_mpeg_video_hevc_size_of_length_field -
> * - __u8
> - ``ref_idx_l1[V4L2_HEVC_DPB_ENTRIES_NUM_MAX]``
> - The list of L1 reference elements as indices in the DPB.
> + * - __u16
> + - ``short_term_ref_pic_set_size``
> + - Specifies the size, in bits, of the short-term reference picture set, described as st_ref_pic_set()
> + in the specification, included in the slice header or SPS (section 7.3.6.1).
> + * - __u16
> + - ``long_term_ref_pic_set_size``
> + - Specifies the size, in bits, of the long-term reference picture set include in the slice header
> + or SPS. It is the number of bits in the conditional block if(long_term_ref_pics_present_flag)
> + in section 7.3.6.1 of the specification.
> * - __u8
> - ``padding``
> - Applications and drivers must set this to zero.
> @@ -3385,6 +3407,16 @@ enum v4l2_mpeg_video_hevc_size_of_length_field -
> - ``pic_order_cnt_val``
> - PicOrderCntVal as described in section 8.3.1 "Decoding process
> for picture order count" of the specification.
> + * - __u16
> + - ``short_term_ref_pic_set_size``
> + - Specifies the size, in bits, of the short-term reference picture set, of the first slice
> + described as st_ref_pic_set() in the specification, included in the slice header
> + or SPS (section 7.3.6.1).
> + * - __u16
> + - ``long_term_ref_pic_set_size``
> + - Specifies the size, in bits, of the long-term reference picture set, of the first slice
> + included in the slice header or SPS. It is the number of bits in the conditional block
> + if(long_term_ref_pics_present_flag) in section 7.3.6.1 of the specification.
> * - __u8
> - ``num_active_dpb_entries``
> - The number of entries in ``dpb``.
> diff --git a/include/media/hevc-ctrls.h b/include/media/hevc-ctrls.h
> index 01ccda48d8c5..752a8d10782c 100644
> --- a/include/media/hevc-ctrls.h
> +++ b/include/media/hevc-ctrls.h
> @@ -58,6 +58,8 @@ enum v4l2_mpeg_video_hevc_start_code {
> /* The controls are not stable at the moment and will likely be reworked. */
> struct v4l2_ctrl_hevc_sps {
> /* ISO/IEC 23008-2, ITU-T Rec. H.265: Sequence parameter set */
> + __u8 video_parameter_set_id;
> + __u8 seq_parameter_set_id;
> __u16 pic_width_in_luma_samples;
> __u16 pic_height_in_luma_samples;
> __u8 bit_depth_luma_minus8;
> @@ -108,6 +110,7 @@ struct v4l2_ctrl_hevc_sps {
>
> struct v4l2_ctrl_hevc_pps {
> /* ISO/IEC 23008-2, ITU-T Rec. H.265: Picture parameter set */
> + __u8 pic_parameter_set_id;
> __u8 num_extra_slice_header_bits;
> __u8 num_ref_idx_l0_default_active_minus1;
> __u8 num_ref_idx_l1_default_active_minus1;
> @@ -199,7 +202,8 @@ struct v4l2_ctrl_hevc_slice_params {
> __u32 slice_segment_addr;
> __u8 ref_idx_l0[V4L2_HEVC_DPB_ENTRIES_NUM_MAX];
> __u8 ref_idx_l1[V4L2_HEVC_DPB_ENTRIES_NUM_MAX];
> -
> + __u16 short_term_ref_pic_set_size;
> + __u16 long_term_ref_pic_set_size;
> __u8 padding;
>
> /* ISO/IEC 23008-2, ITU-T Rec. H.265: Weighted prediction parameter */
> @@ -214,6 +218,8 @@ struct v4l2_ctrl_hevc_slice_params {
>
> struct v4l2_ctrl_hevc_decode_params {
> __s32 pic_order_cnt_val;
> + __u16 short_term_ref_pic_set_size;
> + __u16 long_term_ref_pic_set_size;
> __u8 num_active_dpb_entries;
> struct v4l2_hevc_dpb_entry dpb[V4L2_HEVC_DPB_ENTRIES_NUM_MAX];
> __u8 num_poc_st_curr_before;
> --
> 2.32.0
>
