From: Maxime Ripard <maxime.ripard@bootlin.com> To: hans.verkuil@cisco.com, acourbot@chromium.org, sakari.ailus@linux.intel.com, Laurent Pinchart <laurent.pinchart@ideasonboard.com> Cc: tfiga@chromium.org, posciak@chromium.org, Paul Kocialkowski <paul.kocialkowski@bootlin.com>, Chen-Yu Tsai <wens@csie.org>, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org, nicolas.dufresne@collabora.com, jenskuske@gmail.com, linux-sunxi@googlegroups.com, Thomas Petazzoni <thomas.petazzoni@bootlin.com>, Maxime Ripard <maxime.ripard@bootlin.com> Subject: [PATCH 3/9] media: cedrus: Add a macro to check for the validity of a control Date: Wed, 13 Jun 2018 16:07:08 +0200 [thread overview] Message-ID: <20180613140714.1686-4-maxime.ripard@bootlin.com> (raw) In-Reply-To: <20180613140714.1686-1-maxime.ripard@bootlin.com> During our frame decoding setup, we need to check a number of controls to make sure that they are properly filled before trying to access them. It's not too bad with MPEG2 since there's just a single one, but with the upcoming increase of codecs, and the integration of more complex codecs, this logic will be duplicated a significant number of times. H264 for example uses 4 different controls. Add a macro that expands to the proper check in order to reduce the duplication. Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com> --- .../platform/sunxi/cedrus/sunxi_cedrus_dec.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/media/platform/sunxi/cedrus/sunxi_cedrus_dec.c b/drivers/media/platform/sunxi/cedrus/sunxi_cedrus_dec.c index 8c92af34ebeb..c19acf9626c4 100644 --- a/drivers/media/platform/sunxi/cedrus/sunxi_cedrus_dec.c +++ b/drivers/media/platform/sunxi/cedrus/sunxi_cedrus_dec.c @@ -110,15 +110,16 @@ void sunxi_cedrus_device_run(void *priv) spin_lock_irqsave(&ctx->dev->irq_lock, flags); +#define CHECK_CONTROL(ctx, ctrl) \ + if (!ctx->ctrls[(ctrl)]) { \ + v4l2_err(&(ctx)->dev->v4l2_dev, "Invalid " #ctrl " control\n"); \ + (ctx)->job_abort = 1; \ + goto unlock_complete; \ + } + switch (ctx->vpu_src_fmt->fourcc) { case V4L2_PIX_FMT_MPEG2_FRAME: - if (!ctx->ctrls[SUNXI_CEDRUS_CTRL_DEC_MPEG2_FRAME_HDR]) { - v4l2_err(&ctx->dev->v4l2_dev, - "Invalid MPEG2 frame header control\n"); - ctx->job_abort = 1; - goto unlock_complete; - } - + CHECK_CONTROL(ctx, SUNXI_CEDRUS_CTRL_DEC_MPEG2_FRAME_HDR); run.mpeg2.hdr = get_ctrl_ptr(ctx, SUNXI_CEDRUS_CTRL_DEC_MPEG2_FRAME_HDR); sunxi_cedrus_mpeg2_setup(ctx, &run); @@ -128,6 +129,7 @@ void sunxi_cedrus_device_run(void *priv) default: ctx->job_abort = 1; } +#undef CHECK_CONTROL unlock_complete: spin_unlock_irqrestore(&ctx->dev->irq_lock, flags); -- 2.17.0
WARNING: multiple messages have this Message-ID (diff)
From: maxime.ripard@bootlin.com (Maxime Ripard) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 3/9] media: cedrus: Add a macro to check for the validity of a control Date: Wed, 13 Jun 2018 16:07:08 +0200 [thread overview] Message-ID: <20180613140714.1686-4-maxime.ripard@bootlin.com> (raw) In-Reply-To: <20180613140714.1686-1-maxime.ripard@bootlin.com> During our frame decoding setup, we need to check a number of controls to make sure that they are properly filled before trying to access them. It's not too bad with MPEG2 since there's just a single one, but with the upcoming increase of codecs, and the integration of more complex codecs, this logic will be duplicated a significant number of times. H264 for example uses 4 different controls. Add a macro that expands to the proper check in order to reduce the duplication. Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com> --- .../platform/sunxi/cedrus/sunxi_cedrus_dec.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/media/platform/sunxi/cedrus/sunxi_cedrus_dec.c b/drivers/media/platform/sunxi/cedrus/sunxi_cedrus_dec.c index 8c92af34ebeb..c19acf9626c4 100644 --- a/drivers/media/platform/sunxi/cedrus/sunxi_cedrus_dec.c +++ b/drivers/media/platform/sunxi/cedrus/sunxi_cedrus_dec.c @@ -110,15 +110,16 @@ void sunxi_cedrus_device_run(void *priv) spin_lock_irqsave(&ctx->dev->irq_lock, flags); +#define CHECK_CONTROL(ctx, ctrl) \ + if (!ctx->ctrls[(ctrl)]) { \ + v4l2_err(&(ctx)->dev->v4l2_dev, "Invalid " #ctrl " control\n"); \ + (ctx)->job_abort = 1; \ + goto unlock_complete; \ + } + switch (ctx->vpu_src_fmt->fourcc) { case V4L2_PIX_FMT_MPEG2_FRAME: - if (!ctx->ctrls[SUNXI_CEDRUS_CTRL_DEC_MPEG2_FRAME_HDR]) { - v4l2_err(&ctx->dev->v4l2_dev, - "Invalid MPEG2 frame header control\n"); - ctx->job_abort = 1; - goto unlock_complete; - } - + CHECK_CONTROL(ctx, SUNXI_CEDRUS_CTRL_DEC_MPEG2_FRAME_HDR); run.mpeg2.hdr = get_ctrl_ptr(ctx, SUNXI_CEDRUS_CTRL_DEC_MPEG2_FRAME_HDR); sunxi_cedrus_mpeg2_setup(ctx, &run); @@ -128,6 +129,7 @@ void sunxi_cedrus_device_run(void *priv) default: ctx->job_abort = 1; } +#undef CHECK_CONTROL unlock_complete: spin_unlock_irqrestore(&ctx->dev->irq_lock, flags); -- 2.17.0
next prev parent reply other threads:[~2018-06-13 14:07 UTC|newest] Thread overview: 102+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-06-13 14:07 [PATCH 0/9] media: cedrus: Add H264 decoding support Maxime Ripard 2018-06-13 14:07 ` Maxime Ripard 2018-06-13 14:07 ` [PATCH 1/9] CHROMIUM: v4l: Add H264 low-level decoder API compound controls Maxime Ripard 2018-06-13 14:07 ` Maxime Ripard 2018-06-15 11:59 ` Hans Verkuil 2018-06-15 11:59 ` Hans Verkuil 2018-06-15 13:01 ` Guenter Roeck 2018-06-15 13:01 ` Guenter Roeck 2018-07-12 16:38 ` Maxime Ripard 2018-07-12 16:38 ` Maxime Ripard 2018-07-12 16:47 ` Andrew Lunn 2018-07-12 16:47 ` Andrew Lunn 2018-06-21 8:58 ` Paul Kocialkowski 2018-06-21 8:58 ` Paul Kocialkowski 2018-08-21 16:58 ` Ezequiel Garcia 2018-08-21 16:58 ` Ezequiel Garcia 2018-08-21 17:07 ` Nicolas Dufresne 2018-08-21 17:07 ` Nicolas Dufresne 2018-08-22 13:07 ` Paul Kocialkowski 2018-08-22 13:07 ` Paul Kocialkowski 2018-08-22 13:38 ` Tomasz Figa 2018-08-22 13:38 ` Tomasz Figa 2018-08-22 13:52 ` Nicolas Dufresne 2018-08-22 13:52 ` Nicolas Dufresne 2018-08-22 14:45 ` Paul Kocialkowski 2018-08-22 14:45 ` Paul Kocialkowski 2018-08-28 8:11 ` Tomasz Figa 2018-08-28 8:11 ` Tomasz Figa 2018-09-07 7:54 ` Tomasz Figa 2018-09-07 7:54 ` Tomasz Figa 2018-08-22 9:15 ` Maxime Ripard 2018-08-22 9:15 ` Maxime Ripard 2018-08-22 9:54 ` Tomasz Figa 2018-08-22 9:54 ` Tomasz Figa 2018-08-22 13:03 ` Paul Kocialkowski 2018-08-22 13:03 ` Paul Kocialkowski 2018-08-22 13:24 ` Tomasz Figa 2018-08-22 13:24 ` Tomasz Figa 2018-08-22 14:03 ` Nicolas Dufresne 2018-08-22 14:03 ` Nicolas Dufresne 2018-08-22 14:30 ` Paul Kocialkowski 2018-08-22 14:30 ` Paul Kocialkowski 2018-06-13 14:07 ` [PATCH 2/9] media: cedrus: Add wrappers around container_of for our buffers Maxime Ripard 2018-06-13 14:07 ` Maxime Ripard 2018-06-21 9:03 ` Paul Kocialkowski 2018-06-21 9:03 ` Paul Kocialkowski 2018-06-13 14:07 ` Maxime Ripard [this message] 2018-06-13 14:07 ` [PATCH 3/9] media: cedrus: Add a macro to check for the validity of a control Maxime Ripard 2018-06-21 9:13 ` Paul Kocialkowski 2018-06-21 9:13 ` Paul Kocialkowski 2018-06-13 14:07 ` [PATCH 4/9] media: cedrus: make engine type more generic Maxime Ripard 2018-06-13 14:07 ` Maxime Ripard 2018-06-21 9:33 ` Paul Kocialkowski 2018-06-21 9:33 ` Paul Kocialkowski 2018-06-13 14:07 ` [PATCH 5/9] media: cedrus: Remove MPEG1 support Maxime Ripard 2018-06-13 14:07 ` Maxime Ripard 2018-06-13 14:07 ` [PATCH 6/9] media: cedrus: Add ops structure Maxime Ripard 2018-06-13 14:07 ` Maxime Ripard 2018-06-21 9:49 ` Paul Kocialkowski 2018-06-21 9:49 ` Paul Kocialkowski 2018-06-25 13:29 ` Maxime Ripard 2018-06-25 13:29 ` Maxime Ripard 2018-06-25 13:48 ` Paul Kocialkowski 2018-06-25 13:48 ` Paul Kocialkowski 2018-06-13 14:07 ` [PATCH 7/9] media: cedrus: Move IRQ maintainance to cedrus_dec_ops Maxime Ripard 2018-06-13 14:07 ` Maxime Ripard 2018-06-21 15:35 ` Paul Kocialkowski 2018-06-21 15:35 ` Paul Kocialkowski 2018-06-25 14:18 ` Paul Kocialkowski 2018-06-25 14:18 ` Paul Kocialkowski 2018-06-25 16:15 ` Maxime Ripard 2018-06-25 16:15 ` Maxime Ripard 2018-06-25 15:38 ` Paul Kocialkowski 2018-06-25 15:38 ` Paul Kocialkowski 2018-06-25 15:49 ` Paul Kocialkowski 2018-06-25 15:49 ` Paul Kocialkowski 2018-06-25 19:01 ` Maxime Ripard 2018-06-25 19:01 ` Maxime Ripard 2018-06-27 17:58 ` Maxime Ripard 2018-06-27 17:58 ` Maxime Ripard 2018-06-13 14:07 ` [PATCH 8/9] media: cedrus: Add start and stop decoder operations Maxime Ripard 2018-06-13 14:07 ` Maxime Ripard 2018-06-21 15:38 ` Paul Kocialkowski 2018-06-21 15:38 ` Paul Kocialkowski 2018-06-25 13:32 ` Maxime Ripard 2018-06-25 13:32 ` Maxime Ripard 2018-06-25 13:42 ` Paul Kocialkowski 2018-06-25 13:42 ` Paul Kocialkowski 2018-06-13 14:07 ` [PATCH 9/9] media: cedrus: Add H264 decoding support Maxime Ripard 2018-06-13 14:07 ` Maxime Ripard 2018-07-27 13:56 ` Paul Kocialkowski 2018-07-27 13:56 ` Paul Kocialkowski 2018-07-27 14:01 ` Chen-Yu Tsai 2018-07-27 14:01 ` Chen-Yu Tsai 2018-07-27 14:03 ` Paul Kocialkowski 2018-07-27 14:03 ` Paul Kocialkowski 2018-07-30 12:54 ` Paul Kocialkowski 2018-07-30 12:54 ` Paul Kocialkowski 2018-06-14 13:00 ` [PATCH 0/9] " Tomasz Figa 2018-06-14 13:00 ` Tomasz Figa 2018-06-14 16:37 ` Maxime Ripard 2018-06-14 16:37 ` Maxime Ripard
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=20180613140714.1686-4-maxime.ripard@bootlin.com \ --to=maxime.ripard@bootlin.com \ --cc=acourbot@chromium.org \ --cc=hans.verkuil@cisco.com \ --cc=jenskuske@gmail.com \ --cc=laurent.pinchart@ideasonboard.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-media@vger.kernel.org \ --cc=linux-sunxi@googlegroups.com \ --cc=nicolas.dufresne@collabora.com \ --cc=paul.kocialkowski@bootlin.com \ --cc=posciak@chromium.org \ --cc=sakari.ailus@linux.intel.com \ --cc=tfiga@chromium.org \ --cc=thomas.petazzoni@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.