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 v5 07/21] media: vicodec: change variable name for the return value of v4l2_fwht_encode
Date: Tue, 26 Feb 2019 09:05:00 -0800 [thread overview]
Message-ID: <20190226170514.86127-8-dafna3@gmail.com> (raw)
In-Reply-To: <20190226170514.86127-1-dafna3@gmail.com>
v4l2_fwht_encode returns either an error code on
failure or the size of the compressed frame on
success. So change the var assigned to it from
'ret' to 'comp_sz_or_errcode' to clarify that.
Signed-off-by: Dafna Hirschfeld <dafna3@gmail.com>
---
drivers/media/platform/vicodec/vicodec-core.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/media/platform/vicodec/vicodec-core.c b/drivers/media/platform/vicodec/vicodec-core.c
index 0909f86547f1..eec31b144d56 100644
--- a/drivers/media/platform/vicodec/vicodec-core.c
+++ b/drivers/media/platform/vicodec/vicodec-core.c
@@ -178,13 +178,14 @@ static int device_process(struct vicodec_ctx *ctx,
if (ctx->is_enc) {
struct vicodec_q_data *q_src;
+ int comp_sz_or_errcode;
q_src = get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_OUTPUT);
state->info = q_src->info;
- ret = v4l2_fwht_encode(state, p_src, p_dst);
- if (ret < 0)
- return ret;
- vb2_set_plane_payload(&dst_vb->vb2_buf, 0, ret);
+ comp_sz_or_errcode = v4l2_fwht_encode(state, p_src, p_dst);
+ if (comp_sz_or_errcode < 0)
+ return comp_sz_or_errcode;
+ vb2_set_plane_payload(&dst_vb->vb2_buf, 0, comp_sz_or_errcode);
} else {
unsigned int comp_frame_size = ntohl(ctx->state.header.size);
--
2.17.1
next prev parent reply other threads:[~2019-02-26 17:05 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-26 17:04 [PATCH v5 00/21] add support to stateless decoder Dafna Hirschfeld
2019-02-26 17:04 ` [PATCH v5 01/21] vb2: add requires_requests bit for stateless codecs Dafna Hirschfeld
2019-02-26 17:04 ` [PATCH v5 02/21] videodev2.h: add V4L2_BUF_CAP_REQUIRES_REQUESTS Dafna Hirschfeld
2019-02-26 17:04 ` [PATCH v5 03/21] cedrus: set requires_requests Dafna Hirschfeld
2019-02-26 17:04 ` [PATCH v5 04/21] media: vicodec: selection api should only check single buffer types Dafna Hirschfeld
2019-02-26 17:04 ` [PATCH v5 05/21] media: vicodec: upon release, call m2m release before freeing ctrl handler Dafna Hirschfeld
2019-02-26 17:04 ` [PATCH v5 06/21] media: v4l2-ctrl: v4l2_ctrl_request_setup returns with error upon failure Dafna Hirschfeld
2019-02-26 17:05 ` Dafna Hirschfeld [this message]
2019-02-26 17:05 ` [PATCH v5 08/21] media: vicodec: bugfix - call v4l2_m2m_buf_copy_metadata also if decoding fails Dafna Hirschfeld
2019-02-26 17:05 ` [PATCH v5 09/21] media: vicodec: bugfix: free compressed_frame upon device release Dafna Hirschfeld
2019-02-26 17:05 ` [PATCH v5 10/21] media: vicodec: Move raw frame preparation code to a function Dafna Hirschfeld
2019-02-26 17:05 ` [PATCH v5 11/21] media: vicodec: add field 'buf' to fwht_raw_frame Dafna Hirschfeld
2019-02-26 17:05 ` [PATCH v5 12/21] media: vicodec: keep the ref frame according to the format in decoder Dafna Hirschfeld
2019-02-26 17:05 ` [PATCH v5 13/21] media: vicodec: Validate version dependent header values in a separate function Dafna Hirschfeld
2019-02-26 17:05 ` [PATCH v5 14/21] media: vicodec: rename v4l2_fwht_default_fmt to v4l2_fwht_find_nth_fmt Dafna Hirschfeld
2019-02-26 17:05 ` [PATCH v5 15/21] media: vicodec: add struct for encoder/decoder instance Dafna Hirschfeld
2019-02-26 17:05 ` [PATCH v5 16/21] media: vicodec: add documentation to V4L2_CID_FWHT_I/P_FRAME_QP Dafna Hirschfeld
2019-02-26 17:05 ` [PATCH v5 17/21] media: vicodec: add documentation to V4L2_CID_MPEG_VIDEO_FWHT_PARAMS Dafna Hirschfeld
2019-02-26 17:05 ` [PATCH v5 18/21] media: vicodec: add documentation to V4L2_PIX_FMT_FWHT_STATELESS Dafna Hirschfeld
2019-02-26 17:05 ` [PATCH v5 19/21] media: vicodec: Introducing stateless fwht defs and structs Dafna Hirschfeld
2019-02-27 16:21 ` kbuild test robot
2019-02-26 17:05 ` [PATCH v5 20/21] media: vicodec: Register another node for stateless decoder Dafna Hirschfeld
2019-02-26 17:05 ` [PATCH v5 21/21] media: vicodec: Add support " Dafna Hirschfeld
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=20190226170514.86127-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