From: Benjamin Gaignard <benjamin.gaignard@collabora.com> To: mchehab@kernel.org, ezequiel@vanguardiasur.com.ar, p.zabel@pengutronix.de, gregkh@linuxfoundation.org, mripard@kernel.org, paul.kocialkowski@bootlin.com, wens@csie.org, jernej.skrabec@gmail.com, jonas@kwiboo.se, nicolas@ndufresne.ca Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-staging@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, kernel@collabora.com, knaerzche@gmail.com, jc@kynesim.co.uk, Benjamin Gaignard <benjamin.gaignard@collabora.com> Subject: [PATCH v4 09/15] media: uapi: Add V4L2_CID_STATELESS_HEVC_ENTRY_POINT_OFFSETS control Date: Mon, 28 Feb 2022 15:08:32 +0100 [thread overview] Message-ID: <20220228140838.622021-10-benjamin.gaignard@collabora.com> (raw) In-Reply-To: <20220228140838.622021-1-benjamin.gaignard@collabora.com> The number of 'entry point offset' could be very variable. Rather than use a large static array define a v4l2 dynamic array of U32 (V4L2_CTRL_TYPE_U32). The number of entry point offsets is reported by the elems field and in struct v4l2_ctrl_hevc_slice_params.num_entry_point_offsets field. Signed-off-by: Benjamin Gaignard <benjamin.gaignard@collabora.com> --- Version 4: - Add num_entry_point_offsets field in struct v4l2_ctrl_hevc_slice_params - Fix V4L2_CID_STATELESS_HEVC_ENTRY_POINT_OFFSETS name - Initialize control .../userspace-api/media/v4l/ext-ctrls-codec.rst | 11 +++++++++++ drivers/media/v4l2-core/v4l2-ctrls-defs.c | 5 +++++ include/media/hevc-ctrls.h | 5 ++++- 3 files changed, 20 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 91c80964f82f..b2993ac5a041 100644 --- a/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst +++ b/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst @@ -2988,6 +2988,9 @@ enum v4l2_mpeg_video_hevc_size_of_length_field - * - __u32 - ``data_bit_offset`` - Offset (in bits) to the video data in the current slice data. + * - __u32 + - ``num_entry_point_offsets`` + - Specifies the number of entry point offset syntax elements in the slice header. * - __u8 - ``nal_unit_type`` - Specifies the coding type of the slice (B, P or I). @@ -3128,6 +3131,14 @@ enum v4l2_mpeg_video_hevc_size_of_length_field - \normalsize +``V4L2_CID_STATELESS_HEVC_ENTRY_POINT_OFFSETS (integer)`` + Specifies entry point offsets in bytes. + This control is a dynamically sized array. The number of entry point + offsets is reported by the ``elems`` field. + This bitstream parameter is defined according to :ref:`hevc`. + They are described in section 7.4.7.1 "General slice segment header + semantics" of the specification. + ``V4L2_CID_STATELESS_HEVC_SCALING_MATRIX (struct)`` Specifies the HEVC scaling matrix parameters used for the scaling process for transform coefficients. diff --git a/drivers/media/v4l2-core/v4l2-ctrls-defs.c b/drivers/media/v4l2-core/v4l2-ctrls-defs.c index 4b68cbe23309..48d385b776b1 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls-defs.c +++ b/drivers/media/v4l2-core/v4l2-ctrls-defs.c @@ -1180,6 +1180,7 @@ const char *v4l2_ctrl_get_name(u32 id) case V4L2_CID_STATELESS_HEVC_DECODE_PARAMS: return "HEVC Decode Parameters"; case V4L2_CID_STATELESS_HEVC_DECODE_MODE: return "HEVC Decode Mode"; case V4L2_CID_STATELESS_HEVC_START_CODE: return "HEVC Start Code"; + case V4L2_CID_STATELESS_HEVC_ENTRY_POINT_OFFSETS: return "HEVC Entry Point Offsets"; /* Colorimetry controls */ /* Keep the order of the 'case's the same as in v4l2-controls.h! */ @@ -1508,6 +1509,10 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type, case V4L2_CID_STATELESS_HEVC_DECODE_PARAMS: *type = V4L2_CTRL_TYPE_HEVC_DECODE_PARAMS; break; + case V4L2_CID_STATELESS_HEVC_ENTRY_POINT_OFFSETS: + *type = V4L2_CTRL_TYPE_U32; + *flags |= V4L2_CTRL_FLAG_DYNAMIC_ARRAY; + break; case V4L2_CID_STATELESS_VP9_COMPRESSED_HDR: *type = V4L2_CTRL_TYPE_VP9_COMPRESSED_HDR; break; diff --git a/include/media/hevc-ctrls.h b/include/media/hevc-ctrls.h index 6b5849ca247b..1ec29e79cc55 100644 --- a/include/media/hevc-ctrls.h +++ b/include/media/hevc-ctrls.h @@ -20,6 +20,7 @@ #define V4L2_CID_STATELESS_HEVC_DECODE_PARAMS (V4L2_CID_CODEC_BASE + 1012) #define V4L2_CID_STATELESS_HEVC_DECODE_MODE (V4L2_CID_CODEC_BASE + 1015) #define V4L2_CID_STATELESS_HEVC_START_CODE (V4L2_CID_CODEC_BASE + 1016) +#define V4L2_CID_STATELESS_HEVC_ENTRY_POINT_OFFSETS (V4L2_CID_CODEC_BASE + 1017) /* enum v4l2_ctrl_type type values */ #define V4L2_CTRL_TYPE_HEVC_SPS 0x0120 @@ -302,6 +303,8 @@ struct v4l2_hevc_pred_weight_table { * * @bit_size: size (in bits) of the current slice data * @data_bit_offset: offset (in bits) to the video data in the current slice data + * @num_entry_point_offsets: specifies the number of entry point offset syntax + * elements in the slice header. * @nal_unit_type: specifies the coding type of the slice (B, P or I) * @nuh_temporal_id_plus1: minus 1 specifies a temporal identifier for the NAL unit * @slice_type: see V4L2_HEVC_SLICE_TYPE_{} @@ -344,7 +347,7 @@ struct v4l2_hevc_pred_weight_table { struct v4l2_ctrl_hevc_slice_params { __u32 bit_size; __u32 data_bit_offset; - + __u32 num_entry_point_offsets; /* ISO/IEC 23008-2, ITU-T Rec. H.265: NAL unit header */ __u8 nal_unit_type; __u8 nuh_temporal_id_plus1; -- 2.32.0
WARNING: multiple messages have this Message-ID (diff)
From: Benjamin Gaignard <benjamin.gaignard@collabora.com> To: mchehab@kernel.org, ezequiel@vanguardiasur.com.ar, p.zabel@pengutronix.de, gregkh@linuxfoundation.org, mripard@kernel.org, paul.kocialkowski@bootlin.com, wens@csie.org, jernej.skrabec@gmail.com, jonas@kwiboo.se, nicolas@ndufresne.ca Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-staging@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, kernel@collabora.com, knaerzche@gmail.com, jc@kynesim.co.uk, Benjamin Gaignard <benjamin.gaignard@collabora.com> Subject: [PATCH v4 09/15] media: uapi: Add V4L2_CID_STATELESS_HEVC_ENTRY_POINT_OFFSETS control Date: Mon, 28 Feb 2022 15:08:32 +0100 [thread overview] Message-ID: <20220228140838.622021-10-benjamin.gaignard@collabora.com> (raw) In-Reply-To: <20220228140838.622021-1-benjamin.gaignard@collabora.com> The number of 'entry point offset' could be very variable. Rather than use a large static array define a v4l2 dynamic array of U32 (V4L2_CTRL_TYPE_U32). The number of entry point offsets is reported by the elems field and in struct v4l2_ctrl_hevc_slice_params.num_entry_point_offsets field. Signed-off-by: Benjamin Gaignard <benjamin.gaignard@collabora.com> --- Version 4: - Add num_entry_point_offsets field in struct v4l2_ctrl_hevc_slice_params - Fix V4L2_CID_STATELESS_HEVC_ENTRY_POINT_OFFSETS name - Initialize control .../userspace-api/media/v4l/ext-ctrls-codec.rst | 11 +++++++++++ drivers/media/v4l2-core/v4l2-ctrls-defs.c | 5 +++++ include/media/hevc-ctrls.h | 5 ++++- 3 files changed, 20 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 91c80964f82f..b2993ac5a041 100644 --- a/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst +++ b/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst @@ -2988,6 +2988,9 @@ enum v4l2_mpeg_video_hevc_size_of_length_field - * - __u32 - ``data_bit_offset`` - Offset (in bits) to the video data in the current slice data. + * - __u32 + - ``num_entry_point_offsets`` + - Specifies the number of entry point offset syntax elements in the slice header. * - __u8 - ``nal_unit_type`` - Specifies the coding type of the slice (B, P or I). @@ -3128,6 +3131,14 @@ enum v4l2_mpeg_video_hevc_size_of_length_field - \normalsize +``V4L2_CID_STATELESS_HEVC_ENTRY_POINT_OFFSETS (integer)`` + Specifies entry point offsets in bytes. + This control is a dynamically sized array. The number of entry point + offsets is reported by the ``elems`` field. + This bitstream parameter is defined according to :ref:`hevc`. + They are described in section 7.4.7.1 "General slice segment header + semantics" of the specification. + ``V4L2_CID_STATELESS_HEVC_SCALING_MATRIX (struct)`` Specifies the HEVC scaling matrix parameters used for the scaling process for transform coefficients. diff --git a/drivers/media/v4l2-core/v4l2-ctrls-defs.c b/drivers/media/v4l2-core/v4l2-ctrls-defs.c index 4b68cbe23309..48d385b776b1 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls-defs.c +++ b/drivers/media/v4l2-core/v4l2-ctrls-defs.c @@ -1180,6 +1180,7 @@ const char *v4l2_ctrl_get_name(u32 id) case V4L2_CID_STATELESS_HEVC_DECODE_PARAMS: return "HEVC Decode Parameters"; case V4L2_CID_STATELESS_HEVC_DECODE_MODE: return "HEVC Decode Mode"; case V4L2_CID_STATELESS_HEVC_START_CODE: return "HEVC Start Code"; + case V4L2_CID_STATELESS_HEVC_ENTRY_POINT_OFFSETS: return "HEVC Entry Point Offsets"; /* Colorimetry controls */ /* Keep the order of the 'case's the same as in v4l2-controls.h! */ @@ -1508,6 +1509,10 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type, case V4L2_CID_STATELESS_HEVC_DECODE_PARAMS: *type = V4L2_CTRL_TYPE_HEVC_DECODE_PARAMS; break; + case V4L2_CID_STATELESS_HEVC_ENTRY_POINT_OFFSETS: + *type = V4L2_CTRL_TYPE_U32; + *flags |= V4L2_CTRL_FLAG_DYNAMIC_ARRAY; + break; case V4L2_CID_STATELESS_VP9_COMPRESSED_HDR: *type = V4L2_CTRL_TYPE_VP9_COMPRESSED_HDR; break; diff --git a/include/media/hevc-ctrls.h b/include/media/hevc-ctrls.h index 6b5849ca247b..1ec29e79cc55 100644 --- a/include/media/hevc-ctrls.h +++ b/include/media/hevc-ctrls.h @@ -20,6 +20,7 @@ #define V4L2_CID_STATELESS_HEVC_DECODE_PARAMS (V4L2_CID_CODEC_BASE + 1012) #define V4L2_CID_STATELESS_HEVC_DECODE_MODE (V4L2_CID_CODEC_BASE + 1015) #define V4L2_CID_STATELESS_HEVC_START_CODE (V4L2_CID_CODEC_BASE + 1016) +#define V4L2_CID_STATELESS_HEVC_ENTRY_POINT_OFFSETS (V4L2_CID_CODEC_BASE + 1017) /* enum v4l2_ctrl_type type values */ #define V4L2_CTRL_TYPE_HEVC_SPS 0x0120 @@ -302,6 +303,8 @@ struct v4l2_hevc_pred_weight_table { * * @bit_size: size (in bits) of the current slice data * @data_bit_offset: offset (in bits) to the video data in the current slice data + * @num_entry_point_offsets: specifies the number of entry point offset syntax + * elements in the slice header. * @nal_unit_type: specifies the coding type of the slice (B, P or I) * @nuh_temporal_id_plus1: minus 1 specifies a temporal identifier for the NAL unit * @slice_type: see V4L2_HEVC_SLICE_TYPE_{} @@ -344,7 +347,7 @@ struct v4l2_hevc_pred_weight_table { struct v4l2_ctrl_hevc_slice_params { __u32 bit_size; __u32 data_bit_offset; - + __u32 num_entry_point_offsets; /* ISO/IEC 23008-2, ITU-T Rec. H.265: NAL unit header */ __u8 nal_unit_type; __u8 nuh_temporal_id_plus1; -- 2.32.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2022-02-28 14:08 UTC|newest] Thread overview: 81+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-02-28 14:08 [PATCH v4 00/15] Move HEVC stateless controls out of staging Benjamin Gaignard 2022-02-28 14:08 ` Benjamin Gaignard 2022-02-28 14:08 ` [PATCH v4 01/15] videodev2.h: add V4L2_CTRL_FLAG_DYNAMIC_ARRAY Benjamin Gaignard 2022-02-28 14:08 ` Benjamin Gaignard 2022-02-28 14:08 ` [PATCH v4 02/15] v4l2-ctrls: add support for dynamically allocated arrays Benjamin Gaignard 2022-02-28 14:08 ` Benjamin Gaignard 2022-02-28 14:08 ` [PATCH v4 03/15] vivid: add dynamic array test control Benjamin Gaignard 2022-02-28 14:08 ` Benjamin Gaignard 2022-02-28 14:08 ` [PATCH v4 04/15] media: uapi: HEVC: Add missing fields in HEVC controls Benjamin Gaignard 2022-02-28 14:08 ` Benjamin Gaignard 2022-02-28 16:57 ` Sebastian Fricke 2022-02-28 16:57 ` Sebastian Fricke 2022-03-01 10:36 ` Benjamin Gaignard 2022-03-01 10:36 ` Benjamin Gaignard 2022-02-28 14:08 ` [PATCH v4 05/15] media: uapi: HEVC: Rename HEVC stateless controls with STATELESS prefix Benjamin Gaignard 2022-02-28 14:08 ` Benjamin Gaignard 2022-04-04 15:56 ` Nicolas Dufresne 2022-04-04 15:56 ` Nicolas Dufresne 2022-02-28 14:08 ` [PATCH v4 06/15] media: uapi: HEVC: Add document uAPI structure Benjamin Gaignard 2022-02-28 14:08 ` Benjamin Gaignard 2022-04-04 16:20 ` Nicolas Dufresne 2022-04-04 16:20 ` Nicolas Dufresne 2022-04-04 16:36 ` Benjamin Gaignard 2022-04-04 16:36 ` Benjamin Gaignard 2022-02-28 14:08 ` [PATCH v4 07/15] media: uapi: HEVC: Define V4L2_CID_STATELESS_HEVC_SLICE_PARAMS as a dynamic array Benjamin Gaignard 2022-02-28 14:08 ` Benjamin Gaignard 2022-02-28 14:08 ` [PATCH v4 08/15] media: uapi: Move parsed HEVC pixel format out of staging Benjamin Gaignard 2022-02-28 14:08 ` Benjamin Gaignard 2022-02-28 14:08 ` Benjamin Gaignard [this message] 2022-02-28 14:08 ` [PATCH v4 09/15] media: uapi: Add V4L2_CID_STATELESS_HEVC_ENTRY_POINT_OFFSETS control Benjamin Gaignard 2022-02-28 14:08 ` [PATCH v4 10/15] media: uapi: Move the HEVC stateless control type out of staging Benjamin Gaignard 2022-02-28 14:08 ` Benjamin Gaignard 2022-02-28 14:08 ` [PATCH v4 11/15] media: controls: Log HEVC stateless control in .std_log Benjamin Gaignard 2022-02-28 14:08 ` Benjamin Gaignard 2022-02-28 14:08 ` [PATCH v4 12/15] media: uapi: Create a dedicated header for Hantro control Benjamin Gaignard 2022-02-28 14:08 ` Benjamin Gaignard 2022-02-28 14:08 ` [PATCH v4 13/15] media: uapi: HEVC: fix padding in v4l2 control structures Benjamin Gaignard 2022-02-28 14:08 ` Benjamin Gaignard 2022-02-28 14:08 ` [PATCH v4 14/15] media: uapi: Change data_bit_offset definition Benjamin Gaignard 2022-02-28 14:08 ` Benjamin Gaignard 2022-04-06 20:36 ` Nicolas Dufresne 2022-04-06 20:36 ` Nicolas Dufresne 2022-02-28 14:08 ` [PATCH v4 15/15] media: uapi: move HEVC stateless controls out of staging Benjamin Gaignard 2022-03-30 7:09 ` [PATCH v4 00/15] Move " Benjamin Gaignard 2022-03-30 7:09 ` Benjamin Gaignard 2022-03-30 18:52 ` Adam Ford 2022-03-30 18:52 ` Adam Ford 2022-03-31 6:53 ` Benjamin Gaignard 2022-03-31 6:53 ` Benjamin Gaignard 2022-04-01 13:18 ` Benjamin Gaignard 2022-04-01 13:18 ` Benjamin Gaignard 2022-04-02 16:22 ` Adam Ford 2022-04-02 16:22 ` Adam Ford 2022-04-02 16:59 ` Adam Ford 2022-04-02 16:59 ` Adam Ford 2022-04-04 15:56 ` Benjamin Gaignard 2022-04-04 15:56 ` Benjamin Gaignard 2022-04-05 21:27 ` Adam Ford 2022-04-05 21:27 ` Adam Ford 2022-04-06 6:56 ` Benjamin Gaignard 2022-04-06 6:56 ` Benjamin Gaignard 2022-04-06 12:28 ` Adam Ford 2022-04-06 12:28 ` Adam Ford 2022-04-06 12:40 ` Benjamin Gaignard 2022-04-06 12:40 ` Benjamin Gaignard 2022-04-06 12:46 ` Adam Ford 2022-04-06 12:46 ` Adam Ford 2022-04-06 12:50 ` Benjamin Gaignard 2022-04-06 12:50 ` Benjamin Gaignard 2022-04-06 12:55 ` Adam Ford 2022-04-06 12:55 ` Adam Ford 2022-04-06 13:01 ` Benjamin Gaignard 2022-04-06 13:01 ` Benjamin Gaignard 2022-04-06 13:02 ` Nicolas Dufresne 2022-04-06 13:02 ` Nicolas Dufresne 2022-04-06 13:05 ` Benjamin Gaignard 2022-04-06 13:05 ` Benjamin Gaignard 2022-04-06 13:34 ` Adam Ford 2022-04-06 13:34 ` Adam Ford 2022-04-07 1:12 ` Adam Ford 2022-04-07 1:12 ` Adam Ford
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220228140838.622021-10-benjamin.gaignard@collabora.com \ --to=benjamin.gaignard@collabora.com \ --cc=ezequiel@vanguardiasur.com.ar \ --cc=gregkh@linuxfoundation.org \ --cc=jc@kynesim.co.uk \ --cc=jernej.skrabec@gmail.com \ --cc=jonas@kwiboo.se \ --cc=kernel@collabora.com \ --cc=knaerzche@gmail.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-media@vger.kernel.org \ --cc=linux-staging@lists.linux.dev \ --cc=linux-sunxi@lists.linux.dev \ --cc=mchehab@kernel.org \ --cc=mripard@kernel.org \ --cc=nicolas@ndufresne.ca \ --cc=p.zabel@pengutronix.de \ --cc=paul.kocialkowski@bootlin.com \ --cc=wens@csie.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.