From: Dafna Hirschfeld <dafna3@gmail.com>
To: linux-media@vger.kernel.org
Cc: hverkuil@xs4all.nl, helen.koike@collabora.com,
Dafna Hirschfeld <dafna3@gmail.com>
Subject: [PATCH v3 07/18] media: vicodec: bugfix - call v4l2_m2m_buf_copy_metadata also if decoding fails
Date: Sun, 24 Feb 2019 01:02:24 -0800 [thread overview]
Message-ID: <20190224090234.19723-8-dafna3@gmail.com> (raw)
In-Reply-To: <20190224090234.19723-1-dafna3@gmail.com>
The function 'v4l2_m2m_buf_copy_metadata' should
be called even if decoding/encoding ends with
status VB2_BUF_STATE_ERROR, so that the metadata
is copied from the source buffer to the dest buffer.
Signed-off-by: Dafna Hirschfeld <dafna3@gmail.com>
---
drivers/media/platform/vicodec/vicodec-core.c | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/drivers/media/platform/vicodec/vicodec-core.c b/drivers/media/platform/vicodec/vicodec-core.c
index 778b974e9624..cd08f0cd4cf8 100644
--- a/drivers/media/platform/vicodec/vicodec-core.c
+++ b/drivers/media/platform/vicodec/vicodec-core.c
@@ -159,12 +159,10 @@ static int device_process(struct vicodec_ctx *ctx,
struct vb2_v4l2_buffer *dst_vb)
{
struct vicodec_dev *dev = ctx->dev;
- struct vicodec_q_data *q_dst;
struct v4l2_fwht_state *state = &ctx->state;
u8 *p_src, *p_dst;
int ret;
- q_dst = get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_CAPTURE);
if (ctx->is_enc)
p_src = vb2_plane_vaddr(&src_vb->vb2_buf, 0);
else
@@ -187,8 +185,10 @@ static int device_process(struct vicodec_ctx *ctx,
return comp_sz_or_errcode;
vb2_set_plane_payload(&dst_vb->vb2_buf, 0, comp_sz_or_errcode);
} else {
+ struct vicodec_q_data *q_dst;
unsigned int comp_frame_size = ntohl(ctx->state.header.size);
+ q_dst = get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_CAPTURE);
if (comp_frame_size > ctx->comp_max_size)
return -EINVAL;
state->info = q_dst->info;
@@ -197,11 +197,6 @@ static int device_process(struct vicodec_ctx *ctx,
return ret;
vb2_set_plane_payload(&dst_vb->vb2_buf, 0, q_dst->sizeimage);
}
-
- dst_vb->sequence = q_dst->sequence++;
- dst_vb->flags &= ~V4L2_BUF_FLAG_LAST;
- v4l2_m2m_buf_copy_metadata(src_vb, dst_vb, !ctx->is_enc);
-
return 0;
}
@@ -275,16 +270,22 @@ static void device_run(void *priv)
struct vicodec_ctx *ctx = priv;
struct vicodec_dev *dev = ctx->dev;
struct vb2_v4l2_buffer *src_buf, *dst_buf;
- struct vicodec_q_data *q_src;
+ struct vicodec_q_data *q_src, *q_dst;
u32 state;
src_buf = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx);
dst_buf = v4l2_m2m_dst_buf_remove(ctx->fh.m2m_ctx);
q_src = get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_OUTPUT);
+ q_dst = get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_CAPTURE);
state = VB2_BUF_STATE_DONE;
if (device_process(ctx, src_buf, dst_buf))
state = VB2_BUF_STATE_ERROR;
+ else
+ dst_buf->sequence = q_dst->sequence++;
+ dst_buf->flags &= ~V4L2_BUF_FLAG_LAST;
+ v4l2_m2m_buf_copy_metadata(src_buf, dst_buf, !ctx->is_enc);
+
ctx->last_dst_buf = dst_buf;
spin_lock(ctx->lock);
--
2.17.1
next prev parent reply other threads:[~2019-02-24 9:03 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-24 9:02 [PATCH v3 00/18] add support to stateless decoder Dafna Hirschfeld
2019-02-24 9:02 ` [PATCH v3 01/18] vb2: add requires_requests bit for stateless codecs Dafna Hirschfeld
2019-02-24 9:02 ` [PATCH v3 02/18] videodev2.h: add V4L2_BUF_CAP_REQUIRES_REQUESTS Dafna Hirschfeld
2019-02-24 9:02 ` [PATCH v3 03/18] cedrus: set requires_requests Dafna Hirschfeld
2019-02-24 9:02 ` [PATCH v3 04/18] media: vicodec: selection api should only check signal buffer types Dafna Hirschfeld
2019-02-25 9:14 ` Hans Verkuil
2019-02-24 9:02 ` [PATCH v3 05/18] media: v4l2-ctrl: v4l2_ctrl_request_setup returns with error upon failure Dafna Hirschfeld
2019-02-24 9:02 ` [PATCH v3 06/18] media: vicodec: change variable name for the return value of v4l2_fwht_encode Dafna Hirschfeld
2019-02-24 9:02 ` Dafna Hirschfeld [this message]
2019-02-24 9:02 ` [PATCH v3 08/18] media: vicodec: bugfix: free compressed_frame upon device release Dafna Hirschfeld
2019-02-24 9:02 ` [PATCH v3 09/18] media: vicodec: Move raw frame preparation code to a function Dafna Hirschfeld
2019-02-24 9:02 ` [PATCH v3 10/18] media: vicodec: add field 'buf' to fwht_raw_frame Dafna Hirschfeld
2019-02-24 9:02 ` [PATCH v3 11/18] media: vicodec: keep the ref frame according to the format in decoder Dafna Hirschfeld
2019-02-24 9:02 ` [PATCH v3 12/18] media: vicodec: Validate version dependent header values in a separate function Dafna Hirschfeld
2019-02-24 9:02 ` [PATCH v3 13/18] media: vicodec: rename v4l2_fwht_default_fmt to v4l2_fwht_find_nth_fmt Dafna Hirschfeld
2019-02-24 9:02 ` [PATCH v3 14/18] media: vicodec: add struct for encoder/decoder instance Dafna Hirschfeld
2019-02-24 9:02 ` [PATCH v3 15/18] media: vicodec: Introducing stateless fwht defs and structs Dafna Hirschfeld
2019-02-25 9:26 ` Hans Verkuil
2019-02-24 9:02 ` [PATCH v3 16/18] media: vicodec: Register another node for stateless decoder Dafna Hirschfeld
2019-02-24 9:02 ` [PATCH v3 17/18] media: vicodec: Add support " Dafna Hirschfeld
2019-02-25 9:42 ` Hans Verkuil
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=20190224090234.19723-8-dafna3@gmail.com \
--to=dafna3@gmail.com \
--cc=helen.koike@collabora.com \
--cc=hverkuil@xs4all.nl \
--cc=linux-media@vger.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox