media: uapi: mpeg2: Split sequence and picture parameters
PATCH 3/3 media: uapi: mpeg2: Split sequence and picture parameters
Typically, bitstreams are composed of one sequence header NAL unit, followed by a number of picture header and picture coding extension NAL units. Each picture can be composed by a number of slices.
Let's split the MPEG-2 uAPI to follow these semantics more closely, allowing more usage flexibility. Having these controls splitted allows applications to set a sequence control at the beginning of a sequence, and then set a picture control for each frame.
While here add padding fields where needed, and document the uAPI header thoroughly.
Signed-off-by Ezequiel Garcia <[email protected]>
--- .../media/v4l/ext-ctrls-codec.rst | 47 ++++++-- .../media/v4l/pixfmt-compressed.rst | 5 +- drivers/media/v4l2-core/v4l2-ctrls.c | 45 +++++-- drivers/staging/media/hantro/hantro_drv.c | 10 ++ .../media/hantro/hantro_g1_mpeg2_dec.c | 14 ++- .../media/hantro/rk3399_vpu_hw_mpeg2_dec.c | 14 ++- drivers/staging/media/sunxi/cedrus/cedrus.c | 14 +++ drivers/staging/media/sunxi/cedrus/cedrus.h | 2 + .../staging/media/sunxi/cedrus/cedrus_mpeg2.c | 8 +- include/media/mpeg2-ctrls.h | 110 +++++++++++++++--- include/media/v4l2-ctrls.h | 4 + 11 files changed, 212 insertions(+), 61 deletions(-)
Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst +35 -12
@@ -2218,14 +2218,6 @@ enum v4l2_mpeg_video_h264_hierarchical_coding_type - :stub-columns: 0 :widths: 1 1 2 - * - struct :c:type:`v4l2_mpeg2_sequence` - - ``sequence`` - - Structure with MPEG-2 sequence metadata, merging relevant fields from - the sequence header and sequence extension parts of the bitstream. - * - struct :c:type:`v4l2_mpeg2_picture` - - ``picture`` - - Structure with MPEG-2 picture metadata, merging relevant fields from - the picture header and picture coding extension parts of the bitstream. * - __u64 - ``backward_ref_ts`` - Timestamp of the V4L2 capture buffer to use as backward reference, used
@@ -2243,14 +2235,28 @@ enum v4l2_mpeg_video_h264_hierarchical_coding_type - * - __u32 - ``quantiser_scale_code`` - Code used to determine the quantization scale to use for the IDCT. + * - __u8 + - ``reserved`` + - Applications and drivers must set this to zero. -.. c:type:: v4l2_mpeg2_sequence +``V4L2_CID_MPEG_VIDEO_MPEG2_SEQUENCE (struct)`` + Specifies the sequence parameters (as extracted from the bitstream) for the + associated MPEG-2 slice data. This includes fields matching the syntax + elements from the sequence header and sequence extension parts of the + bitstream as specified by :ref:`mpeg2part2`. + + .. note:: + + This compound control is not yet part of the public kernel API and + it is expected to change. + +.. c:type:: v4l2_ctrl_mpeg2_sequence .. cssclass:: longtable .. tabularcolumns:: |p{1.5cm}|p{6.3cm}|p{9.4cm}| -.. flat-table:: struct v4l2_mpeg2_sequence +.. flat-table:: struct v4l2_ctrl_mpeg2_sequence :header-rows: 0 :stub-columns: 0 :widths: 1 1 2
@@ -2272,6 +2278,9 @@ enum v4l2_mpeg_video_h264_hierarchical_coding_type - * - __u8 - ``chroma_format`` - The chrominance sub-sampling format (1: 4:2:0, 2: 4:2:2, 3: 4:4:4). + * - __u8 + - ``reserved`` + - Applications and drivers must set this to zero. * - __u32 - ``flags`` - See :ref:`MPEG-2 Sequence Flags <mpeg2_sequence_flags>`.
@@ -2292,13 +2301,24 @@ enum v4l2_mpeg_video_h264_hierarchical_coding_type - - Indication that all the frames for the sequence are progressive instead of interlaced. -.. c:type:: v4l2_mpeg2_picture +``V4L2_CID_MPEG_VIDEO_MPEG2_PICTURE (struct)`` + Specifies the picture parameters (as extracted from the bitstream) for the + associated MPEG-2 slice data. This includes fields matching the syntax + elements from the picture header and picture coding extension parts of the + bitstream as specified by :ref:`mpeg2part2`. + + .. note:: + + This compound control is not yet part of the public kernel API and + it is expected to change. + +.. c:type:: v4l2_ctrl_mpeg2_picture .. cssclass:: longtable .. tabularcolumns:: |p{1.5cm}|p{6.3cm}|p{9.4cm}| -.. flat-table:: struct v4l2_mpeg2_picture +.. flat-table:: struct v4l2_ctrl_mpeg2_picture :header-rows: 0 :stub-columns: 0 :widths: 1 1 2
@@ -2319,6 +2339,9 @@ enum v4l2_mpeg_video_h264_hierarchical_coding_type - - ``picture_structure`` - Picture structure (1: interlaced top field, 2: interlaced bottom field, 3: progressive frame). + * - __u8 + - ``reserved`` + - Applications and drivers must set this to zero. * - __u32 - ``flags`` - See :ref:`MPEG-2 Picture Flags <mpeg2_picture_flags>`.
Documentation/userspace-api/media/v4l/pixfmt-compressed.rst +3 -2
@@ -113,8 +113,9 @@ Compressed Formats This format is adapted for stateless video decoders that implement a MPEG-2 pipeline (using the :ref:`mem2mem` and :ref:`media-request-api`). Metadata associated with the frame to decode is required to be passed - through the ``V4L2_CID_MPEG_VIDEO_MPEG2_SLICE_PARAMS`` control and - quantization matrices can optionally be specified through the + through the ``V4L2_CID_MPEG_VIDEO_MPEG2_SEQUENCE``, + ``V4L2_CID_MPEG_VIDEO_MPEG2_PICTURE``, and ``V4L2_CID_MPEG_VIDEO_MPEG2_SLICE_PARAMS`` + controls. Quantization matrices can optionally be specified through the ``V4L2_CID_MPEG_VIDEO_MPEG2_QUANTIZATION`` control. See the :ref:`associated Codec Control IDs <v4l2-mpeg-mpeg2>`. Exactly one output and one capture buffer must be provided for use with
drivers/media/v4l2-core/v4l2-ctrls.c +33 -12
99 lines not on this page · raw message
drivers/staging/media/hantro/hantro_drv.c +10 -0
@@ -286,6 +286,16 @@ static const struct hantro_ctrl controls[] = { .def = 50, .ops = &hantro_jpeg_ctrl_ops, }, + }, { + .codec = HANTRO_MPEG2_DECODER, + .cfg = { + .id = V4L2_CID_MPEG_VIDEO_MPEG2_SEQUENCE, + }, + }, { + .codec = HANTRO_MPEG2_DECODER, + .cfg = { + .id = V4L2_CID_MPEG_VIDEO_MPEG2_PICTURE, + }, }, { .codec = HANTRO_MPEG2_DECODER, .cfg = {
drivers/staging/media/hantro/hantro_g1_mpeg2_dec.c +8 -6
@@ -95,8 +95,8 @@ static void hantro_g1_mpeg2_dec_set_buffers(struct hantro_dev *vpu, struct hantro_ctx *ctx, struct vb2_buffer *src_buf, struct vb2_buffer *dst_buf, - const struct v4l2_mpeg2_sequence *seq, - const struct v4l2_mpeg2_picture *pic, + const struct v4l2_ctrl_mpeg2_sequence *seq, + const struct v4l2_ctrl_mpeg2_picture *pic, const struct v4l2_ctrl_mpeg2_slice_params *slice_params) { dma_addr_t forward_addr = 0, backward_addr = 0;
@@ -156,8 +156,8 @@ void hantro_g1_mpeg2_dec_run(struct hantro_ctx *ctx)struct hantro_dev *vpu = ctx->dev;struct vb2_v4l2_buffer *src_buf, *dst_buf;const struct v4l2_ctrl_mpeg2_slice_params *slice_params; -const struct v4l2_mpeg2_sequence *seq; -const struct v4l2_mpeg2_picture *pic; +const struct v4l2_ctrl_mpeg2_sequence *seq; +const struct v4l2_ctrl_mpeg2_picture *pic;u32 reg; src_buf =hantro_get_src_buf (ctx);
@@ -168,8 +168,10 @@ void hantro_g1_mpeg2_dec_run(struct hantro_ctx *ctx) slice_params =hantro_get_ctrl (ctx,V4L2_CID_MPEG_VIDEO_MPEG2_SLICE_PARAMS ); - seq = &slice_params->sequence; - pic = &slice_params->picture; + seq =hantro_get_ctrl (ctx, +V4L2_CID_MPEG_VIDEO_MPEG2_SEQUENCE ); + pic =hantro_get_ctrl (ctx, +V4L2_CID_MPEG_VIDEO_MPEG2_PICTURE ); reg =G1_REG_DEC_AXI_RD_ID (0 ) | G1_REG_DEC_TIMEOUT_E(1) |
drivers/staging/media/hantro/rk3399_vpu_hw_mpeg2_dec.c +8 -6
@@ -97,8 +97,8 @@ rk3399_vpu_mpeg2_dec_set_buffers(struct hantro_dev *vpu,struct hantro_ctx *ctx, struct vb2_buffer *src_buf, struct vb2_buffer *dst_buf, - const struct v4l2_mpeg2_sequence *seq, - const struct v4l2_mpeg2_picture *pic, + const struct v4l2_ctrl_mpeg2_sequence *seq, + const struct v4l2_ctrl_mpeg2_picture *pic, const struct v4l2_ctrl_mpeg2_slice_params *slice_params) { dma_addr_t forward_addr = 0, backward_addr = 0;
@@ -158,8 +158,8 @@ void rk3399_vpu_mpeg2_dec_run(struct hantro_ctx *ctx)struct hantro_dev *vpu = ctx->dev;struct vb2_v4l2_buffer *src_buf, *dst_buf;const struct v4l2_ctrl_mpeg2_slice_params *slice_params; -const struct v4l2_mpeg2_sequence *seq; -const struct v4l2_mpeg2_picture *pic; +const struct v4l2_ctrl_mpeg2_sequence *seq; +const struct v4l2_ctrl_mpeg2_picture *pic;u32 reg; src_buf =hantro_get_src_buf (ctx);
@@ -169,8 +169,10 @@ void rk3399_vpu_mpeg2_dec_run(struct hantro_ctx *ctx) slice_params =hantro_get_ctrl (ctx,V4L2_CID_MPEG_VIDEO_MPEG2_SLICE_PARAMS ); - seq = &slice_params->sequence; - pic = &slice_params->picture; + seq =hantro_get_ctrl (ctx, +V4L2_CID_MPEG_VIDEO_MPEG2_SEQUENCE ); + pic =hantro_get_ctrl (ctx, +V4L2_CID_MPEG_VIDEO_MPEG2_PICTURE ); reg =VDPU_REG_DEC_ADV_PRE_DIS (0 ) | VDPU_REG_DEC_SCMD_DIS(0) |
drivers/staging/media/sunxi/cedrus/cedrus.c +14 -0
@@ -29,6 +29,20 @@#include "cedrus_hw.h" static const struct cedrus_control cedrus_controls[] = { + { + .cfg = { + .id =V4L2_CID_MPEG_VIDEO_MPEG2_SEQUENCE , + }, + .codec =CEDRUS_CODEC_MPEG2 , + .required = true, + }, + { + .cfg = { + .id =V4L2_CID_MPEG_VIDEO_MPEG2_PICTURE , + }, + .codec =CEDRUS_CODEC_MPEG2 , + .required = true, + }, { .cfg = { .id =V4L2_CID_MPEG_VIDEO_MPEG2_SLICE_PARAMS ,
drivers/staging/media/sunxi/cedrus/cedrus.h +2 -0
@@ -66,6 +66,8 @@ struct cedrus_h264_run { };struct cedrus_mpeg2_run { +const struct v4l2_ctrl_mpeg2_sequence *sequence; +const struct v4l2_ctrl_mpeg2_picture *picture;const struct v4l2_ctrl_mpeg2_slice_params *slice_params;const struct v4l2_ctrl_mpeg2_quantization *quantization; };
drivers/staging/media/sunxi/cedrus/cedrus_mpeg2.c +4 -4
@@ -75,8 +75,8 @@ static void cedrus_mpeg2_irq_disable(struct cedrus_ctx *ctx)static void cedrus_mpeg2_setup (struct cedrus_ctx *ctx,struct cedrus_run *run) {const struct v4l2_ctrl_mpeg2_slice_params *slice_params; -const struct v4l2_mpeg2_sequence *seq; -const struct v4l2_mpeg2_picture *pic; +const struct v4l2_ctrl_mpeg2_sequence *seq; +const struct v4l2_ctrl_mpeg2_picture *pic;const struct v4l2_ctrl_mpeg2_quantization *quantization;dma_addr_t src_buf_addr, dst_luma_addr, dst_chroma_addr;dma_addr_t fwd_luma_addr, fwd_chroma_addr;
@@ -90,8 +90,8 @@ static void cedrus_mpeg2_setup(struct cedrus_ctx *ctx, struct cedrus_run *run)u32 reg; slice_params = run->mpeg2.slice_params; - seq = &slice_params->sequence; - pic = &slice_params->picture; + seq = run->mpeg2.sequence; + pic = run->mpeg2.picture; quantization = run->mpeg2.quantization;
include/media/mpeg2-ctrls.h +91 -19
145 lines not on this page · raw message
include/media/v4l2-ctrls.h +4 -0
@@ -43,6 +43,8 @@ struct video_device;* @p_u16: Pointer to a 16-bit unsigned value. * @p_u32: Pointer to a 32-bit unsigned value. * @p_char: Pointer to a string. +* @p_mpeg2_sequence: Pointer to a MPEG2 sequence structure. +* @p_mpeg2_picture: Pointer to a MPEG2 picture structure. * @p_mpeg2_slice_params: Pointer to a MPEG2 slice parameters structure. * @p_mpeg2_quantization: Pointer to a MPEG2 quantization data structure. * @p_fwht_params: Pointer to a FWHT stateless parameters structure.
@@ -67,6 +69,8 @@ union v4l2_ctrl_ptr {u16 *p_u16;u32 *p_u32;char *p_char; +struct v4l2_ctrl_mpeg2_sequence *p_sequence; +struct v4l2_ctrl_mpeg2_picture *p_picture;struct v4l2_ctrl_mpeg2_slice_params *p_mpeg2_slice_params;struct v4l2_ctrl_mpeg2_quantization *p_mpeg2_quantization;struct v4l2_ctrl_fwht_params *p_fwht_params;
Signature · 1 line
2.27.0