From: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
To: Ezequiel Garcia <ezequiel@collabora.com>
Cc: linux-media@vger.kernel.org, kernel@collabora.com,
Nicolas Dufresne <nicolas.dufresne@collabora.com>,
Tomasz Figa <tfiga@chromium.org>,
linux-rockchip@lists.infradead.org,
Heiko Stuebner <heiko@sntech.de>, Jonas Karlman <jonas@kwiboo.se>,
Philipp Zabel <p.zabel@pengutronix.de>,
Boris Brezillon <boris.brezillon@collabora.com>,
Alexandre Courbot <acourbot@chromium.org>,
fbuergisser@chromium.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v7 06/11] media: cedrus: Cleanup control initialization
Date: Mon, 19 Aug 2019 14:31:31 +0200 [thread overview]
Message-ID: <20190819123131.GA32182@aptenodytes> (raw)
In-Reply-To: <20190816160132.7352-7-ezequiel@collabora.com>
[-- Attachment #1: Type: text/plain, Size: 4443 bytes --]
Hi,
On Fri 16 Aug 19, 13:01, Ezequiel Garcia wrote:
> In order to introduce other controls, the control initialization
> needs to support an initial struct v4l2_ctrl_control.
>
> While here, let's cleanup the control initialization,
> removing unneeded fields.
Thanks for the change!
Acked-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
Cheers,
Paul
> Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
> ---
> Changes in v7:
> * None.
> Changes in v6:
> * None.
> Changes in v5:
> * None.
> Changes in v4:
> * New patch.
> ---
> drivers/staging/media/sunxi/cedrus/cedrus.c | 45 +++++++++++----------
> drivers/staging/media/sunxi/cedrus/cedrus.h | 3 +-
> 2 files changed, 25 insertions(+), 23 deletions(-)
>
> diff --git a/drivers/staging/media/sunxi/cedrus/cedrus.c b/drivers/staging/media/sunxi/cedrus/cedrus.c
> index 370937edfc14..7bdc413bf727 100644
> --- a/drivers/staging/media/sunxi/cedrus/cedrus.c
> +++ b/drivers/staging/media/sunxi/cedrus/cedrus.c
> @@ -29,44 +29,51 @@
>
> static const struct cedrus_control cedrus_controls[] = {
> {
> - .id = V4L2_CID_MPEG_VIDEO_MPEG2_SLICE_PARAMS,
> - .elem_size = sizeof(struct v4l2_ctrl_mpeg2_slice_params),
> + .cfg = {
> + .id = V4L2_CID_MPEG_VIDEO_MPEG2_SLICE_PARAMS,
> + },
> .codec = CEDRUS_CODEC_MPEG2,
> .required = true,
> },
> {
> - .id = V4L2_CID_MPEG_VIDEO_MPEG2_QUANTIZATION,
> - .elem_size = sizeof(struct v4l2_ctrl_mpeg2_quantization),
> + .cfg = {
> + .id = V4L2_CID_MPEG_VIDEO_MPEG2_QUANTIZATION,
> + },
> .codec = CEDRUS_CODEC_MPEG2,
> .required = false,
> },
> {
> - .id = V4L2_CID_MPEG_VIDEO_H264_DECODE_PARAMS,
> - .elem_size = sizeof(struct v4l2_ctrl_h264_decode_params),
> + .cfg = {
> + .id = V4L2_CID_MPEG_VIDEO_H264_DECODE_PARAMS,
> + },
> .codec = CEDRUS_CODEC_H264,
> .required = true,
> },
> {
> - .id = V4L2_CID_MPEG_VIDEO_H264_SLICE_PARAMS,
> - .elem_size = sizeof(struct v4l2_ctrl_h264_slice_params),
> + .cfg = {
> + .id = V4L2_CID_MPEG_VIDEO_H264_SLICE_PARAMS,
> + },
> .codec = CEDRUS_CODEC_H264,
> .required = true,
> },
> {
> - .id = V4L2_CID_MPEG_VIDEO_H264_SPS,
> - .elem_size = sizeof(struct v4l2_ctrl_h264_sps),
> + .cfg = {
> + .id = V4L2_CID_MPEG_VIDEO_H264_SPS,
> + },
> .codec = CEDRUS_CODEC_H264,
> .required = true,
> },
> {
> - .id = V4L2_CID_MPEG_VIDEO_H264_PPS,
> - .elem_size = sizeof(struct v4l2_ctrl_h264_pps),
> + .cfg = {
> + .id = V4L2_CID_MPEG_VIDEO_H264_PPS,
> + },
> .codec = CEDRUS_CODEC_H264,
> .required = true,
> },
> {
> - .id = V4L2_CID_MPEG_VIDEO_H264_SCALING_MATRIX,
> - .elem_size = sizeof(struct v4l2_ctrl_h264_scaling_matrix),
> + .cfg = {
> + .id = V4L2_CID_MPEG_VIDEO_H264_SCALING_MATRIX,
> + },
> .codec = CEDRUS_CODEC_H264,
> .required = true,
> },
> @@ -106,12 +113,8 @@ static int cedrus_init_ctrls(struct cedrus_dev *dev, struct cedrus_ctx *ctx)
> return -ENOMEM;
>
> for (i = 0; i < CEDRUS_CONTROLS_COUNT; i++) {
> - struct v4l2_ctrl_config cfg = {};
> -
> - cfg.elem_size = cedrus_controls[i].elem_size;
> - cfg.id = cedrus_controls[i].id;
> -
> - ctrl = v4l2_ctrl_new_custom(hdl, &cfg, NULL);
> + ctrl = v4l2_ctrl_new_custom(hdl, &cedrus_controls[i].cfg,
> + NULL);
> if (hdl->error) {
> v4l2_err(&dev->v4l2_dev,
> "Failed to create new custom control\n");
> @@ -178,7 +181,7 @@ static int cedrus_request_validate(struct media_request *req)
> continue;
>
> ctrl_test = v4l2_ctrl_request_hdl_ctrl_find(hdl,
> - cedrus_controls[i].id);
> + cedrus_controls[i].cfg.id);
> if (!ctrl_test) {
> v4l2_info(&ctx->dev->v4l2_dev,
> "Missing required codec control\n");
> diff --git a/drivers/staging/media/sunxi/cedrus/cedrus.h b/drivers/staging/media/sunxi/cedrus/cedrus.h
> index d8e6777e5e27..2f017a651848 100644
> --- a/drivers/staging/media/sunxi/cedrus/cedrus.h
> +++ b/drivers/staging/media/sunxi/cedrus/cedrus.h
> @@ -49,8 +49,7 @@ enum cedrus_h264_pic_type {
> };
>
> struct cedrus_control {
> - u32 id;
> - u32 elem_size;
> + struct v4l2_ctrl_config cfg;
> enum cedrus_codec codec;
> unsigned char required:1;
> };
> --
> 2.22.0
>
--
Paul Kocialkowski, Bootlin
Embedded Linux and kernel engineering
https://bootlin.com
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2019-08-19 12:31 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-16 16:01 [PATCH v7 00/11] media: hantro: Add support for H264 decoding Ezequiel Garcia
2019-08-16 16:01 ` [PATCH v7 01/11] lib/sort.c: implement sort() variant taking context argument Ezequiel Garcia
2019-08-16 16:01 ` [PATCH v7 02/11] media: uapi: h264: Rename pixel format Ezequiel Garcia
2019-08-19 12:41 ` Paul Kocialkowski
2019-08-19 14:38 ` Ezequiel Garcia
2019-08-19 15:53 ` Hans Verkuil
2019-08-22 11:54 ` Paul Kocialkowski
2019-08-22 13:47 ` Hans Verkuil
2019-08-22 14:38 ` Ezequiel Garcia
2019-08-22 14:42 ` Paul Kocialkowski
2019-08-16 16:01 ` [PATCH v7 03/11] media: uapi: h264: Add the concept of decoding mode Ezequiel Garcia
2019-08-16 16:01 ` [PATCH v7 04/11] media: uapi: h264: Add the concept of start code Ezequiel Garcia
2019-08-19 12:14 ` Paul Kocialkowski
2020-02-09 20:08 ` Nicolas Dufresne
2019-08-16 16:01 ` [PATCH v7 05/11] media: uapi: h264: Get rid of the p0/b0/b1 ref-lists Ezequiel Garcia
2019-08-16 16:01 ` [PATCH v7 06/11] media: cedrus: Cleanup control initialization Ezequiel Garcia
2019-08-19 12:31 ` Paul Kocialkowski [this message]
2019-08-16 16:01 ` [PATCH v7 07/11] media: cedrus: Specify H264 startcode and decoding mode Ezequiel Garcia
2019-08-22 12:31 ` Paul Kocialkowski
2019-08-16 16:01 ` [PATCH v7 08/11] media: hantro: Move copy_metadata() before doing a decode operation Ezequiel Garcia
2019-08-16 16:01 ` [PATCH v7 09/11] media: hantro: Add core bits to support H264 decoding Ezequiel Garcia
2019-08-16 16:01 ` [PATCH v7 10/11] media: hantro: Add support for H264 decoding on G1 Ezequiel Garcia
2019-08-16 16:01 ` [PATCH v7 11/11] media: hantro: Enable H264 decoding on rk3288 Ezequiel Garcia
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=20190819123131.GA32182@aptenodytes \
--to=paul.kocialkowski@bootlin.com \
--cc=acourbot@chromium.org \
--cc=boris.brezillon@collabora.com \
--cc=ezequiel@collabora.com \
--cc=fbuergisser@chromium.org \
--cc=heiko@sntech.de \
--cc=jonas@kwiboo.se \
--cc=kernel@collabora.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=nicolas.dufresne@collabora.com \
--cc=p.zabel@pengutronix.de \
--cc=tfiga@chromium.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).