From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3C92DC6369E for ; Wed, 2 Dec 2020 21:46:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AE8DC21D7A for ; Wed, 2 Dec 2020 21:46:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387430AbgLBVqy (ORCPT ); Wed, 2 Dec 2020 16:46:54 -0500 Received: from bhuna.collabora.co.uk ([46.235.227.227]:54964 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726646AbgLBVqy (ORCPT ); Wed, 2 Dec 2020 16:46:54 -0500 Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: ezequiel) with ESMTPSA id 34CCA1F45619 Message-ID: <8086c28c256df1af73872ffc7dc249b6bd50f9fd.camel@collabora.com> Subject: Re: [PATCH v3 3/3] media: uapi: mpeg2: Split sequence and picture parameters From: Ezequiel Garcia To: Hans Verkuil , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Cc: kernel@collabora.com, Jonas Karlman , Nicolas Dufresne , Philipp Zabel , Maxime Ripard , Paul Kocialkowski , Jernej Skrabec Date: Wed, 02 Dec 2020 18:46:00 -0300 In-Reply-To: References: <20201130185259.111817-1-ezequiel@collabora.com> <20201130185259.111817-4-ezequiel@collabora.com> Organization: Collabora Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.36.3-1 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 2020-12-02 at 16:11 +0100, Hans Verkuil wrote: > Hi Ezequiel, > > Some small comments: > > On 30/11/2020 19:52, Ezequiel Garcia wrote: > > 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 split > > 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 > > Tested-by: Jonas Karlman > > --- > > .../media/v4l/ext-ctrls-codec.rst | 47 ++++++-- > > .../media/v4l/pixfmt-compressed.rst | 5 +- > > drivers/media/v4l2-core/v4l2-ctrls.c | 57 +++++++-- > > 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, 224 insertions(+), 61 deletions(-) > > > > diff --git a/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst b/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst > > index 9a804f3037d8..a789866ebda4 100644 > > --- a/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst > > +++ b/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst > > @@ -1526,14 +1526,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 > > @@ -1551,14 +1543,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 > > @@ -1580,6 +1586,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 `. > > @@ -1600,13 +1609,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 > > @@ -1627,6 +1647,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 `. > > diff --git a/Documentation/userspace-api/media/v4l/pixfmt-compressed.rst b/Documentation/userspace-api/media/v4l/pixfmt-compressed.rst > > index b8899262d8de..0c22f3f99ce4 100644 > > --- a/Documentation/userspace-api/media/v4l/pixfmt-compressed.rst > > +++ b/Documentation/userspace-api/media/v4l/pixfmt-compressed.rst > > @@ -108,8 +108,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 `. > > Exactly one output and one capture buffer must be provided for use with > > diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c > > index dd8f3bb4fbb9..a43baa9367ab 100644 > > --- a/drivers/media/v4l2-core/v4l2-ctrls.c > > +++ b/drivers/media/v4l2-core/v4l2-ctrls.c > > @@ -941,6 +941,8 @@ const char *v4l2_ctrl_get_name(u32 id) > > case V4L2_CID_MPEG_VIDEO_MV_V_SEARCH_RANGE: return "Vertical MV Search Range"; > > case V4L2_CID_MPEG_VIDEO_REPEAT_SEQ_HEADER: return "Repeat Sequence Header"; > > case V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME: return "Force Key Frame"; > > + case V4L2_CID_MPEG_VIDEO_MPEG2_SEQUENCE: return "MPEG-2 Sequence Header"; > > + case V4L2_CID_MPEG_VIDEO_MPEG2_PICTURE: return "MPEG-2 Picture Header"; > > case V4L2_CID_MPEG_VIDEO_MPEG2_SLICE_PARAMS: return "MPEG-2 Slice Parameters"; > > case V4L2_CID_MPEG_VIDEO_MPEG2_QUANTIZATION: return "MPEG-2 Quantization Matrices"; > > case V4L2_CID_MPEG_VIDEO_FWHT_PARAMS: return "FWHT Stateless Parameters"; > > @@ -1427,6 +1429,12 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type, > > case V4L2_CID_RDS_TX_ALT_FREQS: > > *type = V4L2_CTRL_TYPE_U32; > > break; > > + case V4L2_CID_MPEG_VIDEO_MPEG2_SEQUENCE: > > + *type = V4L2_CTRL_TYPE_MPEG2_SEQUENCE; > > + break; > > + case V4L2_CID_MPEG_VIDEO_MPEG2_PICTURE: > > + *type = V4L2_CTRL_TYPE_MPEG2_PICTURE; > > + break; > > case V4L2_CID_MPEG_VIDEO_MPEG2_SLICE_PARAMS: > > *type = V4L2_CTRL_TYPE_MPEG2_SLICE_PARAMS; > > break; > > @@ -1625,7 +1633,8 @@ static bool std_equal(const struct v4l2_ctrl *ctrl, u32 idx, > > static void std_init_compound(const struct v4l2_ctrl *ctrl, u32 idx, > > union v4l2_ctrl_ptr ptr) > > { > > - struct v4l2_ctrl_mpeg2_slice_params *p_mpeg2_slice_params; > > + struct v4l2_ctrl_mpeg2_sequence *p_mpeg2_sequence; > > + struct v4l2_ctrl_mpeg2_picture *p_mpeg2_picture; > > struct v4l2_ctrl_vp8_frame_header *p_vp8_frame_header; > > void *p = ptr.p + idx * ctrl->elem_size; > > > > @@ -1640,13 +1649,18 @@ static void std_init_compound(const struct v4l2_ctrl *ctrl, u32 idx, > > * v4l2_ctrl_type enum. > > */ > > switch ((u32)ctrl->type) { > > - case V4L2_CTRL_TYPE_MPEG2_SLICE_PARAMS: > > - p_mpeg2_slice_params = p; > > + case V4L2_CTRL_TYPE_MPEG2_SEQUENCE: > > + p_mpeg2_sequence = p; > > + > > /* 4:2:0 */ > > - p_mpeg2_slice_params->sequence.chroma_format = 1; > > + p_mpeg2_sequence->chroma_format = 1; > > + break; > > + case V4L2_CTRL_TYPE_MPEG2_PICTURE: > > + p_mpeg2_picture = p; > > + > > /* interlaced top field */ > > - p_mpeg2_slice_params->picture.picture_structure = 1; > > - p_mpeg2_slice_params->picture.picture_coding_type = > > + p_mpeg2_picture->picture_structure = 1; > > + p_mpeg2_picture->picture_coding_type = > > V4L2_MPEG2_PIC_CODING_TYPE_I; > > break; > > case V4L2_CTRL_TYPE_VP8_FRAME_HEADER: > > You should also add the MPEG2 types to std_log(). None of them are logged > there. > I was reserving that stuff for the destaging effort. Perhaps we are comfortable with destaging on the next iteration? > > @@ -1796,6 +1810,8 @@ static void std_log(const struct v4l2_ctrl *ctrl) > > static int std_validate_compound(const struct v4l2_ctrl *ctrl, u32 idx, > > union v4l2_ctrl_ptr ptr) > > { > > + struct v4l2_ctrl_mpeg2_sequence *p_mpeg2_sequence; > > + struct v4l2_ctrl_mpeg2_picture *p_mpeg2_picture; > > struct v4l2_ctrl_mpeg2_slice_params *p_mpeg2_slice_params; > > struct v4l2_ctrl_vp8_frame_header *p_vp8_frame_header; > > struct v4l2_ctrl_h264_sps *p_h264_sps; > > @@ -1811,10 +1827,10 @@ static int std_validate_compound(const struct v4l2_ctrl *ctrl, u32 idx, > > unsigned int i; > > > > switch ((u32)ctrl->type) { > > - case V4L2_CTRL_TYPE_MPEG2_SLICE_PARAMS: > > - p_mpeg2_slice_params = p; > > + case V4L2_CTRL_TYPE_MPEG2_SEQUENCE: > > + p_mpeg2_sequence = p; > > > > - switch (p_mpeg2_slice_params->sequence.chroma_format) { > > + switch (p_mpeg2_sequence->chroma_format) { > > case 1: /* 4:2:0 */ > > case 2: /* 4:2:2 */ > > case 3: /* 4:4:4 */ > > @@ -1822,8 +1838,13 @@ static int std_validate_compound(const struct v4l2_ctrl *ctrl, u32 idx, > > default: > > return -EINVAL; > > } > > + zero_reserved(*p_mpeg2_sequence); > > + break; > > + > > + case V4L2_CTRL_TYPE_MPEG2_PICTURE: > > + p_mpeg2_picture = p; > > > > - switch (p_mpeg2_slice_params->picture.intra_dc_precision) { > > + switch (p_mpeg2_picture->intra_dc_precision) { > > case 0: /* 8 bits */ > > case 1: /* 9 bits */ > > case 2: /* 10 bits */ > > @@ -1833,7 +1854,7 @@ static int std_validate_compound(const struct v4l2_ctrl *ctrl, u32 idx, > > return -EINVAL; > > } > > > > - switch (p_mpeg2_slice_params->picture.picture_structure) { > > + switch (p_mpeg2_picture->picture_structure) { > > case V4L2_MPEG2_PIC_TOP_FIELD: > > case V4L2_MPEG2_PIC_BOTTOM_FIELD: > > case V4L2_MPEG2_PIC_FRAME: > > @@ -1842,7 +1863,7 @@ static int std_validate_compound(const struct v4l2_ctrl *ctrl, u32 idx, > > return -EINVAL; > > } > > > > - switch (p_mpeg2_slice_params->picture.picture_coding_type) { > > + switch (p_mpeg2_picture->picture_coding_type) { > > case V4L2_MPEG2_PIC_CODING_TYPE_I: > > case V4L2_MPEG2_PIC_CODING_TYPE_P: > > case V4L2_MPEG2_PIC_CODING_TYPE_B: > > @@ -1850,7 +1871,13 @@ static int std_validate_compound(const struct v4l2_ctrl *ctrl, u32 idx, > > default: > > return -EINVAL; > > } > > + zero_reserved(*p_mpeg2_picture); > > + break; > > > > + case V4L2_CTRL_TYPE_MPEG2_SLICE_PARAMS: > > + p_mpeg2_slice_params = p; > > + > > + zero_reserved(*p_mpeg2_slice_params); > > break; > > > > case V4L2_CTRL_TYPE_MPEG2_QUANTIZATION: > > @@ -2749,6 +2776,12 @@ static struct v4l2_ctrl *v4l2_ctrl_new(struct v4l2_ctrl_handler *hdl, > > case V4L2_CTRL_TYPE_U32: > > elem_size = sizeof(u32); > > break; > > + case V4L2_CTRL_TYPE_MPEG2_SEQUENCE: > > + elem_size = sizeof(struct v4l2_ctrl_mpeg2_sequence); > > + break; > > + case V4L2_CTRL_TYPE_MPEG2_PICTURE: > > + elem_size = sizeof(struct v4l2_ctrl_mpeg2_picture); > > + break; > > case V4L2_CTRL_TYPE_MPEG2_SLICE_PARAMS: > > elem_size = sizeof(struct v4l2_ctrl_mpeg2_slice_params); > > break; > > diff --git a/drivers/staging/media/hantro/hantro_drv.c b/drivers/staging/media/hantro/hantro_drv.c > > index e5f200e64993..e589eccd5644 100644 > > --- a/drivers/staging/media/hantro/hantro_drv.c > > +++ b/drivers/staging/media/hantro/hantro_drv.c > > @@ -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 = { > > diff --git a/drivers/staging/media/hantro/hantro_g1_mpeg2_dec.c b/drivers/staging/media/hantro/hantro_g1_mpeg2_dec.c > > index b6086474d31f..1a6ca49441f4 100644 > > --- a/drivers/staging/media/hantro/hantro_g1_mpeg2_dec.c > > +++ b/drivers/staging/media/hantro/hantro_g1_mpeg2_dec.c > > @@ -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) | > > diff --git a/drivers/staging/media/hantro/rk3399_vpu_hw_mpeg2_dec.c b/drivers/staging/media/hantro/rk3399_vpu_hw_mpeg2_dec.c > > index 28eb77b0569b..45ab5ca32221 100644 > > --- a/drivers/staging/media/hantro/rk3399_vpu_hw_mpeg2_dec.c > > +++ b/drivers/staging/media/hantro/rk3399_vpu_hw_mpeg2_dec.c > > @@ -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) | > > diff --git a/drivers/staging/media/sunxi/cedrus/cedrus.c b/drivers/staging/media/sunxi/cedrus/cedrus.c > > index 4e91c372d585..3f9fab6ddbaa 100644 > > --- a/drivers/staging/media/sunxi/cedrus/cedrus.c > > +++ b/drivers/staging/media/sunxi/cedrus/cedrus.c > > @@ -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, > > diff --git a/drivers/staging/media/sunxi/cedrus/cedrus.h b/drivers/staging/media/sunxi/cedrus/cedrus.h > > index fece505272b4..c286b7312386 100644 > > --- a/drivers/staging/media/sunxi/cedrus/cedrus.h > > +++ b/drivers/staging/media/sunxi/cedrus/cedrus.h > > @@ -68,6 +68,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; > > }; > > diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_mpeg2.c b/drivers/staging/media/sunxi/cedrus/cedrus_mpeg2.c > > index 6a99893cdc77..ea52778b36f9 100644 > > --- a/drivers/staging/media/sunxi/cedrus/cedrus_mpeg2.c > > +++ b/drivers/staging/media/sunxi/cedrus/cedrus_mpeg2.c > > @@ -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; > > > > diff --git a/include/media/mpeg2-ctrls.h b/include/media/mpeg2-ctrls.h > > index 038206c7e6f5..edcbf67668ac 100644 > > --- a/include/media/mpeg2-ctrls.h > > +++ b/include/media/mpeg2-ctrls.h > > @@ -12,24 +12,46 @@ > > #define _MPEG2_CTRLS_H_ > > > > #define V4L2_CID_MPEG_VIDEO_MPEG2_SLICE_PARAMS (V4L2_CID_CODEC_BASE+250) > > -#define V4L2_CID_MPEG_VIDEO_MPEG2_QUANTIZATION (V4L2_CID_CODEC_BASE+251) > > +#define V4L2_CID_MPEG_VIDEO_MPEG2_SEQUENCE (V4L2_CID_CODEC_BASE+251) > > +#define V4L2_CID_MPEG_VIDEO_MPEG2_PICTURE (V4L2_CID_CODEC_BASE+252) > > +#define V4L2_CID_MPEG_VIDEO_MPEG2_QUANTIZATION (V4L2_CID_CODEC_BASE+253) > > > > /* enum v4l2_ctrl_type type values */ > > -#define V4L2_CTRL_TYPE_MPEG2_SLICE_PARAMS 0x0103 > > -#define V4L2_CTRL_TYPE_MPEG2_QUANTIZATION 0x0104 > > +#define V4L2_CTRL_TYPE_MPEG2_SLICE_PARAMS 0x0130 > > +#define V4L2_CTRL_TYPE_MPEG2_SEQUENCE 0x0131 > > +#define V4L2_CTRL_TYPE_MPEG2_PICTURE 0x0132 > > +#define V4L2_CTRL_TYPE_MPEG2_QUANTIZATION 0x0133 > > > > #define V4L2_MPEG2_SEQ_FLAG_PROGRESSIVE 0x0001 > > > > -struct v4l2_mpeg2_sequence { > > - /* ISO/IEC 13818-2, ITU-T Rec. H.262: Sequence header */ > > +/** > > + * struct v4l2_ctrl_mpeg2_sequence - MPEG-2 sequence header > > + * > > + * All the members on this structure match the sequence header and sequence > > + * extension syntaxes as specified by the MPEG-2 specification. > > + * > > + * Fields horizontal_size, vertical_size and vbv_buffer_size are a > > + * combination of respective _value and extension syntax elements, > > Is that a stray '_' or is it really '_value'? Just double-checking :-) > Probably it's a typo. BTW, I wonder if that sentence is clear enough. What I wanted to clarify is that this horizontal_size field is a combination of syntax elements horizontal_size_value and horizontal_size_extension syntax elements. (and same for vertical_size) > > + * as described in section 6.3.3 "Sequence header". > > + * > > + * @horizontal_size: combination of elements horizontal_size_value and > > + * horizontal_size_extension. > > + * @vertical_size: combination of elements vertical_size_value and > > + * vertical_size_extension. > > + * @vbv_buffer_size: combination of elements vbv_buffer_size_value and > > + * vbv_buffer_size_extension. > > + * @profile_and_level_indication: see MPEG-2 specification. > > + * @chroma_format: see MPEG-2 specification. > > + * @reserved: padding field. Should be zeroed by applications. > > + * @flags: see V4L2_MPEG2_SEQ_FLAG_{}. > > + */ > > +struct v4l2_ctrl_mpeg2_sequence { > > __u16 horizontal_size; > > __u16 vertical_size; > > __u32 vbv_buffer_size; > > - > > - /* ISO/IEC 13818-2, ITU-T Rec. H.262: Sequence extension */ > > __u16 profile_and_level_indication; > > __u8 chroma_format; > > - > > + __u8 reserved; > > __u32 flags; > > }; > > > > @@ -55,30 +77,80 @@ struct v4l2_mpeg2_sequence { > > #define V4L2_MPEG2_PIC_FLAG_LOAD_CHROMA_INTRA 0x0400 > > #define V4L2_MPEG2_PIC_FLAG_LOAD_CHROMA_NON_INTRA 0x0800 > > > > -struct v4l2_mpeg2_picture { > > - /* ISO/IEC 13818-2, ITU-T Rec. H.262: Picture header */ > > +/** > > + * struct v4l2_ctrl_mpeg2_picture - MPEG-2 picture header > > + * > > + * All the members on this structure match the picture header and picture > > + * coding extension syntaxes as specified by the MPEG-2 specification. > > + * > > + * In particular, the set of quantization load flags V4L2_MPEG2_PIC_FLAG_LOAD_{} > > + * are specified here in order to allow applications to pass non-default > > + * quantization matrices. In this case, applications are expected to use > > + * V4L2_CTRL_TYPE_MPEG2_QUANTIZATION to pass the values of non-default > > + * matrices. > > + * > > + * @picture_coding_type: see MPEG-2 specification. > > + * @f_code[2][2]: see MPEG-2 specification. > > + * @intra_dc_precision: see MPEG-2 specification. > > + * @picture_structure: see V4L2_MPEG2_PIC_{}_FIELD. > > + * @reserved: padding field. Should be zeroed by applications. > > + * @flags: see V4L2_MPEG2_PIC_FLAG_{}. > > + */ > > +struct v4l2_ctrl_mpeg2_picture { > > __u8 picture_coding_type; > > - > > - /* ISO/IEC 13818-2, ITU-T Rec. H.262: Picture coding extension */ > > __u8 f_code[2][2]; > > __u8 intra_dc_precision; > > __u8 picture_structure; > > - > > + __u8 reserved; > > __u32 flags; > > }; > > > > +/** > > + * struct v4l2_ctrl_mpeg2_slice_params - MPEG-2 slice header > > + * > > + * @backward_ref_ts: timestamp of the V4L2 capture buffer to use as > > + * reference for backward prediction. > > + * @forward_ref_ts: timestamp of the V4L2 capture buffer to use as > > + * reference for forward prediction. These timestamp refers to the > > + * timestamp field in struct v4l2_buffer. Use v4l2_timeval_to_ns() > > + * to convert the struct timeval to a __u64. > > + * @quantiser_scale_code: quantiser scale integer matching an > > + * homonymous syntax element. > > + * @reserved: padding field. Should be zeroed by applications. > > + */ > > struct v4l2_ctrl_mpeg2_slice_params { > > __u64 backward_ref_ts; > > __u64 forward_ref_ts; > > - > > - struct v4l2_mpeg2_sequence sequence; > > - struct v4l2_mpeg2_picture picture; > > - > > - /* ISO/IEC 13818-2, ITU-T Rec. H.262: Slice */ > > __u32 quantiser_scale_code; > > + __u32 reserved; > > }; > > > > -/* ISO/IEC 13818-2, ITU-T Rec. H.262: Quant matrix extension */ > > +/** > > + * struct v4l2_ctrl_mpeg2_quantization - MPEG-2 quantization > > + * > > + * Quantization matrices as specified by section 6.3.7 > > + * "Quant matrix extension". > > + * > > + * Applications are expected to set the quantization matrices load > > + * flags V4L2_MPEG2_PIC_FLAG_LOAD_{} in struct v4l2_ctrl_mpeg2_picture > > + * to tell the kernel that a non-default matrix shall be used > > + * to decode the picture. > > + * > > + * @intra_quantiser_matrix: The quantization matrix coefficients > > + * for intra-coded frames, in zigzag scanning order. It is relevant > > + * for both luma and chroma components, although it can be superseded > > + * by the chroma-specific matrix for non-4:2:0 YUV formats. > > + * @non_intra_quantiser_matrix: The quantization matrix coefficients > > + * for non-intra-coded frames, in zigzag scanning order. It is relevant > > + * for both luma and chroma components, although it can be superseded > > + * by the chroma-specific matrix for non-4:2:0 YUV formats. > > + * @chroma_intra_quantiser_matrix: The quantization matrix coefficients > > + * for the chominance component of intra-coded frames, in zigzag scanning > > + * order. Only relevant for 4:2:2 and 4:4:4 YUV formats. > > + * @chroma_non_intra_quantiser_matrix: The quantization matrix coefficients > > + * for the chrominance component of non-intra-coded frames, in zigzag scanning > > + * order. Only relevant for 4:2:2 and 4:4:4 YUV formats. > > + */ > > struct v4l2_ctrl_mpeg2_quantization { > > __u8 intra_quantiser_matrix[64]; > > __u8 non_intra_quantiser_matrix[64]; > > diff --git a/include/media/v4l2-ctrls.h b/include/media/v4l2-ctrls.h > > index d25b38f78229..86f6c3ef7104 100644 > > --- a/include/media/v4l2-ctrls.h > > +++ b/include/media/v4l2-ctrls.h > > @@ -42,6 +42,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. > > @@ -66,6 +68,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; > > Should start with p_mpeg2_ for both pointers. > Oh, Jonas already pointed this out, it's an overlook. Thanks, Ezequiel > > 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; > > > > Regards, > > Hans