From 8f3811172407ebc4835945d18709cd1580ea4977 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 12 Oct 2023 11:57:57 +0000 Subject: [PATCH] Revert "media: uapi: HEVC: Add num_delta_pocs_of_ref_rps_idx field" This reverts commit b608025733579f4e9074a26dc08ea05f0e07ea0f which is upstream commit ae440c5da33cdb90a109f2df2a0360c67b3fab7e. It breaks the UAPI signature (but not the content), and it turns out is not even needed for the 6.1.y tree at all, so revert it for now. Bug: 161946584 Change-Id: I59e0a97dcaf1ee19bdffaf85f0c2a8f93dc82e75 Signed-off-by: Greg Kroah-Hartman --- .../userspace-api/media/v4l/ext-ctrls-codec-stateless.rst | 7 ------- include/uapi/linux/v4l2-controls.h | 6 +----- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/Documentation/userspace-api/media/v4l/ext-ctrls-codec-stateless.rst b/Documentation/userspace-api/media/v4l/ext-ctrls-codec-stateless.rst index 0ef49647c90b..cd33857d947d 100644 --- a/Documentation/userspace-api/media/v4l/ext-ctrls-codec-stateless.rst +++ b/Documentation/userspace-api/media/v4l/ext-ctrls-codec-stateless.rst @@ -2923,13 +2923,6 @@ This structure contains all loop filter related parameters. See sections - ``poc_lt_curr[V4L2_HEVC_DPB_ENTRIES_NUM_MAX]`` - PocLtCurr as described in section 8.3.2 "Decoding process for reference picture set": provides the index of the long term references in DPB array. - * - __u8 - - ``num_delta_pocs_of_ref_rps_idx`` - - When the short_term_ref_pic_set_sps_flag in the slice header is equal to 0, - it is the same as the derived value NumDeltaPocs[RefRpsIdx]. It can be used to parse - the RPS data in slice headers instead of skipping it with @short_term_ref_pic_set_size. - When the value of short_term_ref_pic_set_sps_flag in the slice header is - equal to 1, num_delta_pocs_of_ref_rps_idx shall be set to 0. * - struct :c:type:`v4l2_hevc_dpb_entry` - ``dpb[V4L2_HEVC_DPB_ENTRIES_NUM_MAX]`` - The decoded picture buffer, for meta-data about reference frames. diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h index d4a4e3cab3c2..b5e7d082b8ad 100644 --- a/include/uapi/linux/v4l2-controls.h +++ b/include/uapi/linux/v4l2-controls.h @@ -2411,9 +2411,6 @@ struct v4l2_ctrl_hevc_slice_params { * @poc_st_curr_after: provides the index of the short term after references * in DPB array * @poc_lt_curr: provides the index of the long term references in DPB array - * @num_delta_pocs_of_ref_rps_idx: same as the derived value NumDeltaPocs[RefRpsIdx], - * can be used to parse the RPS data in slice headers - * instead of skipping it with @short_term_ref_pic_set_size. * @reserved: padding field. Should be zeroed by applications. * @dpb: the decoded picture buffer, for meta-data about reference frames * @flags: see V4L2_HEVC_DECODE_PARAM_FLAG_{} @@ -2429,8 +2426,7 @@ struct v4l2_ctrl_hevc_decode_params { __u8 poc_st_curr_before[V4L2_HEVC_DPB_ENTRIES_NUM_MAX]; __u8 poc_st_curr_after[V4L2_HEVC_DPB_ENTRIES_NUM_MAX]; __u8 poc_lt_curr[V4L2_HEVC_DPB_ENTRIES_NUM_MAX]; - __u8 num_delta_pocs_of_ref_rps_idx; - __u8 reserved[3]; + __u8 reserved[4]; struct v4l2_hevc_dpb_entry dpb[V4L2_HEVC_DPB_ENTRIES_NUM_MAX]; __u64 flags; };