All of lore.kernel.org
 help / color / mirror / Atom feed
From: Philipp Zabel <p.zabel@pengutronix.de>
To: linux-media@vger.kernel.org
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>,
	Hans Verkuil <hverkuil@xs4all.nl>,
	kernel@pengutronix.de
Subject: [PATCH 16/28] media: coda: allow flagging last output buffer internally
Date: Tue, 18 Jun 2019 18:45:23 +0200	[thread overview]
Message-ID: <20190618164535.20162-17-p.zabel@pengutronix.de> (raw)
In-Reply-To: <20190618164535.20162-1-p.zabel@pengutronix.de>

Since V4L2_BUF_FLAG_LAST is a CAPTURE only flag, clear it from OUTPUT
buffers in QBUF and DQBUF. This allows to use the flag internally to
signal the last buffer to decode after a decoder stop command was
issued.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 drivers/media/platform/coda/coda-common.c | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/coda/coda-common.c
index ddd819ea13f2..29d050fbb899 100644
--- a/drivers/media/platform/coda/coda-common.c
+++ b/drivers/media/platform/coda/coda-common.c
@@ -879,9 +879,27 @@ static int coda_qbuf(struct file *file, void *priv,
 {
 	struct coda_ctx *ctx = fh_to_ctx(priv);
 
+	if (ctx->inst_type == CODA_INST_DECODER &&
+	    buf->type == V4L2_BUF_TYPE_VIDEO_OUTPUT)
+		buf->flags &= ~V4L2_BUF_FLAG_LAST;
+
 	return v4l2_m2m_qbuf(file, ctx->fh.m2m_ctx, buf);
 }
 
+static int coda_dqbuf(struct file *file, void *priv, struct v4l2_buffer *buf)
+{
+	struct coda_ctx *ctx = fh_to_ctx(priv);
+	int ret;
+
+	ret = v4l2_m2m_dqbuf(file, ctx->fh.m2m_ctx, buf);
+
+	if (ctx->inst_type == CODA_INST_DECODER &&
+	    buf->type == V4L2_BUF_TYPE_VIDEO_OUTPUT)
+		buf->flags &= ~V4L2_BUF_FLAG_LAST;
+
+	return ret;
+}
+
 static bool coda_buf_is_end_of_stream(struct coda_ctx *ctx,
 				      struct vb2_v4l2_buffer *buf)
 {
@@ -1295,7 +1313,7 @@ static const struct v4l2_ioctl_ops coda_ioctl_ops = {
 
 	.vidioc_qbuf		= coda_qbuf,
 	.vidioc_expbuf		= v4l2_m2m_ioctl_expbuf,
-	.vidioc_dqbuf		= v4l2_m2m_ioctl_dqbuf,
+	.vidioc_dqbuf		= coda_dqbuf,
 	.vidioc_create_bufs	= v4l2_m2m_ioctl_create_bufs,
 	.vidioc_prepare_buf	= v4l2_m2m_ioctl_prepare_buf,
 
-- 
2.20.1


  parent reply	other threads:[~2019-06-18 16:45 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-06-18 16:45 [PATCH 00/28] media: coda: fixes and improvements Philipp Zabel
2019-06-18 16:45 ` [PATCH 01/28] media: coda: implement CMD_START to restart decoding Philipp Zabel
2019-06-18 16:45 ` [PATCH 02/28] media: coda: use mem2mem try_en/decoder_cmd helpers Philipp Zabel
2019-06-18 16:45 ` [PATCH 03/28] media: coda: fix mpeg2 sequence number handling Philipp Zabel
2019-06-18 16:45 ` [PATCH 04/28] media: coda: fix last buffer handling in V4L2_ENC_CMD_STOP Philipp Zabel
2019-06-18 16:45 ` [PATCH 05/28] media: coda: add coda_wake_up_capture_queue Philipp Zabel
2019-06-18 16:45 ` [PATCH 06/28] media: coda: fix V4L2_DEC_CMD_STOP when all buffers are already consumed Philipp Zabel
2019-06-18 16:45 ` [PATCH 07/28] media: coda: split decoder sequence initialization out of start decoding Philipp Zabel
2019-06-18 16:45 ` [PATCH 08/28] media: coda: add sequence initialization work Philipp Zabel
2019-06-18 16:45 ` [PATCH 09/28] media: coda: implement decoder source change event Philipp Zabel
2019-06-18 16:45 ` [PATCH 10/28] media: coda: integrate internal frame metadata into a structure Philipp Zabel
2019-06-18 16:45 ` [PATCH 11/28] media: coda: make coda_bitstream_queue more versatile Philipp Zabel
2019-06-18 16:45 ` [PATCH 12/28] media: coda: pad first buffer with repeated MPEG headers to fix sequence init Philipp Zabel
2019-06-18 16:45 ` [PATCH 13/28] media: coda: do not enforce 512-byte initial bitstream payload on CODA960 Philipp Zabel
2019-06-18 16:45 ` [PATCH 14/28] media: coda: flush bitstream ring buffer on decoder restart Philipp Zabel
2019-06-18 16:45 ` [PATCH 15/28] media: coda: increment sequence offset for the last returned frame Philipp Zabel
2019-06-18 16:45 ` Philipp Zabel [this message]
2019-06-18 16:45 ` [PATCH 17/28] media: coda: mark the last output buffer on decoder stop command Philipp Zabel
2019-06-18 16:45 ` [PATCH 18/28] media: coda: only set the stream end flags if there are no more pending output buffers Philipp Zabel
2019-06-18 16:45 ` [PATCH 19/28] media: coda: mark the last output buffer on encoder stop command Philipp Zabel
2019-06-18 16:45 ` [PATCH 20/28] media: coda: retire coda_buf_is_end_of_stream Philipp Zabel
2019-06-18 16:45 ` [PATCH 21/28] media: coda: only wake up capture queue if no pending buffers to encode Philipp Zabel
2019-06-18 16:45 ` [PATCH 22/28] media: coda: flag the last encoded buffer Philipp Zabel
2019-06-18 16:45 ` [PATCH 23/28] media: coda: lock capture queue wakeup against encoder stop command Philipp Zabel
2019-06-18 16:45 ` [PATCH 24/28] media: coda: mark last pending buffer or last meta on decoder " Philipp Zabel
2019-06-18 16:45 ` [PATCH 25/28] media: coda: mark last returned frame Philipp Zabel
2019-06-18 16:45 ` [PATCH 26/28] media: coda: store device pointer in driver structure instead of pdev Philipp Zabel
2019-06-18 16:45 ` [PATCH 27/28] media: coda: add coda_slice_mode() function Philipp Zabel
2019-06-18 16:45 ` [PATCH 28/28] media: coda: encoder parameter change support Philipp Zabel

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=20190618164535.20162-17-p.zabel@pengutronix.de \
    --to=p.zabel@pengutronix.de \
    --cc=hverkuil@xs4all.nl \
    --cc=kernel@pengutronix.de \
    --cc=linux-media@vger.kernel.org \
    --cc=mchehab@kernel.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 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.