| Message ID | 20230101-patch-series-v2-6-2-rc1-v2-4-fa1897efac14@collabora.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v2,01/12] media: v4l2: Add NV15 pixel format | expand |
Hi Sebastian, Ezequiel and Dan have had some comments, they need addressing. If, as a result, the logic of this patch remains in place then: W dniu 12.01.2023 o 13:56, Sebastian Fricke pisze: > Ensure that both the CAPTURE and the OUTPUT queue are running (e.g. busy > -> have buffers allocated) before starting the actual streaming process. > > Signed-off-by: Sebastian Fricke <sebastian.fricke@collabora.com> > --- > drivers/staging/media/rkvdec/rkvdec.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvdec/rkvdec.c > index c849f6c20279..e0e95d06e216 100644 > --- a/drivers/staging/media/rkvdec/rkvdec.c > +++ b/drivers/staging/media/rkvdec/rkvdec.c > @@ -562,6 +562,13 @@ static int rkvdec_start_streaming(struct vb2_queue *q, unsigned int count) > if (V4L2_TYPE_IS_CAPTURE(q->type)) > return 0; > > + /* > + * Make sure that both the output and the capture queue are running > + */ > + if (rkvdec_queue_busy(ctx, V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) == 0 || > + rkvdec_queue_busy(ctx, V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) == 0) if you convert to a macro in PATCH 03/12 then the conditions can be rewritten as !rkvdec_queue_busy(.....) instead of comparing to 0. (actually, this can be done regardless, but makes more sense if the result of rkvdec_queue_busy() is boolean which it is when it becomes a macro as suggested) Then you can optionally follow De Morgan's law: if (!(rkvdec_queue_busy() && rkvdec_queue_busy())) return -EAGAIN; and you get one negation less. Regards, Andrzej > + return -EAGAIN; > + > desc = ctx->coded_fmt_desc; > if (WARN_ON(!desc)) > return -EINVAL; >
diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvdec/rkvdec.c index c849f6c20279..e0e95d06e216 100644 --- a/drivers/staging/media/rkvdec/rkvdec.c +++ b/drivers/staging/media/rkvdec/rkvdec.c @@ -562,6 +562,13 @@ static int rkvdec_start_streaming(struct vb2_queue *q, unsigned int count) if (V4L2_TYPE_IS_CAPTURE(q->type)) return 0; + /* + * Make sure that both the output and the capture queue are running + */ + if (rkvdec_queue_busy(ctx, V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) == 0 || + rkvdec_queue_busy(ctx, V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) == 0) + return -EAGAIN; + desc = ctx->coded_fmt_desc; if (WARN_ON(!desc)) return -EINVAL;
Ensure that both the CAPTURE and the OUTPUT queue are running (e.g. busy -> have buffers allocated) before starting the actual streaming process. Signed-off-by: Sebastian Fricke <sebastian.fricke@collabora.com> --- drivers/staging/media/rkvdec/rkvdec.c | 7 +++++++ 1 file changed, 7 insertions(+)